removed obsolete wxUSE_CTL3D

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

diff --git a/include/wx/filedlg.h b/include/wx/filedlg.h
index 6cd46149434fa78307a5e22ecc1c56b925f5272d..cf4e3bf0872f7575c4d3c4ce9fd1766ae358cc90 100644 (file)
--- a/include/wx/filedlg.h
+++ b/include/wx/filedlg.h
@@ -6,7 +6,7 @@
 // Created:     8/17/99
 // Copyright:   (c) Robert Roebling
 // RCS-ID:
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_FILEDLG_H_BASE_
@@ -78,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
@@ -122,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
@@ -133,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
@@ -157,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__)
@@ -165,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