removed that function as gdk_drawable_get_screen does the job. #79964

2002-05-01 Erwann Chenede - <erwann.chenede@sun.com>

  * gdk/gdkpixmap.[hc] (gdk_pixmap_get_screen):
  * x11/gdkpixmap-x11.c:
  removed that function as gdk_drawable_get_screen
  does the job. #79964

diff --git a/ChangeLog b/ChangeLog
index cf7cad289f16cbce2bbcb02dc812b6d786c70aeb..e0f23de2b42ab53c81b30c62f3f8756904f1c12d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,14 @@
+2002-05-01 Erwann Chenede - <erwann.chenede@sun.com>
+       
+       * gdk/gdkpixmap.[hc] (gdk_pixmap_get_screen):
+       * x11/gdkpixmap-x11.c:
+       removed that function as gdk_drawable_get_screen
+       does the job. #79964
+
 2002-05-01 Erwann Chenede - <erwann.chenede@sun.com>
 
        * gdk/gdkscreen.[hc] (gdk_screen_x11_get_monitor_at_window):
-       remove virtualization and made it cross platform. fix #79961
+       remove virtualization and made it cross platform. #79961
        * gdk/x11/gdkdisplay-x11.c (check_solaris_xinerama):
        fixed initialization bugs.
        * gdk/x11/gdkscreen-x11.[hc] (gdk_screen_get_monitor_geometry):
@@ -9,7 +16,7 @@
        * gtk/gtkwindow.c (gtk_window_compute_configure_request):
        * gtk/gtkmenu.c (gtk_menu_position):
        take a GdkRectangle argument instead of returning 
-       a GdkRectangle * and propagated the changes. fix #79974
+       a GdkRectangle * and propagated the changes. #79974
        
 2002-05-01  Anders Carlsson  <andersca@gnu.org>
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index cf7cad289f16cbce2bbcb02dc812b6d786c70aeb..e0f23de2b42ab53c81b30c62f3f8756904f1c12d 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,7 +1,14 @@
+2002-05-01 Erwann Chenede - <erwann.chenede@sun.com>
+       
+       * gdk/gdkpixmap.[hc] (gdk_pixmap_get_screen):
+       * x11/gdkpixmap-x11.c:
+       removed that function as gdk_drawable_get_screen
+       does the job. #79964
+
 2002-05-01 Erwann Chenede - <erwann.chenede@sun.com>
 
        * gdk/gdkscreen.[hc] (gdk_screen_x11_get_monitor_at_window):
-       remove virtualization and made it cross platform. fix #79961
+       remove virtualization and made it cross platform. #79961
        * gdk/x11/gdkdisplay-x11.c (check_solaris_xinerama):
        fixed initialization bugs.
        * gdk/x11/gdkscreen-x11.[hc] (gdk_screen_get_monitor_geometry):
@@ -9,7 +16,7 @@
        * gtk/gtkwindow.c (gtk_window_compute_configure_request):
        * gtk/gtkmenu.c (gtk_menu_position):
        take a GdkRectangle argument instead of returning 
-       a GdkRectangle * and propagated the changes. fix #79974
+       a GdkRectangle * and propagated the changes. #79974
        
 2002-05-01  Anders Carlsson  <andersca@gnu.org>
 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index cf7cad289f16cbce2bbcb02dc812b6d786c70aeb..e0f23de2b42ab53c81b30c62f3f8756904f1c12d 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,7 +1,14 @@
+2002-05-01 Erwann Chenede - <erwann.chenede@sun.com>
+       
+       * gdk/gdkpixmap.[hc] (gdk_pixmap_get_screen):
+       * x11/gdkpixmap-x11.c:
+       removed that function as gdk_drawable_get_screen
+       does the job. #79964
+
 2002-05-01 Erwann Chenede - <erwann.chenede@sun.com>
 
        * gdk/gdkscreen.[hc] (gdk_screen_x11_get_monitor_at_window):
-       remove virtualization and made it cross platform. fix #79961
+       remove virtualization and made it cross platform. #79961
        * gdk/x11/gdkdisplay-x11.c (check_solaris_xinerama):
        fixed initialization bugs.
        * gdk/x11/gdkscreen-x11.[hc] (gdk_screen_get_monitor_geometry):
@@ -9,7 +16,7 @@
        * gtk/gtkwindow.c (gtk_window_compute_configure_request):
        * gtk/gtkmenu.c (gtk_menu_position):
        take a GdkRectangle argument instead of returning 
-       a GdkRectangle * and propagated the changes. fix #79974
+       a GdkRectangle * and propagated the changes. #79974
        
 2002-05-01  Anders Carlsson  <andersca@gnu.org>
 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index cf7cad289f16cbce2bbcb02dc812b6d786c70aeb..e0f23de2b42ab53c81b30c62f3f8756904f1c12d 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,7 +1,14 @@
+2002-05-01 Erwann Chenede - <erwann.chenede@sun.com>
+       
+       * gdk/gdkpixmap.[hc] (gdk_pixmap_get_screen):
+       * x11/gdkpixmap-x11.c:
+       removed that function as gdk_drawable_get_screen
+       does the job. #79964
+
 2002-05-01 Erwann Chenede - <erwann.chenede@sun.com>
 
        * gdk/gdkscreen.[hc] (gdk_screen_x11_get_monitor_at_window):
-       remove virtualization and made it cross platform. fix #79961
+       remove virtualization and made it cross platform. #79961
        * gdk/x11/gdkdisplay-x11.c (check_solaris_xinerama):
        fixed initialization bugs.
        * gdk/x11/gdkscreen-x11.[hc] (gdk_screen_get_monitor_geometry):
@@ -9,7 +16,7 @@
        * gtk/gtkwindow.c (gtk_window_compute_configure_request):
        * gtk/gtkmenu.c (gtk_menu_position):
        take a GdkRectangle argument instead of returning 
-       a GdkRectangle * and propagated the changes. fix #79974
+       a GdkRectangle * and propagated the changes. #79974
        
 2002-05-01  Anders Carlsson  <andersca@gnu.org>
 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index cf7cad289f16cbce2bbcb02dc812b6d786c70aeb..e0f23de2b42ab53c81b30c62f3f8756904f1c12d 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,7 +1,14 @@
+2002-05-01 Erwann Chenede - <erwann.chenede@sun.com>
+       
+       * gdk/gdkpixmap.[hc] (gdk_pixmap_get_screen):
+       * x11/gdkpixmap-x11.c:
+       removed that function as gdk_drawable_get_screen
+       does the job. #79964
+
 2002-05-01 Erwann Chenede - <erwann.chenede@sun.com>
 
        * gdk/gdkscreen.[hc] (gdk_screen_x11_get_monitor_at_window):
-       remove virtualization and made it cross platform. fix #79961
+       remove virtualization and made it cross platform. #79961
        * gdk/x11/gdkdisplay-x11.c (check_solaris_xinerama):
        fixed initialization bugs.
        * gdk/x11/gdkscreen-x11.[hc] (gdk_screen_get_monitor_geometry):
@@ -9,7 +16,7 @@
        * gtk/gtkwindow.c (gtk_window_compute_configure_request):
        * gtk/gtkmenu.c (gtk_menu_position):
        take a GdkRectangle argument instead of returning 
-       a GdkRectangle * and propagated the changes. fix #79974
+       a GdkRectangle * and propagated the changes. #79974
        
 2002-05-01  Anders Carlsson  <andersca@gnu.org>
 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index cf7cad289f16cbce2bbcb02dc812b6d786c70aeb..e0f23de2b42ab53c81b30c62f3f8756904f1c12d 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,7 +1,14 @@
+2002-05-01 Erwann Chenede - <erwann.chenede@sun.com>
+       
+       * gdk/gdkpixmap.[hc] (gdk_pixmap_get_screen):
+       * x11/gdkpixmap-x11.c:
+       removed that function as gdk_drawable_get_screen
+       does the job. #79964
+
 2002-05-01 Erwann Chenede - <erwann.chenede@sun.com>
 
        * gdk/gdkscreen.[hc] (gdk_screen_x11_get_monitor_at_window):
-       remove virtualization and made it cross platform. fix #79961
+       remove virtualization and made it cross platform. #79961
        * gdk/x11/gdkdisplay-x11.c (check_solaris_xinerama):
        fixed initialization bugs.
        * gdk/x11/gdkscreen-x11.[hc] (gdk_screen_get_monitor_geometry):
@@ -9,7 +16,7 @@
        * gtk/gtkwindow.c (gtk_window_compute_configure_request):
        * gtk/gtkmenu.c (gtk_menu_position):
        take a GdkRectangle argument instead of returning 
-       a GdkRectangle * and propagated the changes. fix #79974
+       a GdkRectangle * and propagated the changes. #79974
        
 2002-05-01  Anders Carlsson  <andersca@gnu.org>
 

diff --git a/gdk/gdkpixmap.c b/gdk/gdkpixmap.c
index 46a19f56083306ca309acfbb5b0dca8c8b674e05..f2bf19e19923d6ce68da6e38bb280defe2d1ed88 100644 (file)
--- a/gdk/gdkpixmap.c
+++ b/gdk/gdkpixmap.c
@@ -135,6 +135,7 @@ static gint         gdk_pixmap_real_get_depth    (GdkDrawable *drawable);
 static void         gdk_pixmap_real_set_colormap (GdkDrawable *drawable,
                                                   GdkColormap *cmap);
 static GdkColormap* gdk_pixmap_real_get_colormap (GdkDrawable *drawable);
+static GdkScreen*   gdk_pixmap_real_get_screen   (GdkDrawable *drawable);
 
 static void gdk_pixmap_init       (GdkPixmapObject      *pixmap);
 static void gdk_pixmap_class_init (GdkPixmapObjectClass *klass);
@@ -201,7 +202,7 @@ gdk_pixmap_class_init (GdkPixmapObjectClass *klass)
   drawable_class->draw_image = gdk_pixmap_draw_image;
   drawable_class->_draw_pixbuf = gdk_pixmap_draw_pixbuf;
   drawable_class->get_depth = gdk_pixmap_real_get_depth;
-  drawable_class->get_screen = gdk_pixmap_get_screen;
+  drawable_class->get_screen = gdk_pixmap_real_get_screen;
   drawable_class->get_size = gdk_pixmap_real_get_size;
   drawable_class->set_colormap = gdk_pixmap_real_set_colormap;
   drawable_class->get_colormap = gdk_pixmap_real_get_colormap;
@@ -622,3 +623,8 @@ gdk_pixmap_create_from_xpm_d (GdkWindow  *window,
                                                transparent_color, data);
 }
 
+static GdkScreen*
+gdk_pixmap_real_get_screen (GdkDrawable *drawable)
+{
+    return gdk_drawable_get_screen (GDK_PIXMAP_OBJECT (drawable)->impl);
+}

diff --git a/gdk/gdkpixmap.h b/gdk/gdkpixmap.h
index ac76975b19ef47168a6354e5c77696fe011b4d58..57f1bc95531b82357144b3059fd298da8f588be6 100644 (file)
--- a/gdk/gdkpixmap.h
+++ b/gdk/gdkpixmap.h
@@ -73,8 +73,6 @@ GdkPixmap* gdk_pixmap_colormap_create_from_xpm_d (GdkWindow    *window,
                                                  GdkColor     *transparent_color,
                                                  gchar       **data);
 
-GdkScreen *gdk_pixmap_get_screen (GdkDrawable *drawable);
-
 /* Functions to create/lookup pixmaps from their native equivalents
  */
 #ifndef GDK_MULTIHEAD_SAFE

diff --git a/gdk/x11/gdkpixmap-x11.c b/gdk/x11/gdkpixmap-x11.c
index 723c1f52fbbf7984499c7a3f2abe16fe7305edc6..c1beb43bf29f73e0448f74129d2cee70a2cd4b87 100644 (file)
--- a/gdk/x11/gdkpixmap-x11.c
+++ b/gdk/x11/gdkpixmap-x11.c
@@ -388,20 +388,6 @@ gdk_pixmap_foreign_new (GdkNativeWindow anid)
    return gdk_pixmap_foreign_new_for_display (gdk_get_default_display (), anid);
 }
 
-/**
- * gdk_pixmap_get_screen :
- * @drawable : the #GdkPixmap.
- *
- * Returns the #GdkScreen for which the pixmap was created.
- *
- * Returns: the #GdkScreen for which the pixmap was created.
- */
-GdkScreen*
-gdk_pixmap_get_screen (GdkDrawable *drawable)
-{
-  return GDK_PIXMAP_SCREEN (drawable);
-}
-
 /**
  * gdk_pixmap_lookup:
  * @anid: a native pixmap handle.