X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=openbox%2Fwindow.h;h=6c557d184fb224eab8f25f2c6523c435b5320cca;hb=9decfe0d76d661ded94eced1f03c2ebfa2941bcc;hp=7e7e4d34a3bf3111e107e9a8fe91df162c01472a;hpb=d206303a9f0742ff330aebe8129d6044ade30a94;p=chaz%2Fopenbox

diff --git a/openbox/window.h b/openbox/window.h
index 7e7e4d34..6c557d18 100644
--- 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 */
@@ -29,12 +33,12 @@ typedef struct InternalWindow {
 #define WINDOW_IS_CLIENT(win) (((ObWindow*)win)->type == Window_Client)
 #define WINDOW_IS_INTERNAL(win) (((ObWindow*)win)->type == Window_Internal)
 
-struct Menu;
+struct _ObMenu;
 struct _ObDock;
 struct _ObDockApp;
 struct _ObClient;
 
-#define WINDOW_AS_MENU(win) ((struct Menu*)win)
+#define WINDOW_AS_MENU(win) ((struct _ObMenuFrame*)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)
@@ -48,8 +52,8 @@ struct _ObClient;
 
 extern GHashTable *window_map;
 
-void window_startup();
-void window_shutdown();
+void window_startup(gboolean reconfig);
+void window_shutdown(gboolean reconfig);
 
 Window window_top(ObWindow *self);
 Window window_layer(ObWindow *self);