Commit 47663fd3 authored by Cody Russell's avatar Cody Russell Committed by Cody Russell

modules/engines/ms-windows/xp_theme.[ch]

2008-02-01  Cody Russell  <cody@jhu.edu>

        * modules/engines/ms-windows/xp_theme.[ch]
        * modules/engines/ms-windows/xp_theme_defs.h
        * modules/engines/ms-windows/msw_rc_style.c
        * modules/engines/ms-windows/msw_theme_main.c
        * modules/engines/ms-windows/msw_style.c: Re-indented and generally
        attempted to stylize more like the rest of the gtk+ stack's code.


svn path=/trunk/; revision=19455
parent 2a9c3e80
2008-02-01 Cody Russell <cody@jhu.edu>
* modules/engines/ms-windows/xp_theme.[ch]
* modules/engines/ms-windows/xp_theme_defs.h
* modules/engines/ms-windows/msw_rc_style.c
* modules/engines/ms-windows/msw_theme_main.c
* modules/engines/ms-windows/msw_style.c: Re-indented and generally
attempted to stylize more like the rest of the gtk+ stack's code.
2008-02-01 Michael Natterer <mitch@imendio.com>
* tests/testgtk.c: initialize GdkColor structs to fix warning
......
......@@ -32,45 +32,45 @@ static GtkRcStyleClass *parent_class;
GType msw_type_rc_style = 0;
void
msw_rc_style_register_type (GTypeModule * module)
msw_rc_style_register_type (GTypeModule *module)
{
static const GTypeInfo object_info = {
sizeof (MswRcStyleClass),
(GBaseInitFunc) NULL,
(GBaseFinalizeFunc) NULL,
(GClassInitFunc) msw_rc_style_class_init,
NULL, /* class_finalize */
NULL, /* class_data */
sizeof (MswRcStyle),
0, /* n_preallocs */
(GInstanceInitFunc) msw_rc_style_init,
};
static const GTypeInfo object_info = {
sizeof (MswRcStyleClass),
(GBaseInitFunc) NULL,
(GBaseFinalizeFunc) NULL,
(GClassInitFunc) msw_rc_style_class_init,
NULL, /* class_finalize */
NULL, /* class_data */
sizeof (MswRcStyle),
0, /* n_preallocs */
(GInstanceInitFunc) msw_rc_style_init,
};
msw_type_rc_style = g_type_module_register_type (module,
GTK_TYPE_RC_STYLE,
"MswRcStyle",
&object_info, 0);
msw_type_rc_style = g_type_module_register_type (module,
GTK_TYPE_RC_STYLE,
"MswRcStyle",
&object_info, 0);
}
static void
msw_rc_style_init (MswRcStyle * style)
msw_rc_style_init (MswRcStyle *style)
{
}
static void
msw_rc_style_class_init (MswRcStyleClass * klass)
msw_rc_style_class_init (MswRcStyleClass *klass)
{
GtkRcStyleClass *rc_style_class = GTK_RC_STYLE_CLASS (klass);
GtkRcStyleClass *rc_style_class = GTK_RC_STYLE_CLASS (klass);
parent_class = g_type_class_peek_parent (klass);
parent_class = g_type_class_peek_parent (klass);
rc_style_class->create_style = msw_rc_style_create_style;
rc_style_class->create_style = msw_rc_style_create_style;
}
/* Create an empty style suitable to this RC style
*/
static GtkStyle *
msw_rc_style_create_style (GtkRcStyle * rc_style)
msw_rc_style_create_style (GtkRcStyle *rc_style)
{
return g_object_new (MSW_TYPE_STYLE, NULL);
return g_object_new (MSW_TYPE_STYLE, NULL);
}
This diff is collapsed.
......@@ -35,10 +35,10 @@
#endif
static GModule *this_module = NULL;
static void (*msw_rc_reset_styles) (GtkSettings * settings) = NULL;
static GdkWindow* hidden_msg_window = NULL;
static void (*msw_rc_reset_styles) (GtkSettings *settings) = NULL;
static GdkWindow *hidden_msg_window = NULL;
static GdkWindow*
static GdkWindow *
create_hidden_msg_window (void)
{
GdkWindowAttr attributes;
......@@ -60,79 +60,79 @@ create_hidden_msg_window (void)
}
static GdkFilterReturn
global_filter_func (void *xevent, GdkEvent * event, gpointer data)
global_filter_func (void *xevent, GdkEvent *event, gpointer data)
{
MSG *msg = (MSG *) xevent;
MSG *msg = (MSG *) xevent;
switch (msg->message)
{
/* catch theme changes */
case WM_THEMECHANGED:
case WM_SYSCOLORCHANGE:
switch (msg->message)
{
/* catch theme changes */
case WM_THEMECHANGED:
case WM_SYSCOLORCHANGE:
if (msw_rc_reset_styles != NULL)
{
xp_theme_reset ();
msw_style_init ();
if (msw_rc_reset_styles != NULL)
{
xp_theme_reset ();
msw_style_init ();
/* force all gtkwidgets to redraw */
(*msw_rc_reset_styles) (gtk_settings_get_default ());
}
/* force all gtkwidgets to redraw */
(*msw_rc_reset_styles) (gtk_settings_get_default ());
}
return GDK_FILTER_REMOVE;
return GDK_FILTER_REMOVE;
case WM_SETTINGCHANGE:
/* catch cursor blink, etc... changes */
msw_style_setup_system_settings ();
return GDK_FILTER_REMOVE;
case WM_SETTINGCHANGE:
/* catch cursor blink, etc... changes */
msw_style_setup_system_settings ();
return GDK_FILTER_REMOVE;
default:
return GDK_FILTER_CONTINUE;
}
default:
return GDK_FILTER_CONTINUE;
}
}
G_MODULE_EXPORT void
theme_init (GTypeModule * module)
{
msw_rc_style_register_type (module);
msw_style_register_type (module);
/* this craziness is required because only gtk 2.4.x and later have
gtk_rc_reset_styles(). But we want to be able to run acceptly well on
any GTK 2.x.x platform. */
if (gtk_check_version (2, 4, 0) == NULL)
{
this_module = g_module_open (NULL, 0);
if (this_module)
g_module_symbol (this_module, "gtk_rc_reset_styles",
(gpointer *) (&msw_rc_reset_styles));
}
msw_style_init ();
hidden_msg_window = create_hidden_msg_window ();
gdk_window_add_filter (hidden_msg_window, global_filter_func, NULL);
msw_rc_style_register_type (module);
msw_style_register_type (module);
/* this craziness is required because only gtk 2.4.x and later have
gtk_rc_reset_styles(). But we want to be able to run acceptly well on
any GTK 2.x.x platform. */
if (gtk_check_version (2, 4, 0) == NULL)
{
this_module = g_module_open (NULL, 0);
if (this_module)
g_module_symbol (this_module, "gtk_rc_reset_styles",
(gpointer *) (&msw_rc_reset_styles));
}
msw_style_init ();
hidden_msg_window = create_hidden_msg_window ();
gdk_window_add_filter (hidden_msg_window, global_filter_func, NULL);
}
G_MODULE_EXPORT void
theme_exit (void)
{
gdk_window_remove_filter (hidden_msg_window, global_filter_func, NULL);
gdk_window_destroy (hidden_msg_window);
hidden_msg_window = NULL;
msw_style_finalize();
if (this_module)
{
g_module_close (this_module);
this_module = NULL;
}
gdk_window_remove_filter (hidden_msg_window, global_filter_func, NULL);
gdk_window_destroy (hidden_msg_window);
hidden_msg_window = NULL;
msw_style_finalize ();
if (this_module)
{
g_module_close (this_module);
this_module = NULL;
}
}
G_MODULE_EXPORT GtkRcStyle *
theme_create_rc_style (void)
{
return g_object_new (MSW_TYPE_RC_STYLE, NULL);
return g_object_new (MSW_TYPE_RC_STYLE, NULL);
}
/* The following function will be called by GTK+ when the module
......@@ -140,7 +140,7 @@ theme_create_rc_style (void)
* version of GTK+ that loads us.
*/
G_MODULE_EXPORT const gchar *
g_module_check_init (GModule * module)
g_module_check_init (GModule *module)
{
return gtk_check_version (2, 0, 0);
return gtk_check_version (2, 0, 0);
}
This diff is collapsed.
......@@ -122,8 +122,8 @@ gboolean xp_theme_draw (GdkWindow *win, XpThemeElement element,
GdkRectangle *area);
gboolean xp_theme_is_drawable (XpThemeElement element);
gboolean xp_theme_get_system_font (XpThemeClass klazz, XpThemeFont fontId, OUT LOGFONT *lf);
gboolean xp_theme_get_system_color (XpThemeClass klazz, int colorId, OUT DWORD * pColor);
gboolean xp_theme_get_system_metric (XpThemeClass klazz, int metricId, OUT int * pVal);
gboolean xp_theme_get_system_color (XpThemeClass klazz, int colorId, OUT DWORD *pColor);
gboolean xp_theme_get_system_metric (XpThemeClass klazz, int metricId, OUT int *pVal);
gboolean xp_theme_is_active (void);
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment