[ViewVC] Diff of: cvs/deliantra/dclient/src/backend/ndk/frame.cpp

Comparing deliantra/dclient/src/backend/ndk/frame.cpp (file contents):
Revision 1.1 by sf-pippijn, Sun Oct 17 08:15:08 2010 UTC vs.
Revision 1.4 by sf-pippijn, Sun Oct 24 20:31:51 2010 UTC

 /* frame.cc
  * This file is part of NDK++ library
  * Copyright (c) 2003,2004 by Stanislav Ievlev
  *
  * This file is covered by the GNU Library General Public License,
- * which should be included with libndk++ as the file COPYING.
+ * which should be included with libndk as the file COPYING.
  */
-#include <ncurses/pen.hh>
+#include <ndk/pen.hh>
-#include <ndk++/frame.hh>
+#include <ndk/frame.hh>
-#include <ndk++/palette.hh>
+#include <ndk/palette.hh>
 ndk::frame::frame (std::string const &title, panel *parent)
   : panel (parent)
   , title_ (title)
 void
 ndk::frame::draw ()
 {
   panel::draw ();
-  ncurses::pen p (*this);
+  pen p (*this);
   p.clear ();
-  p.set_color (palette::instance ()[active_ ? colors::frame1 : colors::frame2]);
+  p.set_color (palette::instance ().find (active_ ? colors::frame1 : colors::frame2)->second);
   p.frame ();
   if (!title_.empty ())
     p.title (title_.substr (0, width () - 2));
-  p.set_color (palette::instance ()[colors::frame2]);
+  p.set_color (palette::instance ().find (colors::frame2)->second);
 }
 int
 ndk::frame::padding () const
 {
   return 1;
+}
+std::string const &
+ndk::frame::title () const
+{
+  return title_;
 }
 void
 ndk::frame::set_title (std::string const &title)
 {

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines