Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avoid deprecated gtk_widget_get_requisition()

Browse Source
This commit is contained in:
Paul Cornett
2016-02-09 23:48:48 -08:00
parent 35a56f5c5f
commit caf63a14cb
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gtk/toolbar.cpp
View File

@@ -187,15 +187,13 @@ image_expose_event(GtkWidget* widget, GdkEventExpose*, wxToolBarTool* tool)
// draw disabled bitmap ourselves, GtkImage has no way to specify it // draw disabled bitmap ourselves, GtkImage has no way to specify it
GtkAllocation alloc; GtkAllocation alloc;
gtk_widget_get_allocation(widget, &alloc); gtk_widget_get_allocation(widget, &alloc);
GtkRequisition req; int x = (alloc.width - bitmap.GetWidth()) / 2;
gtk_widget_get_requisition(widget, &req); int y = (alloc.height - bitmap.GetHeight()) / 2;
#ifdef __WXGTK3__ #ifdef __WXGTK3__
const int x = (alloc.width - req.width) / 2;
const int y = (alloc.height - req.height) / 2;
bitmap.Draw(cr, x, y); bitmap.Draw(cr, x, y);
#else #else
const int x = alloc.x + (alloc.width - req.width) / 2; x += alloc.x;
const int y = alloc.y + (alloc.height - req.height) / 2; y += alloc.y;
gdk_draw_pixbuf( gdk_draw_pixbuf(
gtk_widget_get_window(widget), gtk_widget_get_style(widget)->black_gc, bitmap.GetPixbuf(), gtk_widget_get_window(widget), gtk_widget_get_style(widget)->black_gc, bitmap.GetPixbuf(),
0, 0, x, y, 0, 0, x, y,