win32: Fix some warnings

diff --git a/gdk/win32/gdkdisplay-win32.c b/gdk/win32/gdkdisplay-win32.c
index 31cfcadb1bc3925bb9a5aaa9a1ec78d684c3e80f..fe7079c0051b27ad6533b388b79605cc91fdf542 100644 (file)
--- a/gdk/win32/gdkdisplay-win32.c
+++ b/gdk/win32/gdkdisplay-win32.c
@@ -25,6 +25,7 @@
 #include "gdkwin32display.h"
 #include "gdkwin32screen.h"
 #include "gdkwin32window.h"
+#include "gdkwin32.h"
 
 #define HAVE_MONITOR_INFO
 
@@ -383,7 +384,9 @@ inner_clipboard_window_procedure (HWND   hwnd,
       {
         int success;
         HWND hwndOwner;
+#ifdef G_ENABLE_DEBUG
         UINT nFormat = 0;
+#endif
         GdkEvent *event;
         GdkWindow *owner;
 

diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c
index b3932a1e6217d241dffc2eadf28468e198a8382b..2627e796354471f5c2e703f9d6ea6a6c632ad580 100644 (file)
--- a/gdk/win32/gdkevents-win32.c
+++ b/gdk/win32/gdkevents-win32.c
@@ -2613,8 +2613,6 @@ gdk_event_translate (MSG  *msg,
 
      case WM_MOUSEACTIVATE:
        {
-        GdkWindow *tmp;
-
         if (gdk_window_get_window_type (window) == GDK_WINDOW_TEMP 
             || !window->accept_focus)
           {

diff --git a/gdk/win32/gdkprivate-win32.h b/gdk/win32/gdkprivate-win32.h
index 7456de21f7ecb0c318818b48205eecbbaa0c9919..c039c9ef3965a64e52f04392217120a514785f42 100644 (file)
--- a/gdk/win32/gdkprivate-win32.h
+++ b/gdk/win32/gdkprivate-win32.h
@@ -404,7 +404,7 @@ gboolean   _gdk_win32_display_set_selection_owner   (GdkDisplay *display,
                                                     guint32     time,
                                                     gboolean    send_event);
 void       _gdk_win32_display_send_selection_notify (GdkDisplay      *display,
-                                                    HWND             requestor,
+                                                    GdkWindow       *requestor,
                                                     GdkAtom          selection,
                                                     GdkAtom          target,
                                                     GdkAtom          property,

diff --git a/gdk/win32/gdkselection-win32.c b/gdk/win32/gdkselection-win32.c
index af38356443ad2b02e54f03dd9beca870fec1615e..ebfbc2b41e054529fea0784488ac92020f2295b1 100644 (file)
--- a/gdk/win32/gdkselection-win32.c
+++ b/gdk/win32/gdkselection-win32.c
@@ -874,7 +874,7 @@ _gdk_selection_property_delete (GdkWindow *window)
 
 void
 _gdk_win32_display_send_selection_notify (GdkDisplay   *display,
-                                         HWND          requestor,
+                                         GdkWindow    *requestor,
                                          GdkAtom       selection,
                                          GdkAtom       target,
                                          GdkAtom       property,

diff --git a/gdk/win32/gdkwindow-win32.c b/gdk/win32/gdkwindow-win32.c
index 4985103a01dd640bf6a2727866d90bbeecc37ccb..3c3cf6e6dcb3ff63728527964e51d3d130e09772 100644 (file)
--- a/gdk/win32/gdkwindow-win32.c
+++ b/gdk/win32/gdkwindow-win32.c
@@ -870,7 +870,9 @@ adjust_for_gravity_hints (GdkWindow *window,
 
   if (impl->hint_flags & GDK_HINT_WIN_GRAVITY)
     {
+#ifdef G_ENABLE_DEBUG
       gint orig_x = *x, orig_y = *y;
+#endif
 
       switch (impl->hints.win_gravity)
        {
@@ -933,7 +935,6 @@ show_window_internal (GdkWindow *window,
                      gboolean   deiconify)
 {
   GdkWindowImplWin32 *window_impl;
-  HWND old_active_window;
   gboolean focus_on_map = FALSE;
   DWORD exstyle;