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

fix running with GTK < 2.18 when built with later GTK

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75760 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2014-02-01 20:05:43 +00:00
parent fd049a5465
commit adeb914098
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/gtk/private/gtk2-compat.h
View File

@@ -298,6 +298,12 @@ static inline void wx_gtk_widget_set_allocation(GtkWidget* widget, const GtkAllo
} }
#define gtk_widget_set_allocation wx_gtk_widget_set_allocation #define gtk_widget_set_allocation wx_gtk_widget_set_allocation
static inline gboolean wx_gtk_widget_is_toplevel(GtkWidget* widget)
{
return GTK_WIDGET_TOPLEVEL(widget);
}
#define gtk_widget_is_toplevel wx_gtk_widget_is_toplevel
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// the following were introduced in GTK+ 2.20 // the following were introduced in GTK+ 2.20

4
src/gtk/win_gtk.cpp
View File

@@ -380,11 +380,7 @@ void wxPizza::put(GtkWidget* widget, int x, int y, int width, int height)
{ {
// Re-parenting a TLW under a child window is possible at wx level but // Re-parenting a TLW under a child window is possible at wx level but
// using a TLW as child at GTK+ level results in problems, so don't do it. // using a TLW as child at GTK+ level results in problems, so don't do it.
#if GTK_CHECK_VERSION(2,19,3)
if (!gtk_widget_is_toplevel(GTK_WIDGET(widget))) if (!gtk_widget_is_toplevel(GTK_WIDGET(widget)))
#else
if (!GTK_WIDGET_TOPLEVEL(GTK_WIDGET(widget)))
#endif
gtk_fixed_put(GTK_FIXED(this), widget, 0, 0); gtk_fixed_put(GTK_FIXED(this), widget, 0, 0);
wxPizzaChild* child = new wxPizzaChild; wxPizzaChild* child = new wxPizzaChild;