Add support for thread-specific log targets.

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

diff --git a/include/wx/filedlg.h b/include/wx/filedlg.h
index afe838b461d627fd4761d1da80a2a56ddf931d43..11e720f86469148ca757d03955a5732737aa8b9b 100644 (file)
--- a/include/wx/filedlg.h
+++ b/include/wx/filedlg.h
@@ -19,6 +19,12 @@
 #include "wx/dialog.h"
 #include "wx/arrstr.h"
 
 #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
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 // wxFileDialog data
 //----------------------------------------------------------------------------


@@ -58,15 +64,15 @@ enum
 
 #define wxFD_DEFAULT_STYLE      wxFD_OPEN
 
 
 #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
 //----------------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------------
 // wxFileDialogBase
 //----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxFileDialogBase: public wxDialog
+class WXDLLIMPEXP_CORE wxFileDialogBase: public wxDialog

 {
 public:
     wxFileDialogBase () { Init(); }
 {
 public:
     wxFileDialogBase () { Init(); }


@@ -85,6 +91,9 @@ public:
         Create(parent, message, defaultDir, defaultFile, wildCard, style, pos, sz, name);
     }
 
         Create(parent, message, defaultDir, defaultFile, wildCard, style, pos, sz, name);
     }
 

+    virtual ~wxFileDialogBase() {}
+
+

     bool Create(wxWindow *parent,
                 const wxString& message = wxFileSelectorPromptStr,
                 const wxString& defaultDir = wxEmptyString,
     bool Create(wxWindow *parent,
                 const wxString& message = wxFileSelectorPromptStr,
                 const wxString& defaultDir = wxEmptyString,


@@ -113,6 +122,15 @@ public:
     virtual wxString GetWildcard() const { return m_wildCard; }
     virtual int GetFilterIndex() const { return m_filterIndex; }
 
     virtual wxString GetWildcard() const { return m_wildCard; }
     virtual int GetFilterIndex() const { return m_filterIndex; }
 

+    // this function is called with wxFileDialog as parameter and should
+    // create the window containing the extra controls we want to show in it
+    typedef wxWindow *(*ExtraControlCreatorFunction)(wxWindow*);
+
+    virtual bool SupportsExtraControl() const { return false; }
+
+    bool SetExtraControlCreator(ExtraControlCreatorFunction creator);
+    wxWindow *GetExtraControl() const { return m_extraControl; }
+

     // Utility functions
 
 #if WXWIN_COMPATIBILITY_2_6
     // Utility functions
 
 #if WXWIN_COMPATIBILITY_2_6


@@ -137,19 +155,31 @@ protected:
     wxString      m_fileName;
     wxString      m_wildCard;
     int           m_filterIndex;
     wxString      m_fileName;
     wxString      m_wildCard;
     int           m_filterIndex;

+    wxWindow*     m_extraControl;
+
+    // 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:
 
 private:

+    ExtraControlCreatorFunction m_extraControlCreator;
+

     void Init();
     DECLARE_DYNAMIC_CLASS(wxFileDialogBase)
     void Init();
     DECLARE_DYNAMIC_CLASS(wxFileDialogBase)

-    DECLARE_NO_COPY_CLASS(wxFileDialogBase)
+    wxDECLARE_NO_COPY_CLASS(wxFileDialogBase);

 };
 
 };
 

+

 //----------------------------------------------------------------------------
 // wxFileDialog convenience functions
 //----------------------------------------------------------------------------
 
 // File selector - backward compatibility
 //----------------------------------------------------------------------------
 // wxFileDialog convenience functions
 //----------------------------------------------------------------------------
 
 // File selector - backward compatibility

-WXDLLEXPORT wxString
+WXDLLIMPEXP_CORE wxString

 wxFileSelector(const wxString& message = wxFileSelectorPromptStr,
                const wxString& default_path = wxEmptyString,
                const wxString& default_filename = wxEmptyString,
 wxFileSelector(const wxString& message = wxFileSelectorPromptStr,
                const wxString& default_path = wxEmptyString,
                const wxString& default_filename = wxEmptyString,


@@ -160,7 +190,7 @@ wxFileSelector(const wxString& message = wxFileSelectorPromptStr,
                int x = wxDefaultCoord, int y = wxDefaultCoord);
 
 // An extended version of wxFileSelector
                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,
 wxFileSelectorEx(const wxString& message = wxFileSelectorPromptStr,
                  const wxString& default_path = wxEmptyString,
                  const wxString& default_filename = wxEmptyString,


@@ -171,14 +201,14 @@ wxFileSelectorEx(const wxString& message = wxFileSelectorPromptStr,
                  int x = wxDefaultCoord, int y = wxDefaultCoord);
 
 // Ask for filename to load
                  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
 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,
 wxSaveFileSelector(const wxString& what,
                    const wxString& extension,
                    const wxString& default_name = wxEmptyString,


@@ -197,11 +227,14 @@ wxSaveFileSelector(const wxString& what,
 #elif defined(__WXGTK__)
     #include "wx/gtk1/filedlg.h"
 #elif defined(__WXMAC__)
 #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__)
     #include "wx/os2/filedlg.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/filedlg.h"
 #elif defined(__WXPM__)
     #include "wx/os2/filedlg.h"

+#elif defined(__WXPALMOS__)
+    #define wxHAS_GENERIC_FILEDIALOG
+    #include "wx/generic/filedlgg.h"

 #endif
 
 #endif // wxUSE_FILEDLG
 #endif
 
 #endif // wxUSE_FILEDLG