don't define operator<<(ostream&, wxString) at all if it's already defined in the...

[wxWidgets.git] / include / wx / filedlg.h

diff --git a/include/wx/filedlg.h b/include/wx/filedlg.h
index a227f7163fadae2622ad8e0d81ee2c0e01839b45..b8384d3e8395a6331572ddafdc2164917baf3d21 100644 (file)
--- a/include/wx/filedlg.h
+++ b/include/wx/filedlg.h
@@ -186,25 +186,25 @@ wxSaveFileSelector(const wxString& what,
 
 
 #if defined (__WXUNIVERSAL__)
-#define wxUSE_GENERIC_FILEDIALOG
-#include "wx/generic/filedlgg.h"
+    #define wxHAS_GENERIC_FILEDIALOG
+    #include "wx/generic/filedlgg.h"
 #elif defined(__WXMSW__)
-#include "wx/msw/filedlg.h"
+    #include "wx/msw/filedlg.h"
 #elif defined(__WXMOTIF__)
-#include "wx/motif/filedlg.h"
+    #include "wx/motif/filedlg.h"
 #elif defined(__WXGTK24__)
-#include "wx/gtk/filedlg.h"     // GTK+ > 2.4 has native version
+    #include "wx/gtk/filedlg.h"     // GTK+ > 2.4 has native version
 #elif defined(__WXGTK20__)
-#define wxUSE_GENERIC_FILEDIALOG
-#include "wx/generic/filedlgg.h"
+    #define wxHAS_GENERIC_FILEDIALOG
+    #include "wx/generic/filedlgg.h"
 #elif defined(__WXGTK__)
-#include "wx/gtk1/filedlg.h"
+    #include "wx/gtk1/filedlg.h"
 #elif defined(__WXMAC__)
-#include "wx/mac/filedlg.h"
+    #include "wx/mac/filedlg.h"
 #elif defined(__WXCOCOA__)
-#include "wx/cocoa/filedlg.h"
+    #include "wx/cocoa/filedlg.h"
 #elif defined(__WXPM__)
-#include "wx/os2/filedlg.h"
+    #include "wx/os2/filedlg.h"
 #endif
 
 #endif // wxUSE_FILEDLG