gdk_window_get_size -> gdk_drawable_get_size

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38556 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/bitmap.cpp b/src/gtk/bitmap.cpp
index e8009a37ed3c7c0861669c22a580d2284e7f9eca..cb569d36472df747f90c01ec308f4b62c927b3f3 100644 (file)
--- a/src/gtk/bitmap.cpp
+++ b/src/gtk/bitmap.cpp
@@ -346,7 +346,7 @@ bool wxBitmap::CreateFromXpm( const char **bits )
         M_BMPDATA->m_mask->m_bitmap = mask;
     }
 
         M_BMPDATA->m_mask->m_bitmap = mask;
     }
 

-    gdk_window_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) );
+    gdk_drawable_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) );

 
     M_BMPDATA->m_bpp = visual->depth;  // Can we get a different depth from create_from_xpm_d() ?
 
 
     M_BMPDATA->m_bpp = visual->depth;  // Can we get a different depth from create_from_xpm_d() ?
 


@@ -1339,7 +1339,7 @@ bool wxBitmap::LoadFile( const wxString &name, wxBitmapType type )
            M_BMPDATA->m_mask->m_bitmap = mask;
         }
 
            M_BMPDATA->m_mask->m_bitmap = mask;
         }
 

-        gdk_window_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) );
+        gdk_drawable_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) );

 
         M_BMPDATA->m_bpp = visual->depth;
     }
 
         M_BMPDATA->m_bpp = visual->depth;
     }

diff --git a/src/gtk/dnd.cpp b/src/gtk/dnd.cpp
index 794505a24810241db5cf9d71bcbe6e1a6b85ba3b..f47e0b983dcece278b6674361c32fe21ef5e063e 100644 (file)
--- a/src/gtk/dnd.cpp
+++ b/src/gtk/dnd.cpp
@@ -797,7 +797,7 @@ void wxDropSource::PrepareIcon( int action, GdkDragContext *context )
     GdkPixmap *pixmap = icon->GetPixmap();
 
     gint width,height;
     GdkPixmap *pixmap = icon->GetPixmap();
 
     gint width,height;

-    gdk_window_get_size (pixmap, &width, &height);
+    gdk_drawable_get_size (pixmap, &width, &height);

 
     GdkColormap *colormap = gtk_widget_get_colormap( m_widget );
     gtk_widget_push_colormap (colormap);
 
     GdkColormap *colormap = gtk_widget_get_colormap( m_widget );
     gtk_widget_push_colormap (colormap);

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 21b5c1bfcd05d86dc1126203bd1f80e79a303a6a..8f888b10fa4ceb78e4560003888dcf194f13000d 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -2326,7 +2326,7 @@ void gtk_wxwindow_size_callback( GtkWidget* WXUNUSED_UNLESS_XIM(widget),
     {
         gint width, height;
 
     {
         gint width, height;
 

-        gdk_window_get_size (widget->window, &width, &height);
+        gdk_drawable_get_size (widget->window, &width, &height);

         win->m_icattr->preedit_area.width = width;
         win->m_icattr->preedit_area.height = height;
         gdk_ic_set_attr (win->m_ic, win->m_icattr, GDK_IC_PREEDIT_AREA);
         win->m_icattr->preedit_area.width = width;
         win->m_icattr->preedit_area.height = height;
         gdk_ic_set_attr (win->m_ic, win->m_icattr, GDK_IC_PREEDIT_AREA);


@@ -2397,7 +2397,7 @@ gtk_wxwindow_realized_callback( GtkWidget * WXUNUSED_UNLESS_XIM(widget),
                 break;
             }
 
                 break;
             }
 

-            gdk_window_get_size (widget->window, &width, &height);
+            gdk_drawable_get_size (widget->window, &width, &height);

 
             attrmask |= GDK_IC_PREEDIT_POSITION_REQ;
             attr->spot_location.x = 0;
 
             attrmask |= GDK_IC_PREEDIT_POSITION_REQ;
             attr->spot_location.x = 0;