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

avoid functions deprecated in GTK3

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73013 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2012-11-25 03:41:42 +00:00
parent 6968a3b87c
commit 1897abe1d8
19 changed files with 207 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/gtk/control.cpp
View File

@@ -317,16 +317,7 @@ wxSize wxControl::GTKGetPreferredSize(GtkWidget* widget) const
{
GtkRequisition req;
#ifdef __WXGTK3__
if (gtk_widget_get_request_mode(widget) != GTK_SIZE_REQUEST_HEIGHT_FOR_WIDTH)
{
gtk_widget_get_preferred_height(widget, NULL, &req.height);
gtk_widget_get_preferred_width_for_height(widget, req.height, NULL, &req.width);
}
else
{
gtk_widget_get_preferred_width(widget, NULL, &req.width);
gtk_widget_get_preferred_height_for_width(widget, req.width, NULL, &req.height);
}
gtk_widget_get_preferred_size(widget, NULL, &req);
#else
GTK_WIDGET_GET_CLASS(widget)->size_request(widget, &req);
#endif