modules/engines/ms-windows/msw_rc_style.c

Fri Nov 19 15:18:51 2004  Manish Singh  <yosh@gimp.org>

        * modules/engines/ms-windows/msw_rc_style.c
        * modules/engines/ms-windows/msw_style.c
        * modules/engines/ms-windows/msw_theme_main.c
        * modules/engines/pixbuf/pixbuf-main.c
        * modules/engines/pixbuf/pixbuf-rc-style.c
        * modules/input/gtkimcontextime.c
        * modules/input/gtkimcontextxim.c
        * modules/input/imam-et.c
        * modules/input/imcedilla.c
        * modules/input/imcyrillic-translit.c
        * modules/input/iminuktitut.c
        * modules/input/imipa.c
        * modules/input/imthai-broken.c
        * modules/input/imti-er.c
        * modules/input/imti-et.c
        * modules/input/imviqr.c
        * tests/prop-editor.c
        * tests/testentrycompletion.c
        * tests/testfilechooser.c
        * tests/testmerge.c
        * tests/testtoolbar.c
        * tests/testtreecolumns.c
        * tests/testtreeview.c: get rid of unnecessary casts.

        * tests/testgtk.c (create_labels): add GTK_LABEL() casts for
        gtk_label_set_ellipsize() calls.

        * tests/testicontheme.c (main): remove unused pixbuf variable.
This commit is contained in:
Manish Singh
2004-11-19 23:30:47 +00:00
committed by Manish Singh
parent 60b30ff513
commit 54b45a19b9
29 changed files with 186 additions and 68 deletions

View File

@ -73,6 +73,6 @@ msw_rc_style_class_init (MswRcStyleClass *klass)
static GtkStyle *
msw_rc_style_create_style (GtkRcStyle *rc_style)
{
return GTK_STYLE (g_object_new (MSW_TYPE_STYLE, NULL));
return g_object_new (MSW_TYPE_STYLE, NULL);
}

View File

@ -458,16 +458,13 @@ setup_menu_settings (GtkSettings * settings)
if (SystemParametersInfo (SPI_GETMENUSHOWDELAY, 0, &menu_delay, 0)) {
if (klazz) {
if (g_object_class_find_property (klazz, "gtk-menu-bar-popup-delay")) {
g_object_set (G_OBJECT (settings), "gtk-menu-bar-popup-delay",
0, NULL);
g_object_set (settings, "gtk-menu-bar-popup-delay", 0, NULL);
}
if (g_object_class_find_property (klazz, "gtk-menu-popup-delay")) {
g_object_set (G_OBJECT (settings), "gtk-menu-popup-delay",
menu_delay, NULL);
g_object_set (settings, "gtk-menu-popup-delay", menu_delay, NULL);
}
if (g_object_class_find_property (klazz, "gtk-menu-popdown-delay")) {
g_object_set (G_OBJECT (settings), "gtk-menu-popdown-delay",
menu_delay, NULL);
g_object_set (settings, "gtk-menu-popdown-delay", menu_delay, NULL);
}
}
}
@ -485,19 +482,17 @@ msw_style_setup_system_settings (void)
return;
cursor_blink_time = GetCaretBlinkTime ();
g_object_set (G_OBJECT (settings), "gtk-cursor-blink",
cursor_blink_time > 0, NULL);
g_object_set (settings, "gtk-cursor-blink", cursor_blink_time > 0, NULL);
if (cursor_blink_time > 0)
{
g_object_set (G_OBJECT (settings), "gtk-cursor-blink-time",
2*cursor_blink_time, NULL);
g_object_set (settings, "gtk-cursor-blink-time", 2*cursor_blink_time,
NULL);
}
g_object_set (G_OBJECT (settings), "gtk-double-click-time",
GetDoubleClickTime(), NULL);
g_object_set (G_OBJECT (settings), "gtk-dnd-drag-threshold",
GetSystemMetrics(SM_CXDRAG), NULL);
g_object_set (settings, "gtk-double-click-time", GetDoubleClickTime(), NULL);
g_object_set (settings, "gtk-dnd-drag-threshold", GetSystemMetrics(SM_CXDRAG),
NULL);
setup_menu_settings (settings);

View File

@ -104,7 +104,7 @@ theme_exit (void)
G_MODULE_EXPORT GtkRcStyle *
theme_create_rc_style (void)
{
return GTK_RC_STYLE (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

View File

@ -40,7 +40,7 @@ theme_exit (void)
G_MODULE_EXPORT GtkRcStyle *
theme_create_rc_style (void)
{
return GTK_RC_STYLE (g_object_new (PIXBUF_TYPE_RC_STYLE, NULL));
return g_object_new (PIXBUF_TYPE_RC_STYLE, NULL);
}
/* The following function will be called by GTK+ when the module

View File

@ -808,6 +808,6 @@ pixbuf_rc_style_merge (GtkRcStyle *dest,
static GtkStyle *
pixbuf_rc_style_create_style (GtkRcStyle *rc_style)
{
return GTK_STYLE (g_object_new (PIXBUF_TYPE_STYLE, NULL));
return g_object_new (PIXBUF_TYPE_STYLE, NULL);
}