Applied patch for wxComboBox and wxListBox to

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

diff --git a/include/wx/filedlg.h b/include/wx/filedlg.h
index 179638097ccb0de988ae5c3f8a911f8d1ec573cb..a051d309f5012d6b078c333d90a5913f3e5c277f 100644 (file)
--- a/include/wx/filedlg.h
+++ b/include/wx/filedlg.h
@@ -1,55 +1,40 @@
 #ifndef _WX_FILEDLG_H_BASE_
 #define _WX_FILEDLG_H_BASE_
 
+#if wxUSE_FILEDLG
+
+enum
+{
+    wxOPEN              = 0x0001,
+    wxSAVE              = 0x0002,
+    wxOVERWRITE_PROMPT  = 0x0004,
+    wxHIDE_READONLY     = 0x0008,
+    wxFILE_MUST_EXIST   = 0x0010,
+    wxMULTIPLE          = 0x0020,
+    wxCHANGE_DIR        = 0x0040
+};
+
 #if defined(__WXMSW__)
 #include "wx/msw/filedlg.h"
 #elif defined(__WXMOTIF__)
 #include "wx/motif/filedlg.h"
 #elif defined(__WXGTK__)
-#include "wx/gtk/filedlg.h"
+#include "wx/generic/filedlgg.h"
 #elif defined(__WXQT__)
 #include "wx/qt/filedlg.h"
 #elif defined(__WXMAC__)
+#ifdef __DARWIN__
+#include "wx/generic/filedlgg.h"
+#else
 #include "wx/mac/filedlg.h"
+#endif
+#elif defined(__WXPM__)
+#include "wx/os2/filedlg.h"
 #elif defined(__WXSTUBS__)
 #include "wx/stubs/filedlg.h"
 #endif
 
-// File selector - backward compatibility
-WXDLLEXPORT wxString
-wxFileSelector(const char *message = wxFileSelectorPromptStr,
-               const char *default_path = NULL,
-               const char *default_filename = NULL,
-               const char *default_extension = NULL,
-               const char *wildcard = wxFileSelectorDefaultWildcardStr,
-               int flags = 0,
-               wxWindow *parent = NULL,
-               int x = -1, int y = -1);
-
-// An extended version of wxFileSelector
-WXDLLEXPORT wxString
-wxFileSelectorEx(const char *message = wxFileSelectorPromptStr,
-                 const char *default_path = NULL,
-                 const char *default_filename = NULL,
-                 int *indexDefaultExtension = NULL,
-                 const char *wildcard = wxFileSelectorDefaultWildcardStr,
-                 int flags = 0,
-                 wxWindow *parent = NULL,
-                 int x = -1, int y = -1);
-
-// Ask for filename to load
-WXDLLEXPORT wxString
-wxLoadFileSelector(const char *what,
-                   const char *extension,
-                   const char *default_name = (const char *)NULL,
-                   wxWindow *parent = (wxWindow *) NULL);
-
-// Ask for filename to save
-WXDLLEXPORT wxString
-wxSaveFileSelector(const char *what,
-                   const char *extension,
-                   const char *default_name = (const char *) NULL,
-                   wxWindow *parent = (wxWindow *) NULL);
+#endif // wxUSE_FILEDLG
 
 #endif
     // _WX_FILEDLG_H_BASE_