diff options
| author | Dana Jansens <danakj@orodu.net> | 2008-01-31 10:00:10 -0500 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2008-01-31 12:25:31 -0500 |
| commit | 52369e319f11e1189e8980f64974236eeb4de96e (patch) | |
| tree | 53a1092786938f55aaee99f2678a885c454fbb1c /openbox/window.h | |
| parent | 73c9a0e06b0248d430aac1c2c91f44a6a9dbac04 (diff) | |
simplify window.h macros, and rename the window types to ObWindowClass for consistent name style
Diffstat (limited to 'openbox/window.h')
| -rw-r--r-- | openbox/window.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/openbox/window.h b/openbox/window.h index ccd8def2..252145b9 100644 --- a/openbox/window.h +++ b/openbox/window.h @@ -31,13 +31,13 @@ typedef enum { OB_WINDOW_CLASS_MENUFRAME, OB_WINDOW_CLASS_DOCK, OB_WINDOW_CLASS_CLIENT, - OB_WINDOW_CLASS_INTERNALWINDOW -} Window_InternalType; + OB_WINDOW_CLASS_INTERNAL +} ObWindowClass; /* In order to be an ObWindow, you need to make this struct the top of your struct */ struct _ObWindow { - Window_InternalType type; + ObWindowClass type; }; #define WINDOW_IS_MENUFRAME(win) \ @@ -46,8 +46,8 @@ struct _ObWindow { (((ObWindow*)win)->type == OB_WINDOW_CLASS_DOCK) #define WINDOW_IS_CLIENT(win) \ (((ObWindow*)win)->type == OB_WINDOW_CLASS_CLIENT) -#define WINDOW_IS_INTERNALWINDOW(win) \ - (((ObWindow*)win)->type == OB_WINDOW_CLASS_INTERNALWINDOW) +#define WINDOW_IS_INTERNAL(win) \ + (((ObWindow*)win)->type == OB_WINDOW_CLASS_INTERNAL) struct _ObMenu; struct _ObDock; @@ -57,12 +57,12 @@ struct _ObClient; #define WINDOW_AS_MENUFRAME(win) ((struct _ObMenuFrame*)win) #define WINDOW_AS_DOCK(win) ((struct _ObDock*)win) #define WINDOW_AS_CLIENT(win) ((struct _ObClient*)win) -#define WINDOW_AS_INTERNALWINDOW(win) ((struct _ObInternalWindow*)win) +#define WINDOW_AS_INTERNAL(win) ((struct _ObInternalWindow*)win) #define MENUFRAME_AS_WINDOW(menu) ((ObWindow*)menu) #define DOCK_AS_WINDOW(dock) ((ObWindow*)dock) #define CLIENT_AS_WINDOW(client) ((ObWindow*)client) -#define INTERNALWINDOW_AS_WINDOW(intern) ((ObWindow*)intern) +#define INTERNAL_AS_WINDOW(intern) ((ObWindow*)intern) void window_startup (gboolean reconfig); void window_shutdown(gboolean reconfig); |