From: Robert Roebling <robert@roebling.de>
Date: Thu, 8 Jun 2006 10:05:42 +0000 (+0000)
Subject:   Correct compilation for GTK < 2.4.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/a84f5f39b8ab2fb7bbe98891a9ffe84af12287da

  Correct compilation for GTK < 2.4.
  Remove double testing for __WXMGL__ and __WXX11__
    after testing for __UNIVERSAL__


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

diff --git a/include/wx/filedlg.h b/include/wx/filedlg.h
index 29a42494c9..2c27fd37c5 100644
--- a/include/wx/filedlg.h
+++ b/include/wx/filedlg.h
@@ -179,6 +179,7 @@ wxSaveFileSelector(const wxChar *what,
 
 
 #if defined (__WXUNIVERSAL__)
+#define wxUSE_GENERIC_FILEDIALOG
 #include "wx/generic/filedlgg.h"
 #elif defined(__WXMSW__)
 #include "wx/msw/filedlg.h"
@@ -187,13 +188,10 @@ wxSaveFileSelector(const wxChar *what,
 #elif defined(__WXGTK24__)
 #include "wx/gtk/filedlg.h"     // GTK+ > 2.4 has native version
 #elif defined(__WXGTK20__)
+#define wxUSE_GENERIC_FILEDIALOG
 #include "wx/generic/filedlgg.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk1/filedlg.h"
-#elif defined(__WXX11__)
-#include "wx/generic/filedlgg.h"
-#elif defined(__WXMGL__)
-#include "wx/generic/filedlgg.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/filedlg.h"
 #elif defined(__WXCOCOA__)
diff --git a/include/wx/generic/filedlgg.h b/include/wx/generic/filedlgg.h
index e684cfb6d4..f103a39c25 100644
--- a/include/wx/generic/filedlgg.h
+++ b/include/wx/generic/filedlgg.h
@@ -32,10 +32,6 @@ class WXDLLEXPORT wxListItem;
 class WXDLLEXPORT wxStaticText;
 class WXDLLEXPORT wxTextCtrl;
 
-#if defined(__WXUNIVERSAL__)||defined(__WXX11__)||defined(__WXMGL__)||defined(__WXCOCOA__)
-    #define USE_GENERIC_FILEDIALOG
-#endif
-
 //-------------------------------------------------------------------------
 // wxGenericFileDialog
 //-------------------------------------------------------------------------
@@ -128,7 +124,7 @@ private:
     static bool ms_lastShowHidden;    // did we show hidden files?
 };
 
-#ifdef USE_GENERIC_FILEDIALOG
+#ifdef wxUSE_GENERIC_FILEDIALOG
 
 class WXDLLEXPORT wxFileDialog: public wxGenericFileDialog
 {
@@ -150,7 +146,7 @@ private:
      DECLARE_DYNAMIC_CLASS(wxFileDialog)
 };
 
-#endif // USE_GENERIC_FILEDIALOG
+#endif // wxUSE_GENERIC_FILEDIALOG
 
 //-----------------------------------------------------------------------------
 //  wxFileData - a class to hold the file info for the wxFileCtrl
diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp
index a87a39b7bf..9717439d4a 100644
--- a/src/generic/filedlgg.cpp
+++ b/src/generic/filedlgg.cpp
@@ -1627,10 +1627,10 @@ void wxGenericFileDialog::UpdateControls()
 #endif // defined(__DOS__) || defined(__WINDOWS__) || defined(__OS2__)
 }
 
-#ifdef USE_GENERIC_FILEDIALOG
+#ifdef wxUSE_GENERIC_FILEDIALOG
 
 IMPLEMENT_DYNAMIC_CLASS(wxFileDialog, wxGenericFileDialog)
 
-#endif // USE_GENERIC_FILEDIALOG
+#endif // wxUSE_GENERIC_FILEDIALOG
 
 #endif // wxUSE_FILEDLG