prefixing and capitalizing the StackLayer -> ObStackingLayer enum.

[chaz/openbox] / openbox / window.h

diff --git a/openbox/window.h b/openbox/window.h
index b7762edf5c9e11b331fc4f9d87a517c28138f6b9..fbdcf024b45caa195275c8e6c1bca8188f05f24f 100644 (file)
--- a/openbox/window.h
+++ b/openbox/window.h
@@ -4,6 +4,9 @@
 #include <X11/Xlib.h>
 #include <glib.h>
 
+typedef struct _ObWindow         ObWindow;
+typedef struct _ObInternalWindow ObInternalWindow;
+
 typedef enum {
     Window_Menu,
     Window_Dock,
@@ -12,9 +15,10 @@ typedef enum {
     Window_Internal /* used for stacking but not events */
 } Window_InternalType;
 
-typedef struct ObWindow {
+struct _ObWindow
+{
     Window_InternalType type;
-} ObWindow;
+};
 
 /* Wrapper for internal stuff. If its struct matches this then it can be used
    as an ObWindow */
@@ -30,14 +34,14 @@ typedef struct InternalWindow {
 #define WINDOW_IS_INTERNAL(win) (((ObWindow*)win)->type == Window_Internal)
 
 struct Menu;
-struct Dock;
-struct DockApp;
-struct Client;
+struct _ObDock;
+struct _ObDockApp;
+struct _ObClient;
 
 #define WINDOW_AS_MENU(win) ((struct Menu*)win)
-#define WINDOW_AS_DOCK(win) ((struct Dock*)win)
-#define WINDOW_AS_DOCKAPP(win) ((struct DockApp*)win)
-#define WINDOW_AS_CLIENT(win) ((struct Client*)win)
+#define WINDOW_AS_DOCK(win) ((struct _ObDock*)win)
+#define WINDOW_AS_DOCKAPP(win) ((struct _ObDockApp*)win)
+#define WINDOW_AS_CLIENT(win) ((struct _ObClient*)win)
 #define WINDOW_AS_INTERNAL(win) ((struct InternalWindow*)win)
 
 #define MENU_AS_WINDOW(menu) ((ObWindow*)menu)