changed choice to properly inherit from wxChoiceBase , added msg compatible calls...

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

diff --git a/include/wx/filedlg.h b/include/wx/filedlg.h
index b35e63d016e25fe63906365e2953bc90bd754e95..a2b386dd0ff36764ef627f93fecb024e20d5f47c 100644 (file)
--- a/include/wx/filedlg.h
+++ b/include/wx/filedlg.h
@@ -3,12 +3,13 @@
 
 enum
 {
 
 enum
 {

-    wxOPEN  = 1,
-    wxSAVE = 2,
-    wxOVERWRITE_PROMPT = 4,
-    wxHIDE_READONLY = 8,
-    wxFILE_MUST_EXIST = 16,
-    wxMULTIPLE = 32
+    wxOPEN              = 0x0001,
+    wxSAVE              = 0x0002,
+    wxOVERWRITE_PROMPT  = 0x0004,
+    wxHIDE_READONLY     = 0x0008,
+    wxFILE_MUST_EXIST   = 0x0010,
+    wxMULTIPLE          = 0x0020,
+    wxCHANGE_DIR        = 0x0040

 };
 
 #if defined(__WXMSW__)
 };
 
 #if defined(__WXMSW__)


@@ -20,7 +21,11 @@ enum
 #elif defined(__WXQT__)
 #include "wx/qt/filedlg.h"
 #elif defined(__WXMAC__)
 #elif defined(__WXQT__)
 #include "wx/qt/filedlg.h"
 #elif defined(__WXMAC__)

+#ifdef __WXMAC_X__
+#include "wx/generic/filedlgg.h"
+#else

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

+#endif

 #elif defined(__WXPM__)
 #include "wx/os2/filedlg.h"
 #elif defined(__WXSTUBS__)
 #elif defined(__WXPM__)
 #include "wx/os2/filedlg.h"
 #elif defined(__WXSTUBS__)