X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f74172ab4256c9e7c665e44e2f94ce12bf84a37f..f6e9a8189cfd9189418d6c0976a8a07f3bcd914b:/include/wx/filedlg.h?ds=inline

diff --git a/include/wx/filedlg.h b/include/wx/filedlg.h
index f151ca9993..2a1892ecde 100644
--- a/include/wx/filedlg.h
+++ b/include/wx/filedlg.h
@@ -14,11 +14,12 @@
 
 #if wxUSE_FILEDLG
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "filedlg.h"
 #endif
 
 #include "wx/dialog.h"
+#include "wx/arrstr.h"
 
 //----------------------------------------------------------------------------
 // wxFileDialog data
@@ -29,14 +30,16 @@ enum
     wxOPEN              = 0x0001,
     wxSAVE              = 0x0002,
     wxOVERWRITE_PROMPT  = 0x0004,
+#if WXWIN_COMPATIBILITY_2_4
     wxHIDE_READONLY     = 0x0008,
+#endif
     wxFILE_MUST_EXIST   = 0x0010,
     wxMULTIPLE          = 0x0020,
     wxCHANGE_DIR        = 0x0040
 };
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxFileSelectorPromptStr;
-WXDLLEXPORT_DATA(extern const wxChar*) wxFileSelectorDefaultWildcardStr;
+extern WXDLLEXPORT_DATA(const wxChar*) wxFileSelectorPromptStr;
+extern WXDLLEXPORT_DATA(const wxChar*) wxFileSelectorDefaultWildcardStr;
 
 //----------------------------------------------------------------------------
 // wxFileDialogBase
@@ -75,14 +78,16 @@ public:
 
     // Utility functions
 
+#if WXWIN_COMPATIBILITY_2_4
     // Parses the wildCard, returning the number of filters.
     // Returns 0 if none or if there's a problem,
     // The arrays will contain an equal number of items found before the error.
     // wildCard is in the form:
     // "All files (*)|*|Image Files (*.jpeg *.png)|*.jpg;*.png"
-    static int ParseWildcard(const wxString& wildCard,
-                             wxArrayString& descriptions,
-                             wxArrayString& filters);
+    wxDEPRECATED( static int ParseWildcard(const wxString& wildCard,
+                                           wxArrayString& descriptions,
+                                           wxArrayString& filters) );
+#endif // WXWIN_COMPATIBILITY_2_4
 
     // Append first extension to filePath from a ';' separated extensionList
     // if filePath = "path/foo.bar" just return it as is
@@ -119,7 +124,7 @@ wxFileSelector(const wxChar *message = wxFileSelectorPromptStr,
                const wxChar *wildcard = wxFileSelectorDefaultWildcardStr,
                int flags = 0,
                wxWindow *parent = NULL,
-               int x = -1, int y = -1);
+               int x = wxDefaultCoord, int y = wxDefaultCoord);
 
 // An extended version of wxFileSelector
 WXDLLEXPORT wxString
@@ -130,7 +135,7 @@ wxFileSelectorEx(const wxChar *message = wxFileSelectorPromptStr,
                  const wxChar *wildcard = wxFileSelectorDefaultWildcardStr,
                  int flags = 0,
                  wxWindow *parent = NULL,
-                 int x = -1, int y = -1);
+                 int x = wxDefaultCoord, int y = wxDefaultCoord);
 
 // Ask for filename to load
 WXDLLEXPORT wxString
@@ -154,7 +159,7 @@ wxSaveFileSelector(const wxChar *what,
 #elif defined(__WXMOTIF__)
 #include "wx/motif/filedlg.h"
 #elif defined(__WXGTK__)
-#include "wx/generic/filedlgg.h"
+#include "wx/gtk/filedlg.h"
 #elif defined(__WXX11__)
 #include "wx/generic/filedlgg.h"
 #elif defined(__WXMGL__)
@@ -162,7 +167,7 @@ wxSaveFileSelector(const wxChar *what,
 #elif defined(__WXMAC__)
 #include "wx/mac/filedlg.h"
 #elif defined(__WXCOCOA__)
-#include "wx/generic/filedlgg.h"
+#include "wx/cocoa/filedlg.h"
 #elif defined(__WXPM__)
 #include "wx/os2/filedlg.h"
 #endif