Fixes from #98358, Havoc Pennington.

[~andy/gtk] / gdk / win32 / gdkscreen-win32.c

diff --git a/gdk/win32/gdkscreen-win32.c b/gdk/win32/gdkscreen-win32.c
index f5e8074ba4c1e31e94535a1edb566b3dcf165132..51850b27eab1ed06f916de8ef0fd571e53e6987a 100644 (file)
--- a/gdk/win32/gdkscreen-win32.c
+++ b/gdk/win32/gdkscreen-win32.c
@@ -17,22 +17,15 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <gdkscreen.h>
-#include "gdkprivate-win32.h" /* _gdk_parent_root */
-#include "gdk.h" /* gdk_screen_width(), ... */
+#include "gdk.h"
+#include "gdkprivate-win32.h"
 
 static GdkColormap *default_colormap = NULL;
 
 GdkDisplay *
 gdk_screen_get_display (GdkScreen *screen)
 {
-  return gdk_display_get_default ();
-}
-
-gint
-gdk_screen_get_screen_num (GdkScreen *screen)
-{
-  return 1;
+  return _gdk_display;
 }
 
 GdkWindow *
@@ -51,10 +44,20 @@ void
 gdk_screen_set_default_colormap (GdkScreen   *screen,
                                 GdkColormap *colormap)
 {
-  default_colormap = colormap;
+  GdkColormap *old_colormap;
+  
+  g_return_if_fail (GDK_IS_SCREEN (screen));
+  g_return_if_fail (GDK_IS_COLORMAP (colormap));
+
+  old_colormap = default_colormap;
+
+  default_colormap = g_object_ref (colormap);
+  
+  if (old_colormap)
+    g_object_unref (old_colormap);
 }
 
-gint 
+gint
 gdk_screen_get_n_monitors (GdkScreen *screen)
 {
   g_return_val_if_fail (GDK_IS_SCREEN (screen), 1);
@@ -80,3 +83,16 @@ gdk_screen_get_number (GdkScreen *screen)
   
   return 0;
 }
+
+gchar * 
+_gdk_windowing_substitute_screen_number (const gchar *display_name,
+                                        int          screen_number)
+{
+  return g_strdup (display_name);
+}
+
+gchar *
+gdk_screen_make_display_name (GdkScreen *screen)
+{
+  return g_strdup ("");
+}