Compile fixes for GTK 2.4

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39512 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/filepicker.h b/include/wx/filepicker.h
index 218bda654cdbc80b361c4b8bb1effaf996e5b361..eb015b8ed6b8e66de4ac3c2131630fe7d61e55da 100644 (file)
--- a/include/wx/filepicker.h
+++ b/include/wx/filepicker.h
@@ -79,7 +79,7 @@ protected:
 // NOTE: wxFileDirPickerCtrlBase will allocate a wx{File|Dir}PickerWidget and this
 //       requires that all classes being mapped as wx{File|Dir}PickerWidget have the
 //       same prototype for the contructor...
 // NOTE: wxFileDirPickerCtrlBase will allocate a wx{File|Dir}PickerWidget and this
 //       requires that all classes being mapped as wx{File|Dir}PickerWidget have the
 //       same prototype for the contructor...

-#if defined(__WXGTK24__)        // since GTK > 2.4, there is GtkColorButton
+#if defined(__WXGTK26__)        // since GTK >= 2.6, there is GtkFileButton

     #include "wx/gtk/filepicker.h"
     #define wxFilePickerWidget      wxFileButton
     #define wxDirPickerWidget       wxDirButton
     #include "wx/gtk/filepicker.h"
     #define wxFilePickerWidget      wxFileButton
     #define wxDirPickerWidget       wxDirButton

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index c5883bd34621418be9c72e64165f673d9881c46b..1f6fb8ba13857ae1fe08a3bfefb4d7c81e813441 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -2746,10 +2746,12 @@ void wxWindowGTK::PostCreation()
                           G_CALLBACK (wxgtk_combo_size_request_callback),
                           this);
     }
                           G_CALLBACK (wxgtk_combo_size_request_callback),
                           this);
     }

+#ifdef GTK_IS_FILE_CHOOSER_BUTTON

     else if (GTK_IS_FILE_CHOOSER_BUTTON(m_widget))
     {
         // FIXME: what should be done here ?
     }
     else if (GTK_IS_FILE_CHOOSER_BUTTON(m_widget))
     {
         // FIXME: what should be done here ?
     }

+#endif

     else
     {
         // This is needed if we want to add our windows into native
     else
     {
         // This is needed if we want to add our windows into native