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

Restore ability to have a much lower runtime GTK version than build time - down to 2.4 (2.0 is still broken from gtk_combo_box_entry_new)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41124 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mart Raudsepp
2006-09-10 04:23:02 +00:00
parent aea95b1c3a
commit e892f2fd13
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gtk/window.cpp
View File

@@ -2668,7 +2668,7 @@ void wxWindowGTK::PostCreation()
this); this);
} }
#ifdef GTK_IS_FILE_CHOOSER_BUTTON #ifdef GTK_IS_FILE_CHOOSER_BUTTON
else if (GTK_IS_FILE_CHOOSER_BUTTON(m_widget)) else if (!gtk_check_version(2,6,0) && GTK_IS_FILE_CHOOSER_BUTTON(m_widget))
{ {
// If we connect to the "size_request" signal of a GtkFileChooserButton // If we connect to the "size_request" signal of a GtkFileChooserButton
// then that control won't be sized properly when placed inside sizers // then that control won't be sized properly when placed inside sizers
@@ -2690,7 +2690,7 @@ void wxWindowGTK::PostCreation()
InheritAttributes(); InheritAttributes();
m_hasVMT = true; m_hasVMT = true;
SetLayoutDirection(wxLayout_Default); SetLayoutDirection(wxLayout_Default);
// unless the window was created initially hidden (i.e. Hide() had been // unless the window was created initially hidden (i.e. Hide() had been
@@ -3397,7 +3397,7 @@ bool wxWindowGTK::Reparent( wxWindowBase *newParentBase )
/* reverse: prevent GTK from deleting the widget arbitrarily */ /* reverse: prevent GTK from deleting the widget arbitrarily */
gtk_widget_unref( m_widget ); gtk_widget_unref( m_widget );
SetLayoutDirection(wxLayout_Default); SetLayoutDirection(wxLayout_Default);
return true; return true;