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

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.

4 files changed, 12 insertions, 7 deletions

diff --git a/modules/engines/ms-windows/Makefile.am b/modules/engines/ms-windows/Makefile.am
index b440753fe..c862b49a0 100644
--- a/modules/engines/ms-windows/Makefile.am
+++ b/modules/engines/ms-windows/Makefile.am
@@ -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
diff --git a/modules/engines/ms-windows/msw_style.c b/modules/engines/ms-windows/msw_style.c
index 34c88326b..e268c52a0 100755
--- a/modules/engines/ms-windows/msw_style.c
+++ b/modules/engines/ms-windows/msw_style.c
@@ -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;
             }
diff --git a/modules/engines/ms-windows/msw_theme_main.c b/modules/engines/ms-windows/msw_theme_main.c
index 858f506ae..5eb846a8a 100755
--- a/modules/engines/ms-windows/msw_theme_main.c
+++ b/modules/engines/ms-windows/msw_theme_main.c
@@ -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 */

diff --git a/modules/engines/ms-windows/xp_theme.c b/modules/engines/ms-windows/xp_theme.c
index 9ba01a812..1a0687070 100755
--- a/modules/engines/ms-windows/xp_theme.c
+++ b/modules/engines/ms-windows/xp_theme.c
@@ -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;