add OtkFocusLabel

diff --git a/otk/Makefile.am b/otk/Makefile.am
index 6f363b250d1f8c3f90bcd245cc3835a0bccf7c73..8637f46ac7ea0324b6274fc8ff484824a9998c55 100644 (file)
--- a/otk/Makefile.am
+++ b/otk/Makefile.am
@@ -4,11 +4,12 @@ INCLUDES= -I../src
 
 noinst_LIBRARIES=libotk.a
 
-libotk_a_SOURCES= color.cc display.cc font.cc gccache.cc image.cc property.cc \
-                  imagecontrol.cc rect.cc screeninfo.cc texture.cc timer.cc \
-                  timerqueuemanager.cc style.cc configuration.cc util.cc \
-                  widget.cc focuswidget.cc button.cc eventhandler.cc \
-                  eventdispatcher.cc application.cc
+libotk_a_SOURCES= color.cc display.cc font.cc gccache.cc image.cc \
+                  property.cc imagecontrol.cc rect.cc screeninfo.cc \
+                  texture.cc timer.cc timerqueuemanager.cc style.cc \
+                  configuration.cc util.cc widget.cc focuswidget.cc \
+                  button.cc eventhandler.cc eventdispatcher.cc \
+                  focuslabel.cc application.cc
 
 MAINTAINERCLEANFILES= Makefile.in
 

diff --git a/otk/style.cc b/otk/style.cc
index 3c40e24bb5fcc87773aac642c50b45b881c8de5d..277924d6d9b4e63d90f94c3af57b67d95efde838 100644 (file)
--- a/otk/style.cc
+++ b/otk/style.cc
@@ -156,32 +156,6 @@ void Style::load(const Configuration &style) {
 }
 
 
-void Style::doJustify(const std::string &text, int &start_pos,
-                      unsigned int max_length,
-                      unsigned int modifier) const {
-  size_t text_len = text.size();
-  unsigned int length;
-
-  do {
-    length = font->measureString(std::string(text, 0, text_len)) + modifier;
-  } while (length > max_length && text_len-- > 0);
-
-  switch (justify) {
-  case RightJustify:
-    start_pos += max_length - length;
-    break;
-
-  case CenterJustify:
-    start_pos += (max_length - length) / 2;
-    break;
-
-  case LeftJustify:
-  default:
-    break;
-  }
-}
-
-
 void Style::readDatabaseMask(const std::string &rname, PixmapMask &pixmapMask,
                              const Configuration &style) {
   Window root_window = OBDisplay::screenInfo(screen_number)->getRootWindow();

diff --git a/otk/style.hh b/otk/style.hh
index ccf4e49a1bb0e6451b74d19a1037ea2a33c79303..c024ade9bb12b27f71ff57c98b0f6ba9e619a8c7 100644 (file)
--- a/otk/style.hh
+++ b/otk/style.hh
@@ -65,9 +65,6 @@ public:
   Style(BImageControl *);
   ~Style();
 
-  void doJustify(const std::string &text, int &start_pos,
-                 unsigned int max_length, unsigned int modifier) const;
-
   void readDatabaseMask(const std::string &rname,
                         PixmapMask &pixmapMask,
                         const Configuration &style);