adjust to the new format for otk::Proeprty::get() functions (no nelements)

[chaz/openbox] / otk / label.hh

diff --git a/otk/label.hh b/otk/label.hh
index b3e9c16655256dcbfc9fa682c3446426a7205be7..f43ed71ad87db3635cf2495d67ef97cad5d67a74 100644 (file)
--- a/otk/label.hh
+++ b/otk/label.hh
@@ -17,7 +17,7 @@ public:
   Label(Widget *parent);
   virtual ~Label();
 
-  inline const ustring& getText(void) const { return _text; }
+  inline const ustring& text(void) const { return _text; }
   void setText(const ustring &text);
 
   virtual inline bool isHighlighted() const { return _highlight; }
@@ -31,13 +31,13 @@ public:
   const Font *font() const { return _font; }
   virtual void setFont(const Font *f);
 
-  virtual void calcDefaultSizes();
-
   virtual void styleChanged(const RenderStyle &style);
   
   virtual void renderForeground(Surface &surface);
 
 protected:
+  virtual void calcDefaultSizes();
+
   //! The color the label will use for rendering its text
   RenderColor *_forecolor;