added wxArtProvider::InsertProvider to accompany PushProvider

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

diff --git a/include/wx/filedlg.h b/include/wx/filedlg.h
index 535380397476dc246153ce42d701848b47ed089e..978e5c49ca766ac6f0e9fc12e8cf516e35d4f8cc 100644 (file)
--- a/include/wx/filedlg.h
+++ b/include/wx/filedlg.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        filedlg.h
+// Name:        wx/filedlg.h

 // Purpose:     wxFileDialog base header
 // Author:      Robert Roebling
 // Modified by:
 // Purpose:     wxFileDialog base header
 // Author:      Robert Roebling
 // Modified by:


@@ -23,21 +23,6 @@
 // wxFileDialog data
 //----------------------------------------------------------------------------
 
 // wxFileDialog data
 //----------------------------------------------------------------------------
 

-#if WXWIN_COMPATIBILITY_2_6
-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
-};
-#endif
-

 enum
 {
     wxFD_OPEN              = 0x0001,
 enum
 {
     wxFD_OPEN              = 0x0001,


@@ -45,8 +30,24 @@ enum
     wxFD_OVERWRITE_PROMPT  = 0x0004,
     wxFD_FILE_MUST_EXIST   = 0x0010,
     wxFD_MULTIPLE          = 0x0020,
     wxFD_OVERWRITE_PROMPT  = 0x0004,
     wxFD_FILE_MUST_EXIST   = 0x0010,
     wxFD_MULTIPLE          = 0x0020,

-    wxFD_CHANGE_DIR        = 0x0040
+    wxFD_CHANGE_DIR        = 0x0040,
+    wxFD_PREVIEW           = 0x0080
+};
+
+#if WXWIN_COMPATIBILITY_2_6
+enum
+{
+    wxOPEN              = wxFD_OPEN,
+    wxSAVE              = wxFD_SAVE,
+    wxOVERWRITE_PROMPT  = wxFD_OVERWRITE_PROMPT,
+#if WXWIN_COMPATIBILITY_2_4
+    wxHIDE_READONLY     = 0x0008,
+#endif
+    wxFILE_MUST_EXIST   = wxFD_FILE_MUST_EXIST,
+    wxMULTIPLE          = wxFD_MULTIPLE,
+    wxCHANGE_DIR        = wxFD_CHANGE_DIR

 };
 };

+#endif

 
 #define wxFD_DEFAULT_STYLE      wxFD_OPEN
 
 
 #define wxFD_DEFAULT_STYLE      wxFD_OPEN
 


@@ -179,6 +180,7 @@ wxSaveFileSelector(const wxChar *what,
 
 
 #if defined (__WXUNIVERSAL__)
 
 
 #if defined (__WXUNIVERSAL__)

+#define wxUSE_GENERIC_FILEDIALOG

 #include "wx/generic/filedlgg.h"
 #elif defined(__WXMSW__)
 #include "wx/msw/filedlg.h"
 #include "wx/generic/filedlgg.h"
 #elif defined(__WXMSW__)
 #include "wx/msw/filedlg.h"


@@ -187,13 +189,10 @@ wxSaveFileSelector(const wxChar *what,
 #elif defined(__WXGTK24__)
 #include "wx/gtk/filedlg.h"     // GTK+ > 2.4 has native version
 #elif defined(__WXGTK20__)
 #elif defined(__WXGTK24__)
 #include "wx/gtk/filedlg.h"     // GTK+ > 2.4 has native version
 #elif defined(__WXGTK20__)

+#define wxUSE_GENERIC_FILEDIALOG

 #include "wx/generic/filedlgg.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk1/filedlg.h"
 #include "wx/generic/filedlgg.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk1/filedlg.h"

-#elif defined(__WXX11__)
-#include "wx/generic/filedlgg.h"
-#elif defined(__WXMGL__)
-#include "wx/generic/filedlgg.h"

 #elif defined(__WXMAC__)
 #include "wx/mac/filedlg.h"
 #elif defined(__WXCOCOA__)
 #elif defined(__WXMAC__)
 #include "wx/mac/filedlg.h"
 #elif defined(__WXCOCOA__)