use PyInt for vars not PyLong

[chaz/openbox] / src / labelwidget.hh

diff --git a/src/labelwidget.hh b/src/labelwidget.hh
index 01662f85fb3bd8a116bb7e3e91b8c7387f750c90..92c35c3c56d5c93388e7616b191bc15860311f97 100644 (file)
--- a/src/labelwidget.hh
+++ b/src/labelwidget.hh
@@ -2,19 +2,19 @@
 #ifndef   __oblabelwidget_hh
 #define   __oblabelwidget_hh
 
+#include "widgetbase.hh"
 #include "otk/widget.hh"
 #include "otk/font.hh"
 #include "otk/style.hh"
-#include "widget.hh"
 
 namespace ob {
 
-class OBLabelWidget : public otk::OtkWidget, public OBWidget
+class LabelWidget : public otk::Widget, public WidgetBase
 {
 private:
   void setTextures();
-  const otk::BFont *_font;
-  otk::BColor *_text_color;
+  const otk::Font *_font;
+  otk::Color *_text_color;
   int _sidemargin;
   otk::Style::TextJustify _justify;
   std::string _text;
@@ -22,8 +22,8 @@ private:
   XftDraw *_xftdraw;
   
 public:
-  OBLabelWidget(otk::OtkWidget *parent, OBWidget::WidgetType type);
-  virtual ~OBLabelWidget();
+  LabelWidget(otk::Widget *parent, WidgetBase::WidgetType type);
+  virtual ~LabelWidget();
 
   virtual void setStyle(otk::Style *style);