fixing 10.5 only compiles

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

diff --git a/include/wx/filedlg.h b/include/wx/filedlg.h
index 1469bee06c83f1642fe8970f2a948c96c21adb5e..afe838b461d627fd4761d1da80a2a56ddf931d43 100644 (file)
--- a/include/wx/filedlg.h
+++ b/include/wx/filedlg.h
@@ -58,9 +58,9 @@ enum
 
 #define wxFD_DEFAULT_STYLE      wxFD_OPEN
 
 
 #define wxFD_DEFAULT_STYLE      wxFD_OPEN
 

-extern WXDLLEXPORT_DATA(const wxChar) wxFileDialogNameStr[];
-extern WXDLLEXPORT_DATA(const wxChar) wxFileSelectorPromptStr[];
-extern WXDLLEXPORT_DATA(const wxChar) wxFileSelectorDefaultWildcardStr[];
+extern WXDLLEXPORT_DATA(const char) wxFileDialogNameStr[];
+extern WXDLLEXPORT_DATA(const char) wxFileSelectorPromptStr[];
+extern WXDLLEXPORT_DATA(const char) wxFileSelectorDefaultWildcardStr[];

 
 //----------------------------------------------------------------------------
 // wxFileDialogBase
 
 //----------------------------------------------------------------------------
 // wxFileDialogBase


@@ -186,25 +186,22 @@ wxSaveFileSelector(const wxString& what,
 
 
 #if defined (__WXUNIVERSAL__)
 
 
 #if defined (__WXUNIVERSAL__)

-#define wxHAS_GENERIC_FILEDIALOG
-#include "wx/generic/filedlgg.h"
+    #define wxHAS_GENERIC_FILEDIALOG
+    #include "wx/generic/filedlgg.h"

 #elif defined(__WXMSW__)
 #elif defined(__WXMSW__)

-#include "wx/msw/filedlg.h"
+    #include "wx/msw/filedlg.h"

 #elif defined(__WXMOTIF__)
 #elif defined(__WXMOTIF__)

-#include "wx/motif/filedlg.h"
-#elif defined(__WXGTK24__)
-#include "wx/gtk/filedlg.h"     // GTK+ > 2.4 has native version
+    #include "wx/motif/filedlg.h"

 #elif defined(__WXGTK20__)
 #elif defined(__WXGTK20__)

-#define wxHAS_GENERIC_FILEDIALOG
-#include "wx/generic/filedlgg.h"
+    #include "wx/gtk/filedlg.h"     // GTK+ > 2.4 has native version

 #elif defined(__WXGTK__)
 #elif defined(__WXGTK__)

-#include "wx/gtk1/filedlg.h"
+    #include "wx/gtk1/filedlg.h"

 #elif defined(__WXMAC__)
 #elif defined(__WXMAC__)

-#include "wx/mac/filedlg.h"
+    #include "wx/mac/filedlg.h"

 #elif defined(__WXCOCOA__)
 #elif defined(__WXCOCOA__)

-#include "wx/cocoa/filedlg.h"
+    #include "wx/cocoa/filedlg.h"

 #elif defined(__WXPM__)
 #elif defined(__WXPM__)

-#include "wx/os2/filedlg.h"
+    #include "wx/os2/filedlg.h"

 #endif
 
 #endif // wxUSE_FILEDLG
 #endif
 
 #endif // wxUSE_FILEDLG