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
This commit is contained in:
parent
ee32d4354f
commit
791d7ea2d6
@ -346,7 +346,7 @@ bool wxBitmap::CreateFromXpm( const char **bits )
|
||||
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() ?
|
||||
|
||||
@ -1339,7 +1339,7 @@ bool wxBitmap::LoadFile( const wxString &name, wxBitmapType type )
|
||||
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;
|
||||
}
|
||||
|
@ -797,7 +797,7 @@ void wxDropSource::PrepareIcon( int action, GdkDragContext *context )
|
||||
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);
|
||||
|
@ -2326,7 +2326,7 @@ void gtk_wxwindow_size_callback( GtkWidget* WXUNUSED_UNLESS_XIM(widget),
|
||||
{
|
||||
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);
|
||||
@ -2397,7 +2397,7 @@ gtk_wxwindow_realized_callback( GtkWidget * WXUNUSED_UNLESS_XIM(widget),
|
||||
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;
|
||||
|
Loading…
Reference in New Issue
Block a user