X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fwidgetbase.hh;h=46aacb9f93e2f162d9cc3e6e69498bd47b198505;hb=59ef3022a4ce0a23e6d54f7d73a2aa77721e9cc9;hp=591f150dd8dc6e88e1b01edfd4bc3704af6abc76;hpb=c8e246f8de5af9963b22cc104d22ca10772028dd;p=chaz%2Fopenbox

diff --git a/src/widgetbase.hh b/src/widgetbase.hh
index 591f150d..46aacb9f 100644
--- a/src/widgetbase.hh
+++ b/src/widgetbase.hh
@@ -1,12 +1,12 @@
 // -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
-#ifndef   __obwidgetbase_hh
-#define   __obwidgetbase_hh
+#ifndef   __widgetbase_hh
+#define   __widgetbase_hh
 
 #include "python.hh"
 
 namespace ob {
 
-class OBWidget {
+class WidgetBase {
 public:
   enum WidgetType {
     Type_Frame,
@@ -17,7 +17,7 @@ public:
     Type_MaximizeButton,
     Type_CloseButton,
     Type_IconifyButton,
-    Type_StickyButton,
+    Type_AllDesktopsButton,
     Type_LeftGrip,
     Type_RightGrip,
     Type_Client,
@@ -28,38 +28,38 @@ private:
   WidgetType _type;
 
 public:
-  OBWidget(WidgetType type) : _type(type) {}
+  WidgetBase(WidgetType type) : _type(type) {}
   
   inline WidgetType type() const { return _type; }
 
-  inline MouseContext mcontext() const {
+  inline MouseContext::MC mcontext() const {
     switch (_type) {
     case Type_Frame:
-      return MC_Frame;
+      return MouseContext::Frame;
     case Type_Titlebar:
-      return MC_Titlebar;
+      return MouseContext::Titlebar;
     case Type_Handle:
-      return MC_Handle;
+      return MouseContext::Handle;
     case Type_Plate:
-      return MC_Window;
+      return MouseContext::Window;
     case Type_Label:
-      return MC_Titlebar;
+      return MouseContext::Titlebar;
     case Type_MaximizeButton:
-      return MC_MaximizeButton;
+      return MouseContext::MaximizeButton;
     case Type_CloseButton:
-      return MC_CloseButton;
+      return MouseContext::CloseButton;
     case Type_IconifyButton:
-      return MC_IconifyButton;
-    case Type_StickyButton:
-      return MC_StickyButton;
+      return MouseContext::IconifyButton;
+    case Type_AllDesktopsButton:
+      return MouseContext::AllDesktopsButton;
     case Type_LeftGrip:
-      return MC_Grip;
+      return MouseContext::Grip;
     case Type_RightGrip:
-      return MC_Grip;
+      return MouseContext::Grip;
     case Type_Client:
-      return MC_Window;
+      return MouseContext::Window;
     case Type_Root:
-      return MC_Root;
+      return MouseContext::Root;
     default:
       assert(false); // unhandled type
     }
@@ -68,4 +68,4 @@ public:
 
 }
 
-#endif // __obwidgetbase_hh
+#endif // __widgetbase_hh