X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Fwidget.hh;h=608d8e58581b5c0ec8d36464b5c5d752375eeff0;hb=723739dafe91a156fef527f3b53a483195695cf1;hp=bec645c5ed2816a8066b349b2333db581633b524;hpb=e25a69cce8ed022113e1fb01b9bde1f5bcfb661c;p=chaz%2Fopenbox

diff --git a/otk/widget.hh b/otk/widget.hh
index bec645c5..608d8e58 100644
--- a/otk/widget.hh
+++ b/otk/widget.hh
@@ -6,6 +6,7 @@
 #include "texture.hh"
 #include "style.hh"
 #include "eventdispatcher.hh"
+#include "display.hh"
 
 extern "C" {
 #include <assert.h>
@@ -36,11 +37,11 @@ public:
   void exposeHandler(const XExposeEvent &e);
   void configureHandler(const XConfigureEvent &e);
 
-  inline Window getWindow(void) const { return _window; }
-  inline const OtkWidget *getParent(void) const { return _parent; }
-  inline const OtkWidgetList &getChildren(void) const { return _children; }
-  inline unsigned int getScreen(void) const { return _screen; }
-  inline const Rect &getRect(void) const { return _rect; }
+  inline Window window(void) const { return _window; }
+  inline const OtkWidget *parent(void) const { return _parent; }
+  inline const OtkWidgetList &children(void) const { return _children; }
+  inline unsigned int screen(void) const { return _screen; }
+  inline const Rect &rect(void) const { return _rect; }
 
   void move(const Point &to);
   void move(int x, int y);
@@ -74,17 +75,17 @@ public:
   bool grabKeyboard(void);
   void ungrabKeyboard(void);
 
-  inline BTexture *getTexture(void) const { return _texture; }
+  inline BTexture *texture(void) const { return _texture; }
   virtual void setTexture(BTexture *texture)
     { _texture = texture; _dirty = true; }
 
-  inline const BColor *getBorderColor(void) const { return _bcolor; }
+  inline const BColor *borderColor(void) const { return _bcolor; }
   virtual void setBorderColor(const BColor *color) {
     assert(color); _bcolor = color;
     XSetWindowBorder(OBDisplay::display, _window, color->pixel());
   }
 
-  inline int getBorderWidth(void) const { return _bwidth; }
+  inline int borderWidth(void) const { return _bwidth; }
   void setBorderWidth(int width) {
     _bwidth = width;
     XSetWindowBorderWidth(OBDisplay::display, _window, width);
@@ -99,23 +100,23 @@ public:
   inline bool isStretchableVert(void) const { return _stretchable_vert; }
   void setStretchableVert(bool s_vert = true)  { _stretchable_vert = s_vert; }
 
-  inline Cursor getCursor(void) const { return _cursor; }
+  inline Cursor cursor(void) const { return _cursor; }
   void setCursor(Cursor cursor) {
     _cursor = cursor;
     XDefineCursor(OBDisplay::display, _window, _cursor);
   }
 
-  inline int getBevelWidth(void) const { return _bevel_width; }
+  inline int bevelWidth(void) const { return _bevel_width; }
   void setBevelWidth(int bevel_width)
   { assert(bevel_width > 0); _bevel_width = bevel_width; }
 
-  inline Direction getDirection(void) const { return _direction; }
+  inline Direction direction(void) const { return _direction; }
   void setDirection(Direction dir) { _direction = dir; }
 
-  inline Style *getStyle(void) const { return _style; }
+  inline Style *style(void) const { return _style; }
   virtual void setStyle(Style *style);
 
-  inline OtkEventDispatcher *getEventDispatcher(void)
+  inline OtkEventDispatcher *eventDispatcher(void)
   { return _event_dispatcher; }
   void setEventDispatcher(OtkEventDispatcher *disp);