X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8ce68f7fc03beda6b7cbfdd7180a8f7f7eee952d..a721fd82b7ca8c97048453d4aaff559e8f741d69:/include/wx/filedlg.h?ds=sidebyside

diff --git a/include/wx/filedlg.h b/include/wx/filedlg.h
index 7abc596350..fa69620acc 100644
--- a/include/wx/filedlg.h
+++ b/include/wx/filedlg.h
@@ -19,6 +19,12 @@
 #include "wx/dialog.h"
 #include "wx/arrstr.h"
 
+// this symbol is defined for the platforms which support multiple
+// ('|'-separated) filters in the file dialog
+#if defined(__WXMSW__) || defined(__WXGTK__) || defined(__WXMAC__)
+    #define wxHAS_MULTIPLE_FILEDLG_FILTERS
+#endif
+
 //----------------------------------------------------------------------------
 // wxFileDialog data
 //----------------------------------------------------------------------------
@@ -58,15 +64,15 @@ enum
 
 #define wxFD_DEFAULT_STYLE      wxFD_OPEN
 
-extern WXDLLEXPORT_DATA(const char) wxFileDialogNameStr[];
-extern WXDLLEXPORT_DATA(const char) wxFileSelectorPromptStr[];
-extern WXDLLEXPORT_DATA(const char) wxFileSelectorDefaultWildcardStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxFileDialogNameStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxFileSelectorPromptStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxFileSelectorDefaultWildcardStr[];
 
 //----------------------------------------------------------------------------
 // wxFileDialogBase
 //----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxFileDialogBase: public wxDialog
+class WXDLLIMPEXP_CORE wxFileDialogBase: public wxDialog
 {
 public:
     wxFileDialogBase () { Init(); }
@@ -120,11 +126,9 @@ public:
     // create the window containing the extra controls we want to show in it
     typedef wxWindow *(*ExtraControlCreatorFunction)(wxWindow*);
 
-    // extra controls are currently supported in GTK and generic versions
-    // only currently
     virtual bool SupportsExtraControl() const { return false; }
 
-    bool SetExtraControlCreator(ExtraControlCreatorFunction WXUNUSED(c));
+    bool SetExtraControlCreator(ExtraControlCreatorFunction creator);
     wxWindow *GetExtraControl() const { return m_extraControl; }
 
     // Utility functions
@@ -155,6 +159,11 @@ protected:
 
     // returns true if control is created (if it already exists returns false)
     bool CreateExtraControl();
+    // return true if SetExtraControlCreator() was called
+    bool HasExtraControlCreator() const
+        { return m_extraControlCreator != NULL; }
+    // get the size of the extra control by creating and deleting it
+    wxSize GetExtraControlSize();
 
 private:
     ExtraControlCreatorFunction m_extraControlCreator;
@@ -170,7 +179,7 @@ private:
 //----------------------------------------------------------------------------
 
 // File selector - backward compatibility
-WXDLLEXPORT wxString
+WXDLLIMPEXP_CORE wxString
 wxFileSelector(const wxString& message = wxFileSelectorPromptStr,
                const wxString& default_path = wxEmptyString,
                const wxString& default_filename = wxEmptyString,
@@ -181,7 +190,7 @@ wxFileSelector(const wxString& message = wxFileSelectorPromptStr,
                int x = wxDefaultCoord, int y = wxDefaultCoord);
 
 // An extended version of wxFileSelector
-WXDLLEXPORT wxString
+WXDLLIMPEXP_CORE wxString
 wxFileSelectorEx(const wxString& message = wxFileSelectorPromptStr,
                  const wxString& default_path = wxEmptyString,
                  const wxString& default_filename = wxEmptyString,
@@ -192,14 +201,14 @@ wxFileSelectorEx(const wxString& message = wxFileSelectorPromptStr,
                  int x = wxDefaultCoord, int y = wxDefaultCoord);
 
 // Ask for filename to load
-WXDLLEXPORT wxString
+WXDLLIMPEXP_CORE wxString
 wxLoadFileSelector(const wxString& what,
                    const wxString& extension,
                    const wxString& default_name = wxEmptyString,
                    wxWindow *parent = NULL);
 
 // Ask for filename to save
-WXDLLEXPORT wxString
+WXDLLIMPEXP_CORE wxString
 wxSaveFileSelector(const wxString& what,
                    const wxString& extension,
                    const wxString& default_name = wxEmptyString,
@@ -218,7 +227,7 @@ wxSaveFileSelector(const wxString& what,
 #elif defined(__WXGTK__)
     #include "wx/gtk1/filedlg.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/filedlg.h"
+    #include "wx/osx/filedlg.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/filedlg.h"
 #elif defined(__WXPM__)