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

Silence gcc warnings (unused variables, unhandled enum value in switch).

Browse Source 
2005-03-21  Tor Lillqvist  <tml@novell.com>

	* modules/engines/ms-windows/*.c: Silence gcc warnings (unused
	variables, unhandled enum value in switch). Use g_object_unref()
	instead of deprecated gdk_gc_unref() and gdk_drawable_unref().

	* modules/engines/ms-windows/xp_theme.c (xp_theme_map_gtk_state):
	Add missing "case" keyword.

	* modules/engines/ms-windows/Makefile.am: Link with -lgdi32
	explicitly.
This commit is contained in:
Tor Lillqvist 2005-03-20 23:10:14 +00:00 committed by Tor Lillqvist
parent b459ef889c
commit a2f426f36f
7 changed files with 48 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
2005-03-21 Tor Lillqvist <tml@novell.com>
* modules/engines/ms-windows/*.c: Silence gcc warnings (unused
variables, unhandled enum value in switch). Use g_object_unref()
instead of deprecated gdk_gc_unref() and gdk_drawable_unref().
* modules/engines/ms-windows/xp_theme.c (xp_theme_map_gtk_state):
Add missing "case" keyword.
* modules/engines/ms-windows/Makefile.am: Link with -lgdi32
explicitly.
2005-03-20 Tor Lillqvist <tml@novell.com>
* gdk/win32/gdkdisplay-win32.c (gdk_display_get_name): Return the

12
ChangeLog.pre-2-10
View File

@ -1,3 +1,15 @@
2005-03-21 Tor Lillqvist <tml@novell.com>
* modules/engines/ms-windows/*.c: Silence gcc warnings (unused
variables, unhandled enum value in switch). Use g_object_unref()
instead of deprecated gdk_gc_unref() and gdk_drawable_unref().
* modules/engines/ms-windows/xp_theme.c (xp_theme_map_gtk_state):
Add missing "case" keyword.
* modules/engines/ms-windows/Makefile.am: Link with -lgdi32
explicitly.
2005-03-20 Tor Lillqvist <tml@novell.com>
* gdk/win32/gdkdisplay-win32.c (gdk_display_get_name): Return the

12
ChangeLog.pre-2-8
View File

@ -1,3 +1,15 @@
2005-03-21 Tor Lillqvist <tml@novell.com>
* modules/engines/ms-windows/*.c: Silence gcc warnings (unused
variables, unhandled enum value in switch). Use g_object_unref()
instead of deprecated gdk_gc_unref() and gdk_drawable_unref().
* modules/engines/ms-windows/xp_theme.c (xp_theme_map_gtk_state):
Add missing "case" keyword.
* modules/engines/ms-windows/Makefile.am: Link with -lgdi32
explicitly.
2005-03-20 Tor Lillqvist <tml@novell.com>
* gdk/win32/gdkdisplay-win32.c (gdk_display_get_name): Return the

2
modules/engines/ms-windows/Makefile.am
View File

@ -34,4 +34,4 @@ libwimp_la_SOURCES = \
libwimp_la_LDFLAGS = \
-avoid-version -module -no-undefined -export-dynamic
libwimp_la_LIBADD = $(LDADDS)
libwimp_la_LIBADD = $(LDADDS) -lgdi32

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

@ -565,8 +565,6 @@ setup_msw_rc_style(void)
GdkColor base_prelight;
GdkColor text_prelight;
NONCLIENTMETRICS nc;
/* Prelight */
sys_color_to_gtk_color(XP_THEME_CLASS_TEXT, COLOR_HIGHLIGHTTEXT, &fg_prelight);
sys_color_to_gtk_color(XP_THEME_CLASS_TEXT, COLOR_HIGHLIGHT, &bg_prelight);
@ -974,6 +972,9 @@ draw_expander(GtkStyle *style,
(window, style->fg_gc[state], x + expander_semi_size, y + 2,
x + expander_semi_size, y + expander_size - 2);
break;
default:
break;
}
if (success)
@ -1509,8 +1510,8 @@ draw_box (GtkStyle *style,
gdk_draw_rectangle (window, gc, TRUE, x, y, width, height);
gdk_gc_unref (gc);
gdk_drawable_unref (pixmap);
g_object_unref (gc);
g_object_unref (pixmap);
return;
}

1
modules/engines/ms-windows/msw_theme_main.c
View File

@ -28,6 +28,7 @@
#include "msw_style.h"
#include "msw_rc_style.h"
#include "xp_theme.h"
#ifndef WM_THEMECHANGED
#define WM_THEMECHANGED 0x031A /* winxp only */

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

@ -310,6 +310,9 @@ xp_theme_get_handle_by_element (XpThemeElement element)
case XP_THEME_ELEMENT_TREEVIEW_EXPANDER_CLOSED:
klazz = XP_THEME_CLASS_TREEVIEW;
break;
default:
break;
}
if (klazz != XP_THEME_CLASS__SIZEOF)
@ -537,7 +540,7 @@ xp_theme_map_gtk_state (XpThemeElement element, GtkStateType state)
}
break;
XP_THEME_ELEMENT_DEFAULT_BUTTON:
case XP_THEME_ELEMENT_DEFAULT_BUTTON:
switch(state)
{
case GTK_STATE_ACTIVE:
@ -643,7 +646,7 @@ xp_theme_draw (GdkWindow *win, XpThemeElement element, GtkStyle *style,
{
HTHEME theme;
RECT rect, clip, *pClip;
int xoff, yoff, state;
int xoff, yoff;
HDC dc;
GdkDrawable *drawable;
int part_state;