diff --git a/include/wx/filepicker.h b/include/wx/filepicker.h
index 218bda654c..eb015b8ed6 100644
--- 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...
-#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
diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index c5883bd346..1f6fb8ba13 100644
--- 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);
     }
+#ifdef GTK_IS_FILE_CHOOSER_BUTTON
     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