AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Fixes

Browse Source
This commit is contained in:
Raymond Penners 2003-10-07 18:56:57 +00:00
parent 18afbf48af
commit 8a93f2ff7a
5 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/engines/ms-windows/ChangeLog.old
View File

@ -1,5 +1,8 @@
2003-10-07 Raymond Penners <raymond@dotsphinx.com> 2003-10-07 Raymond Penners <raymond@dotsphinx.com>
* src/wimp_style.c: Tabs not located on top of the notebook are
now (again) no longer rendered using XP theming.
* src/xp_theme.c: We now properly use IsThemeActive(). * src/xp_theme.c: We now properly use IsThemeActive().
* src/xp_theme_defs.h: Renamed from xp_theme_dfns.h * src/xp_theme_defs.h: Renamed from xp_theme_dfns.h

11
modules/engines/ms-windows/wimp_style.c
View File

@ -264,7 +264,7 @@ setup_menu_settings (void)
} }
void void
setup_system_settings (void) wimp_style_setup_system_settings (void)
{ {
GtkSettings * settings; GtkSettings * settings;
int cursor_blink_time; int cursor_blink_time;
@ -1363,8 +1363,9 @@ draw_extension(GtkStyle *style,
height -= XP_EDGE_SIZE; height -= XP_EDGE_SIZE;
#endif #endif
if (xp_theme_draw (window, if (pos_type == GTK_POS_TOP
gtk_notebook_get_current_page(notebook)==0 && xp_theme_draw
(window, gtk_notebook_get_current_page(notebook)==0
? XP_THEME_ELEMENT_TAB_ITEM_LEFT_EDGE ? XP_THEME_ELEMENT_TAB_ITEM_LEFT_EDGE
: XP_THEME_ELEMENT_TAB_ITEM, : XP_THEME_ELEMENT_TAB_ITEM,
style, x, y, width, height, state_type, area)) style, x, y, width, height, state_type, area))
@ -1588,9 +1589,9 @@ wimp_style_register_type (GTypeModule *module)
} }
void void
wimp_init (void) wimp_style_init (void)
{ {
xp_theme_init (); xp_theme_init ();
setup_system_settings (); wimp_style_setup_system_settings ();
setup_wimp_rc_style (); setup_wimp_rc_style ();
} }

2
modules/engines/ms-windows/wimp_style.h
View File

@ -49,6 +49,6 @@ struct _WimpStyleClass
void wimp_style_register_type (GTypeModule *module); void wimp_style_register_type (GTypeModule *module);
void wimp_style_init (void); void wimp_style_init (void);
void setup_system_settings (void); void wimp_style_setup_system_settings (void);
#endif /* WIMP_TYPE_STYLE */ #endif /* WIMP_TYPE_STYLE */

9
modules/engines/ms-windows/wimp_theme_main.c
View File

@ -36,7 +36,6 @@
* WM_STYLECHANGED * WM_STYLECHANGED
* WM_PALETTECHANGED * WM_PALETTECHANGED
*/ */
static GdkFilterReturn static GdkFilterReturn
global_filter_func (void *xevent, global_filter_func (void *xevent,
GdkEvent *event, GdkEvent *event,
@ -51,7 +50,7 @@ global_filter_func (void *xevent,
case WM_THEMECHANGED: case WM_THEMECHANGED:
case WM_SYSCOLORCHANGE: case WM_SYSCOLORCHANGE:
xp_theme_exit(); xp_theme_exit();
wimp_init (); wimp_style_init ();
/* force all gtkwidgets to redraw */ /* force all gtkwidgets to redraw */
gtk_rc_reparse_all_for_settings (gtk_settings_get_default(), TRUE); gtk_rc_reparse_all_for_settings (gtk_settings_get_default(), TRUE);
@ -59,7 +58,8 @@ global_filter_func (void *xevent,
#endif #endif
case WM_SETTINGCHANGE: case WM_SETTINGCHANGE:
setup_system_settings (); /* catch cursor blink, etc... changes */ /* catch cursor blink, etc... changes */
wimp_style_setup_system_settings ();
return GDK_FILTER_REMOVE; return GDK_FILTER_REMOVE;
default: default:
@ -72,8 +72,7 @@ theme_init (GTypeModule *module)
{ {
wimp_rc_style_register_type (module); wimp_rc_style_register_type (module);
wimp_style_register_type (module); wimp_style_register_type (module);
wimp_style_init ();
wimp_init ();
gdk_window_add_filter (NULL, global_filter_func, NULL); gdk_window_add_filter (NULL, global_filter_func, NULL);
} }

3
modules/engines/ms-windows/xp_theme.c
View File

@ -139,7 +139,6 @@ void
xp_theme_exit(void) xp_theme_exit(void)
{ {
int i; int i;
if (! uxtheme_dll) if (! uxtheme_dll)
return; return;
@ -592,7 +591,7 @@ xp_theme_draw(GdkWindow *win, XpThemeElement element, GtkStyle *style,
GdkDrawable *drawable; GdkDrawable *drawable;
int part_state; int part_state;
if (!uxtheme_dll) if (! xp_theme_is_drawable (element))
return FALSE; return FALSE;
theme = xp_theme_get_handle_by_element(element); theme = xp_theme_get_handle_by_element(element);