prefix and capitalize ObMenu ObMenuEntry and ObMenuEntryRenderType

[chaz/openbox] / openbox / client.h

diff --git a/openbox/client.h b/openbox/client.h
index 52005fcb309556f0d32a34e29c0f93ec6974a3e4..24cefe309429f6caaf2b12b89cf76aee5c37db3b 100644 (file)
--- a/openbox/client.h
+++ b/openbox/client.h
@@ -10,7 +10,7 @@
 #include <glib.h>
 #include <X11/Xlib.h>
 
-struct Frame;
+struct _ObFrame;
 struct _ObGroup;
 
 typedef struct _ObClient     ObClient;
@@ -75,7 +75,7 @@ struct _ObClient
     Window  window;
 
     /*! The window's decorations. NULL while the window is being managed! */
-    struct Frame *frame;
+    struct _ObFrame *frame;
 
     /*! The number of unmap events to ignore on the window */
     int ignore_unmaps;
@@ -223,7 +223,7 @@ struct _ObClient
 
     /*! The layer in which the window will be stacked, windows in lower layers
       are always below windows in higher layers. */
-    StackLayer layer;
+    ObStackingLayer layer;
 
     /*! A bitmask of values in the Decoration enum
       The values in the variable are the decorations that the client wants to