Delete the gdk_DC when exiting, just to be sure.

1999-09-21  Tor Lillqvist  <tml@iki.fi>

* gdk/win32/gdk.c (gdk_exit_func): Delete the gdk_DC when exiting,
just to be sure.

* gdk/win32/gdkvisual.c (gdk_visual_init): Remove a couple of
unused variables, leftovers from the X11 version.

* gdk/win32/rc/*.cur: Better cursors provided by Bernd Herd.

* gtk/gtkfontsel.c (gtk_font_selection_get_xlfd_field): Only
downcase fields on X11.

70 files changed, 101 insertions, 39 deletions

diff --git a/ChangeLog b/ChangeLog
index e1ca6d7364..b3c28abbd7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+1999-09-21  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk/win32/gdk.c (gdk_exit_func): Delete the gdk_DC when exiting,
+	just to be sure.
+
+	* gdk/win32/gdkvisual.c (gdk_visual_init): Remove a couple of
+	unused variables, leftovers from the X11 version.
+
+	* gdk/win32/rc/*.cur: Better cursors provided by Bernd Herd.
+
+	* gtk/gtkfontsel.c (gtk_font_selection_get_xlfd_field): Only
+	downcase fields on X11.
+
 Mon Sep 20 13:17:39 1999  Pablo Saratxaga <pablo@mandrakesoft.com>
         
         * configure.in,po/pt_BR.po: added Portuguese Brazilian file from
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index e1ca6d7364..b3c28abbd7 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,16 @@
+1999-09-21  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk/win32/gdk.c (gdk_exit_func): Delete the gdk_DC when exiting,
+	just to be sure.
+
+	* gdk/win32/gdkvisual.c (gdk_visual_init): Remove a couple of
+	unused variables, leftovers from the X11 version.
+
+	* gdk/win32/rc/*.cur: Better cursors provided by Bernd Herd.
+
+	* gtk/gtkfontsel.c (gtk_font_selection_get_xlfd_field): Only
+	downcase fields on X11.
+
 Mon Sep 20 13:17:39 1999  Pablo Saratxaga <pablo@mandrakesoft.com>
         
         * configure.in,po/pt_BR.po: added Portuguese Brazilian file from
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index e1ca6d7364..b3c28abbd7 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,16 @@
+1999-09-21  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk/win32/gdk.c (gdk_exit_func): Delete the gdk_DC when exiting,
+	just to be sure.
+
+	* gdk/win32/gdkvisual.c (gdk_visual_init): Remove a couple of
+	unused variables, leftovers from the X11 version.
+
+	* gdk/win32/rc/*.cur: Better cursors provided by Bernd Herd.
+
+	* gtk/gtkfontsel.c (gtk_font_selection_get_xlfd_field): Only
+	downcase fields on X11.
+
 Mon Sep 20 13:17:39 1999  Pablo Saratxaga <pablo@mandrakesoft.com>
         
         * configure.in,po/pt_BR.po: added Portuguese Brazilian file from
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index e1ca6d7364..b3c28abbd7 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,16 @@
+1999-09-21  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk/win32/gdk.c (gdk_exit_func): Delete the gdk_DC when exiting,
+	just to be sure.
+
+	* gdk/win32/gdkvisual.c (gdk_visual_init): Remove a couple of
+	unused variables, leftovers from the X11 version.
+
+	* gdk/win32/rc/*.cur: Better cursors provided by Bernd Herd.
+
+	* gtk/gtkfontsel.c (gtk_font_selection_get_xlfd_field): Only
+	downcase fields on X11.
+
 Mon Sep 20 13:17:39 1999  Pablo Saratxaga <pablo@mandrakesoft.com>
         
         * configure.in,po/pt_BR.po: added Portuguese Brazilian file from
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index e1ca6d7364..b3c28abbd7 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,16 @@
+1999-09-21  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk/win32/gdk.c (gdk_exit_func): Delete the gdk_DC when exiting,
+	just to be sure.
+
+	* gdk/win32/gdkvisual.c (gdk_visual_init): Remove a couple of
+	unused variables, leftovers from the X11 version.
+
+	* gdk/win32/rc/*.cur: Better cursors provided by Bernd Herd.
+
+	* gtk/gtkfontsel.c (gtk_font_selection_get_xlfd_field): Only
+	downcase fields on X11.
+
 Mon Sep 20 13:17:39 1999  Pablo Saratxaga <pablo@mandrakesoft.com>
         
         * configure.in,po/pt_BR.po: added Portuguese Brazilian file from
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index e1ca6d7364..b3c28abbd7 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,16 @@
+1999-09-21  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk/win32/gdk.c (gdk_exit_func): Delete the gdk_DC when exiting,
+	just to be sure.
+
+	* gdk/win32/gdkvisual.c (gdk_visual_init): Remove a couple of
+	unused variables, leftovers from the X11 version.
+
+	* gdk/win32/rc/*.cur: Better cursors provided by Bernd Herd.
+
+	* gtk/gtkfontsel.c (gtk_font_selection_get_xlfd_field): Only
+	downcase fields on X11.
+
 Mon Sep 20 13:17:39 1999  Pablo Saratxaga <pablo@mandrakesoft.com>
         
         * configure.in,po/pt_BR.po: added Portuguese Brazilian file from
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index e1ca6d7364..b3c28abbd7 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,16 @@
+1999-09-21  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk/win32/gdk.c (gdk_exit_func): Delete the gdk_DC when exiting,
+	just to be sure.
+
+	* gdk/win32/gdkvisual.c (gdk_visual_init): Remove a couple of
+	unused variables, leftovers from the X11 version.
+
+	* gdk/win32/rc/*.cur: Better cursors provided by Bernd Herd.
+
+	* gtk/gtkfontsel.c (gtk_font_selection_get_xlfd_field): Only
+	downcase fields on X11.
+
 Mon Sep 20 13:17:39 1999  Pablo Saratxaga <pablo@mandrakesoft.com>
         
         * configure.in,po/pt_BR.po: added Portuguese Brazilian file from
diff --git a/gdk/win32/gdk.c b/gdk/win32/gdk.c
index 8566e2913b..9f751e3b29 100644
--- a/gdk/win32/gdk.c
+++ b/gdk/win32/gdk.c
@@ -617,6 +617,8 @@ gdk_exit_func (void)
       gdk_input_exit ();
       gdk_key_repeat_restore ();
       gdk_dnd_exit ();
+      DeleteDC (gdk_DC);
+      gdk_DC = NULL;
       gdk_initialized = 0;
     }
 }
diff --git a/gdk/win32/gdkmain-win32.c b/gdk/win32/gdkmain-win32.c
index 8566e2913b..9f751e3b29 100644
--- a/gdk/win32/gdkmain-win32.c
+++ b/gdk/win32/gdkmain-win32.c
@@ -617,6 +617,8 @@ gdk_exit_func (void)
       gdk_input_exit ();
       gdk_key_repeat_restore ();
       gdk_dnd_exit ();
+      DeleteDC (gdk_DC);
+      gdk_DC = NULL;
       gdk_initialized = 0;
     }
 }
diff --git a/gdk/win32/gdkvisual-win32.c b/gdk/win32/gdkvisual-win32.c
index f274117954..6caa2dc286 100644
--- a/gdk/win32/gdkvisual-win32.c
+++ b/gdk/win32/gdkvisual-win32.c
@@ -67,29 +67,13 @@ gdk_visual_init (void)
   } bmi;
   HBITMAP hbm;
 
-  static const gint possible_depths[7] = { 32, 24, 16, 15, 8, 4, 1 };
-  static const GdkVisualType possible_types[6] =
-    {
-      GDK_VISUAL_DIRECT_COLOR,
-      GDK_VISUAL_TRUE_COLOR,
-      GDK_VISUAL_PSEUDO_COLOR,
-      GDK_VISUAL_STATIC_COLOR,
-      GDK_VISUAL_GRAYSCALE,
-      GDK_VISUAL_STATIC_GRAY
-    };
-
-  static const gint npossible_depths = sizeof(possible_depths)/sizeof(gint);
-  static const gint npossible_types = sizeof(possible_types)/sizeof(GdkVisualType);
-
-  int rastercaps, numcolors, sizepalette, colorres, bitspixel;
-  Visual *default_xvisual;
+  int rastercaps, numcolors, sizepalette, bitspixel;
 
   system_visual = g_new (GdkVisualPrivate, 1);
 
   bitspixel = GetDeviceCaps (gdk_DC, BITSPIXEL);
   rastercaps = GetDeviceCaps (gdk_DC, RASTERCAPS);
-  default_xvisual = g_new (Visual, 1);
-  system_visual->xvisual = default_xvisual;
+  system_visual->xvisual = g_new (Visual, 1);
   system_visual->xvisual->visualid = 0;
   system_visual->xvisual->bitspixel = bitspixel;
 
@@ -98,7 +82,6 @@ gdk_visual_init (void)
       system_visual->visual.type = GDK_VISUAL_PSEUDO_COLOR;
       numcolors = GetDeviceCaps (gdk_DC, NUMCOLORS);
       sizepalette = GetDeviceCaps (gdk_DC, SIZEPALETTE);
-      colorres = GetDeviceCaps (gdk_DC, COLORRES);
       system_visual->xvisual->map_entries = sizepalette;
     }
   else if (bitspixel == 1)
diff --git a/gdk/win32/gdkvisual.c b/gdk/win32/gdkvisual.c
index f274117954..6caa2dc286 100644
--- a/gdk/win32/gdkvisual.c
+++ b/gdk/win32/gdkvisual.c
@@ -67,29 +67,13 @@ gdk_visual_init (void)
   } bmi;
   HBITMAP hbm;
 
-  static const gint possible_depths[7] = { 32, 24, 16, 15, 8, 4, 1 };
-  static const GdkVisualType possible_types[6] =
-    {
-      GDK_VISUAL_DIRECT_COLOR,
-      GDK_VISUAL_TRUE_COLOR,
-      GDK_VISUAL_PSEUDO_COLOR,
-      GDK_VISUAL_STATIC_COLOR,
-      GDK_VISUAL_GRAYSCALE,
-      GDK_VISUAL_STATIC_GRAY
-    };
-
-  static const gint npossible_depths = sizeof(possible_depths)/sizeof(gint);
-  static const gint npossible_types = sizeof(possible_types)/sizeof(GdkVisualType);
-
-  int rastercaps, numcolors, sizepalette, colorres, bitspixel;
-  Visual *default_xvisual;
+  int rastercaps, numcolors, sizepalette, bitspixel;
 
   system_visual = g_new (GdkVisualPrivate, 1);
 
   bitspixel = GetDeviceCaps (gdk_DC, BITSPIXEL);
   rastercaps = GetDeviceCaps (gdk_DC, RASTERCAPS);
-  default_xvisual = g_new (Visual, 1);
-  system_visual->xvisual = default_xvisual;
+  system_visual->xvisual = g_new (Visual, 1);
   system_visual->xvisual->visualid = 0;
   system_visual->xvisual->bitspixel = bitspixel;
 
@@ -98,7 +82,6 @@ gdk_visual_init (void)
       system_visual->visual.type = GDK_VISUAL_PSEUDO_COLOR;
       numcolors = GetDeviceCaps (gdk_DC, NUMCOLORS);
       sizepalette = GetDeviceCaps (gdk_DC, SIZEPALETTE);
-      colorres = GetDeviceCaps (gdk_DC, COLORRES);
       system_visual->xvisual->map_entries = sizepalette;
     }
   else if (bitspixel == 1)
diff --git a/gdk/win32/rc/cursor00.cur b/gdk/win32/rc/cursor00.cur
index 337e6d4e90..47fa7e6cb0 100644
--- a/gdk/win32/rc/cursor00.cur
+++ b/gdk/win32/rc/cursor00.cur
diff --git a/gdk/win32/rc/cursor08.cur b/gdk/win32/rc/cursor08.cur
index d9f15f7756..de7684b746 100644
--- a/gdk/win32/rc/cursor08.cur
+++ b/gdk/win32/rc/cursor08.cur
diff --git a/gdk/win32/rc/cursor0a.cur b/gdk/win32/rc/cursor0a.cur
index 3f8ef45620..4062b83e8d 100644
--- a/gdk/win32/rc/cursor0a.cur
+++ b/gdk/win32/rc/cursor0a.cur
diff --git a/gdk/win32/rc/cursor1a.cur b/gdk/win32/rc/cursor1a.cur
index 1448e33154..6a4d834011 100644
--- a/gdk/win32/rc/cursor1a.cur
+++ b/gdk/win32/rc/cursor1a.cur
diff --git a/gdk/win32/rc/cursor1c.cur b/gdk/win32/rc/cursor1c.cur
index 828f84d223..7e838d807b 100644
--- a/gdk/win32/rc/cursor1c.cur
+++ b/gdk/win32/rc/cursor1c.cur
diff --git a/gdk/win32/rc/cursor1e.cur b/gdk/win32/rc/cursor1e.cur
index 49fa7f70dd..16dad8a41c 100644
--- a/gdk/win32/rc/cursor1e.cur
+++ b/gdk/win32/rc/cursor1e.cur
diff --git a/gdk/win32/rc/cursor20.cur b/gdk/win32/rc/cursor20.cur
index cf177a16c4..72449b2312 100644
--- a/gdk/win32/rc/cursor20.cur
+++ b/gdk/win32/rc/cursor20.cur
diff --git a/gdk/win32/rc/cursor22.cur b/gdk/win32/rc/cursor22.cur
index 2f8e91247f..650226616c 100644
--- a/gdk/win32/rc/cursor22.cur
+++ b/gdk/win32/rc/cursor22.cur
diff --git a/gdk/win32/rc/cursor24.cur b/gdk/win32/rc/cursor24.cur
index 87ba5b4db1..be84e6338b 100644
--- a/gdk/win32/rc/cursor24.cur
+++ b/gdk/win32/rc/cursor24.cur
diff --git a/gdk/win32/rc/cursor26.cur b/gdk/win32/rc/cursor26.cur
index 0b2dbd2578..be6badfef1 100644
--- a/gdk/win32/rc/cursor26.cur
+++ b/gdk/win32/rc/cursor26.cur
diff --git a/gdk/win32/rc/cursor28.cur b/gdk/win32/rc/cursor28.cur
index 30550f9561..70ab30a62a 100644
--- a/gdk/win32/rc/cursor28.cur
+++ b/gdk/win32/rc/cursor28.cur
diff --git a/gdk/win32/rc/cursor2a.cur b/gdk/win32/rc/cursor2a.cur
index 8dca4321fa..8a49beed9f 100644
--- a/gdk/win32/rc/cursor2a.cur
+++ b/gdk/win32/rc/cursor2a.cur
diff --git a/gdk/win32/rc/cursor30.cur b/gdk/win32/rc/cursor30.cur
index 70ef4fd23f..71feb11dab 100644
--- a/gdk/win32/rc/cursor30.cur
+++ b/gdk/win32/rc/cursor30.cur
diff --git a/gdk/win32/rc/cursor32.cur b/gdk/win32/rc/cursor32.cur
index 93b5c4759c..dc398fffa2 100644
--- a/gdk/win32/rc/cursor32.cur
+++ b/gdk/win32/rc/cursor32.cur
diff --git a/gdk/win32/rc/cursor34.cur b/gdk/win32/rc/cursor34.cur
index 0fad3f1cfb..325b8116f3 100644
--- a/gdk/win32/rc/cursor34.cur
+++ b/gdk/win32/rc/cursor34.cur
diff --git a/gdk/win32/rc/cursor36.cur b/gdk/win32/rc/cursor36.cur
index fc8d4f6d4e..bdee4ec894 100644
--- a/gdk/win32/rc/cursor36.cur
+++ b/gdk/win32/rc/cursor36.cur
diff --git a/gdk/win32/rc/cursor38.cur b/gdk/win32/rc/cursor38.cur
index c59a842d71..31fccbdfd9 100644
--- a/gdk/win32/rc/cursor38.cur
+++ b/gdk/win32/rc/cursor38.cur
diff --git a/gdk/win32/rc/cursor3a.cur b/gdk/win32/rc/cursor3a.cur
index 003c2b57ae..4cf6ef99a5 100644
--- a/gdk/win32/rc/cursor3a.cur
+++ b/gdk/win32/rc/cursor3a.cur
diff --git a/gdk/win32/rc/cursor42.cur b/gdk/win32/rc/cursor42.cur
index 387d5f0bef..efe9555da1 100644
--- a/gdk/win32/rc/cursor42.cur
+++ b/gdk/win32/rc/cursor42.cur
diff --git a/gdk/win32/rc/cursor46.cur b/gdk/win32/rc/cursor46.cur
index 3e97094d93..27c9807896 100644
--- a/gdk/win32/rc/cursor46.cur
+++ b/gdk/win32/rc/cursor46.cur
diff --git a/gdk/win32/rc/cursor48.cur b/gdk/win32/rc/cursor48.cur
index 2a5689731e..6d475163f3 100644
--- a/gdk/win32/rc/cursor48.cur
+++ b/gdk/win32/rc/cursor48.cur
diff --git a/gdk/win32/rc/cursor4a.cur b/gdk/win32/rc/cursor4a.cur
index 30febfa2d4..a429ae40a7 100644
--- a/gdk/win32/rc/cursor4a.cur
+++ b/gdk/win32/rc/cursor4a.cur
diff --git a/gdk/win32/rc/cursor4c.cur b/gdk/win32/rc/cursor4c.cur
index 0407d77a21..830d5922fe 100644
--- a/gdk/win32/rc/cursor4c.cur
+++ b/gdk/win32/rc/cursor4c.cur
diff --git a/gdk/win32/rc/cursor4e.cur b/gdk/win32/rc/cursor4e.cur
index a58e3dba5e..5728c00760 100644
--- a/gdk/win32/rc/cursor4e.cur
+++ b/gdk/win32/rc/cursor4e.cur
diff --git a/gdk/win32/rc/cursor50.cur b/gdk/win32/rc/cursor50.cur
index 7352420db4..8c40ee11d3 100644
--- a/gdk/win32/rc/cursor50.cur
+++ b/gdk/win32/rc/cursor50.cur
diff --git a/gdk/win32/rc/cursor52.cur b/gdk/win32/rc/cursor52.cur
index 435f99f46b..e9ca646051 100644
--- a/gdk/win32/rc/cursor52.cur
+++ b/gdk/win32/rc/cursor52.cur
diff --git a/gdk/win32/rc/cursor54.cur b/gdk/win32/rc/cursor54.cur
index 54eb4f2ce0..8bec613869 100644
--- a/gdk/win32/rc/cursor54.cur
+++ b/gdk/win32/rc/cursor54.cur
diff --git a/gdk/win32/rc/cursor56.cur b/gdk/win32/rc/cursor56.cur
index 1796f7352c..3941455be4 100644
--- a/gdk/win32/rc/cursor56.cur
+++ b/gdk/win32/rc/cursor56.cur
diff --git a/gdk/win32/rc/cursor58.cur b/gdk/win32/rc/cursor58.cur
index 98b6a2fb59..675e7a6767 100644
--- a/gdk/win32/rc/cursor58.cur
+++ b/gdk/win32/rc/cursor58.cur
diff --git a/gdk/win32/rc/cursor5a.cur b/gdk/win32/rc/cursor5a.cur
index b00070e5c5..181bb569c0 100644
--- a/gdk/win32/rc/cursor5a.cur
+++ b/gdk/win32/rc/cursor5a.cur
diff --git a/gdk/win32/rc/cursor5c.cur b/gdk/win32/rc/cursor5c.cur
index a407b55fb2..65d4eaa217 100644
--- a/gdk/win32/rc/cursor5c.cur
+++ b/gdk/win32/rc/cursor5c.cur
diff --git a/gdk/win32/rc/cursor60.cur b/gdk/win32/rc/cursor60.cur
index 847969d261..228f7156e7 100644
--- a/gdk/win32/rc/cursor60.cur
+++ b/gdk/win32/rc/cursor60.cur
diff --git a/gdk/win32/rc/cursor62.cur b/gdk/win32/rc/cursor62.cur
index 36404a50b0..5ab040ee33 100644
--- a/gdk/win32/rc/cursor62.cur
+++ b/gdk/win32/rc/cursor62.cur
diff --git a/gdk/win32/rc/cursor64.cur b/gdk/win32/rc/cursor64.cur
index a6bdd0efc9..2343db4326 100644
--- a/gdk/win32/rc/cursor64.cur
+++ b/gdk/win32/rc/cursor64.cur
diff --git a/gdk/win32/rc/cursor66.cur b/gdk/win32/rc/cursor66.cur
index 81d53b4269..cb8a08835e 100644
--- a/gdk/win32/rc/cursor66.cur
+++ b/gdk/win32/rc/cursor66.cur
diff --git a/gdk/win32/rc/cursor6a.cur b/gdk/win32/rc/cursor6a.cur
index 20f138e45d..0dd3104efd 100644
--- a/gdk/win32/rc/cursor6a.cur
+++ b/gdk/win32/rc/cursor6a.cur
diff --git a/gdk/win32/rc/cursor6c.cur b/gdk/win32/rc/cursor6c.cur
index 1e8d6d82e3..7ec5568425 100644
--- a/gdk/win32/rc/cursor6c.cur
+++ b/gdk/win32/rc/cursor6c.cur
diff --git a/gdk/win32/rc/cursor6e.cur b/gdk/win32/rc/cursor6e.cur
index 3a9b6b0ff1..9a7c0647ad 100644
--- a/gdk/win32/rc/cursor6e.cur
+++ b/gdk/win32/rc/cursor6e.cur
diff --git a/gdk/win32/rc/cursor70.cur b/gdk/win32/rc/cursor70.cur
index e2d76732af..81c913c495 100644
--- a/gdk/win32/rc/cursor70.cur
+++ b/gdk/win32/rc/cursor70.cur
diff --git a/gdk/win32/rc/cursor72.cur b/gdk/win32/rc/cursor72.cur
index 4994c6e7a2..dfb3fde7bb 100644
--- a/gdk/win32/rc/cursor72.cur
+++ b/gdk/win32/rc/cursor72.cur
diff --git a/gdk/win32/rc/cursor74.cur b/gdk/win32/rc/cursor74.cur
index d5e43613d3..62784fcb51 100644
--- a/gdk/win32/rc/cursor74.cur
+++ b/gdk/win32/rc/cursor74.cur
diff --git a/gdk/win32/rc/cursor76.cur b/gdk/win32/rc/cursor76.cur
index 34f402aaca..fc0a303c78 100644
--- a/gdk/win32/rc/cursor76.cur
+++ b/gdk/win32/rc/cursor76.cur
diff --git a/gdk/win32/rc/cursor78.cur b/gdk/win32/rc/cursor78.cur
index 70e25dd1c6..9eb2f15cad 100644
--- a/gdk/win32/rc/cursor78.cur
+++ b/gdk/win32/rc/cursor78.cur
diff --git a/gdk/win32/rc/cursor7a.cur b/gdk/win32/rc/cursor7a.cur
index 5ea95c4c67..2c1170471d 100644
--- a/gdk/win32/rc/cursor7a.cur
+++ b/gdk/win32/rc/cursor7a.cur
diff --git a/gdk/win32/rc/cursor7c.cur b/gdk/win32/rc/cursor7c.cur
index 38036ab36c..1c1b4c2a66 100644
--- a/gdk/win32/rc/cursor7c.cur
+++ b/gdk/win32/rc/cursor7c.cur
diff --git a/gdk/win32/rc/cursor7e.cur b/gdk/win32/rc/cursor7e.cur
index 4b24e50885..9b28e897f2 100644
--- a/gdk/win32/rc/cursor7e.cur
+++ b/gdk/win32/rc/cursor7e.cur
diff --git a/gdk/win32/rc/cursor80.cur b/gdk/win32/rc/cursor80.cur
index a3955a5f7e..d33152a459 100644
--- a/gdk/win32/rc/cursor80.cur
+++ b/gdk/win32/rc/cursor80.cur
diff --git a/gdk/win32/rc/cursor82.cur b/gdk/win32/rc/cursor82.cur
index 984cfbaac8..a19ed75d8d 100644
--- a/gdk/win32/rc/cursor82.cur
+++ b/gdk/win32/rc/cursor82.cur
diff --git a/gdk/win32/rc/cursor86.cur b/gdk/win32/rc/cursor86.cur
index 2d38c0351f..cb3d97c5c2 100644
--- a/gdk/win32/rc/cursor86.cur
+++ b/gdk/win32/rc/cursor86.cur
diff --git a/gdk/win32/rc/cursor88.cur b/gdk/win32/rc/cursor88.cur
index 62b80615f8..fd0d0b7467 100644
--- a/gdk/win32/rc/cursor88.cur
+++ b/gdk/win32/rc/cursor88.cur
diff --git a/gdk/win32/rc/cursor8a.cur b/gdk/win32/rc/cursor8a.cur
index 6c5358d69a..d017f52401 100644
--- a/gdk/win32/rc/cursor8a.cur
+++ b/gdk/win32/rc/cursor8a.cur
diff --git a/gdk/win32/rc/cursor8c.cur b/gdk/win32/rc/cursor8c.cur
index 103010b645..235dfbdc0f 100644
--- a/gdk/win32/rc/cursor8c.cur
+++ b/gdk/win32/rc/cursor8c.cur
diff --git a/gdk/win32/rc/cursor8e.cur b/gdk/win32/rc/cursor8e.cur
index a500a38dff..94c10ce575 100644
--- a/gdk/win32/rc/cursor8e.cur
+++ b/gdk/win32/rc/cursor8e.cur
diff --git a/gdk/win32/rc/cursor90.cur b/gdk/win32/rc/cursor90.cur
index 08731f8236..14f8615ded 100644
--- a/gdk/win32/rc/cursor90.cur
+++ b/gdk/win32/rc/cursor90.cur
diff --git a/gdk/win32/rc/cursor92.cur b/gdk/win32/rc/cursor92.cur
index 4364b5df1c..b8dbe3c8f7 100644
--- a/gdk/win32/rc/cursor92.cur
+++ b/gdk/win32/rc/cursor92.cur
diff --git a/gdk/win32/rc/cursor94.cur b/gdk/win32/rc/cursor94.cur
index 7777d5380a..cc215ab851 100644
--- a/gdk/win32/rc/cursor94.cur
+++ b/gdk/win32/rc/cursor94.cur
diff --git a/gdk/win32/rc/cursor96.cur b/gdk/win32/rc/cursor96.cur
index cecaea39b5..e4ec732306 100644
--- a/gdk/win32/rc/cursor96.cur
+++ b/gdk/win32/rc/cursor96.cur
diff --git a/gdk/win32/rc/cursor98.cur b/gdk/win32/rc/cursor98.cur
index 5cab68ebac..8c72b79015 100644
--- a/gdk/win32/rc/cursor98.cur
+++ b/gdk/win32/rc/cursor98.cur
diff --git a/gtk/gtkfontsel.c b/gtk/gtkfontsel.c
index b9dc839698..1346e4516e 100644
--- a/gtk/gtkfontsel.c
+++ b/gtk/gtkfontsel.c
@@ -3602,9 +3602,10 @@ gtk_font_selection_get_xlfd_field (const gchar *fontname,
 	return NULL;
       strncpy (buffer, t1, len);
       buffer[len] = 0;
-
+#if GDK_WINDOWING == GDK_WINDOWING_X11
       /* Convert to lower case. */
       g_strdown (buffer);
+#endif
     }
   else
     strcpy(buffer, "(nil)");