Add wxUSE_UNICODE guard around wxDF_UNICODETEXT in the sample.

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

diff --git a/include/wx/filedlg.h b/include/wx/filedlg.h
index eebb5c93a6f17c6dbfb525bb2b5964a668d0072d..f0b23110a65e769db13a006eab562cf9387ca0dd 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 wxChar) wxFileDialogNameStr[];
-extern WXDLLEXPORT_DATA(const wxChar) wxFileSelectorPromptStr[];
-extern WXDLLEXPORT_DATA(const wxChar) 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,


@@ -98,9 +107,9 @@ public:
     bool HasFdFlag(int flag) const { return HasFlag(flag); }
 
     virtual void SetMessage(const wxString& message) { m_message = message; }
     bool HasFdFlag(int flag) const { return HasFlag(flag); }
 
     virtual void SetMessage(const wxString& message) { m_message = message; }

-    virtual void SetPath(const wxString& path) { m_path = path; }
-    virtual void SetDirectory(const wxString& dir) { m_dir = dir; }
-    virtual void SetFilename(const wxString& name) { m_fileName = name; }
+    virtual void SetPath(const wxString& path);
+    virtual void SetDirectory(const wxString& dir);
+    virtual void SetFilename(const wxString& name);

     virtual void SetWildcard(const wxString& wildCard) { m_wildCard = wildCard; }
     virtual void SetFilterIndex(int filterIndex) { m_filterIndex = filterIndex; }
 
     virtual void SetWildcard(const wxString& wildCard) { m_wildCard = wildCard; }
     virtual void SetFilterIndex(int filterIndex) { m_filterIndex = filterIndex; }
 


@@ -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,213 +155,86 @@ 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
 //----------------------------------------------------------------------------
 
 //----------------------------------------------------------------------------
 // wxFileDialog convenience functions
 //----------------------------------------------------------------------------
 

-// NB: wxFileSelector() etc. used to take const wxChar* arguments in wx-2.8
-//     and their default value was NULL. The official way to use these
-//     functions is to use wxString, with wxEmptyString as the default value.
-//     The templates below exist only to maintain compatibility with wx-2.8.
-
-#if WXWIN_COMPATIBILITY_2_8
-// return wxString created from the argument, return empty string if the
-// argument is NULL:
-inline wxString wxPtrOrStringToString(const wxString& s) { return s; }
-inline wxString wxPtrOrStringToString(const char *s) { return s; }
-inline wxString wxPtrOrStringToString(const wchar_t *s) { return s; }
-inline wxString wxPtrOrStringToString(const wxCStrData& s) { return s; }
-inline wxString wxPtrOrStringToString(const wxCharBuffer& s) { return s; }
-inline wxString wxPtrOrStringToString(const wxWCharBuffer& s) { return s; }
-// this one is for NULL:
-inline wxString wxPtrOrStringToString(int s)
-{
-    wxASSERT_MSG( s == 0, _T("passing non-NULL int as string?") );
-    return wxEmptyString;
-}
-#endif // WXWIN_COMPATIBILITY_2_8
-
-WXDLLEXPORT wxString
-wxDoFileSelector(const wxString& message = wxFileSelectorPromptStr,
-                 const wxString& default_path = wxEmptyString,
-                 const wxString& default_filename = wxEmptyString,
-                 const wxString& default_extension = wxEmptyString,
-                 const wxString& wildcard = wxFileSelectorDefaultWildcardStr,
-                 int flags = 0,
-                 wxWindow *parent = NULL,
-                 int x = wxDefaultCoord, int y = wxDefaultCoord);
-
-WXDLLEXPORT wxString
-wxDoFileSelectorEx(const wxString& message = wxFileSelectorPromptStr,
-                   const wxString& default_path = wxEmptyString,
-                   const wxString& default_filename = wxEmptyString,
-                   int *indexDefaultExtension = NULL,
-                   const wxString& wildcard = wxFileSelectorDefaultWildcardStr,
-                   int flags = 0,
-                   wxWindow *parent = NULL,
-                   int x = wxDefaultCoord, int y = wxDefaultCoord);
-
-WXDLLEXPORT wxString
-wxDoLoadFileSelector(const wxString& what,
-                     const wxString& extension,
-                     const wxString& default_name = wxEmptyString,
-                     wxWindow *parent = NULL);
-
-WXDLLEXPORT wxString
-wxDoSaveFileSelector(const wxString& what,
-                     const wxString& extension,
-                     const wxString& default_name = wxEmptyString,
-                     wxWindow *parent = NULL);
-
-#if WXWIN_COMPATIBILITY_2_8
-

 // File selector - backward compatibility
 // File selector - backward compatibility

-inline wxString wxFileSelector()
-{
-    return wxDoFileSelector();
-}
-
-inline wxString wxFileSelector(const wxString& message)
-{
-    return wxDoFileSelector(message);
-}
-
-template<typename T>
-inline wxString wxFileSelector(const wxString& message, const T& default_path)
-{
-    return wxDoFileSelector(message, wxPtrOrStringToString(default_path));
-}
-
-template<typename T1, typename T2>
-inline wxString wxFileSelector(const wxString& message,
-                               const T1& default_path,
-                               const T2& default_filename)
-{
-    return wxDoFileSelector(message,
-                            wxPtrOrStringToString(default_path),
-                            wxPtrOrStringToString(default_filename));
-}
-
-template<typename T1, typename T2, typename T3>
-inline wxString
-wxFileSelector(const wxString& message,
-               const T1& default_path,
-               const T2& default_filename,
-               const T3& default_extension,
+WXDLLIMPEXP_CORE wxString
+wxFileSelector(const wxString& message = wxFileSelectorPromptStr,
+               const wxString& default_path = wxEmptyString,
+               const wxString& default_filename = wxEmptyString,
+               const wxString& default_extension = wxEmptyString,

                const wxString& wildcard = wxFileSelectorDefaultWildcardStr,
                int flags = 0,
                wxWindow *parent = NULL,
                const wxString& wildcard = wxFileSelectorDefaultWildcardStr,
                int flags = 0,
                wxWindow *parent = NULL,

-               int x = wxDefaultCoord, int y = wxDefaultCoord)
-{
-    return wxDoFileSelector(message,
-                            wxPtrOrStringToString(default_path),
-                            wxPtrOrStringToString(default_filename),
-                            wxPtrOrStringToString(default_extension),
-                            wildcard,
-                            flags,
-                            parent,
-                            x, y);
-}
+               int x = wxDefaultCoord, int y = wxDefaultCoord);

 
 // An extended version of wxFileSelector
 
 // An extended version of wxFileSelector

-inline wxString wxFileSelectorEx()
-{
-    return wxDoFileSelectorEx();
-}
-
-inline wxString wxFileSelectorEx(const wxString& message)
-{
-    return wxDoFileSelectorEx(message);
-}
-
-template<typename T>
-inline wxString wxFileSelectorEx(const wxString& message, const T& default_path)
-{
-    return wxDoFileSelectorEx(message, wxPtrOrStringToString(default_path));
-}
-
-template<typename T1, typename T2>
-inline wxString
-wxFileSelectorEx(const wxString& message,
-                 const T1& default_path,
-                 const T2& default_filename,
+WXDLLIMPEXP_CORE wxString
+wxFileSelectorEx(const wxString& message = wxFileSelectorPromptStr,
+                 const wxString& default_path = wxEmptyString,
+                 const wxString& default_filename = wxEmptyString,

                  int *indexDefaultExtension = NULL,
                  const wxString& wildcard = wxFileSelectorDefaultWildcardStr,
                  int flags = 0,
                  wxWindow *parent = NULL,
                  int *indexDefaultExtension = NULL,
                  const wxString& wildcard = wxFileSelectorDefaultWildcardStr,
                  int flags = 0,
                  wxWindow *parent = NULL,

-                 int x = wxDefaultCoord, int y = wxDefaultCoord)
-{
-    return wxDoFileSelectorEx(message,
-                              wxPtrOrStringToString(default_path),
-                              wxPtrOrStringToString(default_filename),
-                              indexDefaultExtension,
-                              wildcard,
-                              flags,
-                              parent,
-                              x, y);
-}
+                 int x = wxDefaultCoord, int y = wxDefaultCoord);

 
 // Ask for filename to load
 
 // Ask for filename to load

-template<typename T>
-inline wxString wxLoadFileSelector(const wxString& what,
-                                   const wxString& extension,
-                                   const T& default_name = T(),
-                                   wxWindow *parent = NULL)
-{
-    return wxDoLoadFileSelector(what, extension,
-                                wxPtrOrStringToString(default_name),
-                                parent);
-}
+WXDLLIMPEXP_CORE wxString
+wxLoadFileSelector(const wxString& what,
+                   const wxString& extension,
+                   const wxString& default_name = wxEmptyString,
+                   wxWindow *parent = NULL);

 
 // Ask for filename to save
 
 // Ask for filename to save

-template<typename T>
-inline wxString wxSaveFileSelector(const wxString& what,
-                                   const wxString& extension,
-                                   const T& default_name = T(),
-                                   wxWindow *parent = NULL)
-{
-    return wxDoSaveFileSelector(what, extension,
-                                wxPtrOrStringToString(default_name),
-                                parent);
-}
-
-#else // !WXWIN_COMPATIBILITY_2_8
-
-#define wxFileSelector wxDoFileSelector
-#define wxFileSelectorEx wxDoFileSelectorEx
-#define wxLoadFileSelector wxDoLoadFileSelector
-#define wxSaveFileSelector wxDoSaveFileSelector
-
-#endif // WXWIN_COMPATIBILITY_2_8/!WXWIN_COMPATIBILITY_2_8
+WXDLLIMPEXP_CORE wxString
+wxSaveFileSelector(const wxString& what,
+                   const wxString& extension,
+                   const wxString& default_name = wxEmptyString,
+                   wxWindow *parent = NULL);

 
 
 #if defined (__WXUNIVERSAL__)
 
 
 #if defined (__WXUNIVERSAL__)

-#define wxUSE_GENERIC_FILEDIALOG
-#include "wx/generic/filedlgg.h"
+    #define wxHAS_GENERIC_FILEDIALOG
+    #include "wx/generic/filedlgg.h"

 #elif defined(__WXMSW__)
 #elif defined(__WXMSW__)

-#include "wx/msw/filedlg.h"
+    #include "wx/msw/filedlg.h"

 #elif defined(__WXMOTIF__)
 #elif defined(__WXMOTIF__)

-#include "wx/motif/filedlg.h"
-#elif defined(__WXGTK24__)
-#include "wx/gtk/filedlg.h"     // GTK+ > 2.4 has native version
+    #include "wx/motif/filedlg.h"

 #elif defined(__WXGTK20__)
 #elif defined(__WXGTK20__)

-#define wxUSE_GENERIC_FILEDIALOG
-#include "wx/generic/filedlgg.h"
+    #include "wx/gtk/filedlg.h"     // GTK+ > 2.4 has native version

 #elif defined(__WXGTK__)
 #elif defined(__WXGTK__)

-#include "wx/gtk1/filedlg.h"
+    #include "wx/gtk1/filedlg.h"

 #elif defined(__WXMAC__)
 #elif defined(__WXMAC__)

-#include "wx/mac/filedlg.h"
+    #include "wx/osx/filedlg.h"

 #elif defined(__WXCOCOA__)
 #elif defined(__WXCOCOA__)

-#include "wx/cocoa/filedlg.h"
+    #include "wx/cocoa/filedlg.h"

 #elif defined(__WXPM__)
 #elif defined(__WXPM__)

-#include "wx/os2/filedlg.h"
+    #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