move windows based on their *frame* not the client

[chaz/openbox] / src / widgetbase.hh

diff --git a/src/widgetbase.hh b/src/widgetbase.hh
index 29211f4ac59a5deb300cfbd095e26520110b8b36..46aacb9f93e2f162d9cc3e6e69498bd47b198505 100644 (file)
--- a/src/widgetbase.hh
+++ b/src/widgetbase.hh
@@ -17,7 +17,7 @@ public:
     Type_MaximizeButton,
     Type_CloseButton,
     Type_IconifyButton,
-    Type_StickyButton,
+    Type_AllDesktopsButton,
     Type_LeftGrip,
     Type_RightGrip,
     Type_Client,
@@ -32,34 +32,34 @@ public:
   
   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
     }