fix typo

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

diff --git a/include/wx/filedlg.h b/include/wx/filedlg.h
index 86415900cf1f356fc77810f5902ebe03b60366c0..1f9b24715a39efa882429906c49a7862001afe64 100644 (file)
--- a/include/wx/filedlg.h
+++ b/include/wx/filedlg.h
@@ -58,15 +58,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 +85,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 +116,17 @@ 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*);
+
+    // extra controls are currently supported in GTK and generic versions
+    // only currently
+    virtual bool SupportsExtraControl() const { return false; }
+
+    bool SetExtraControlCreator(ExtraControlCreatorFunction WXUNUSED(c));
+    wxWindow *GetExtraControl() const { return m_extraControl; }
+

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


@@ -137,19 +151,26 @@ 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();

 
 private:
 
 private:

+    ExtraControlCreatorFunction m_extraControlCreator;
+

     void Init();
     DECLARE_DYNAMIC_CLASS(wxFileDialogBase)
     DECLARE_NO_COPY_CLASS(wxFileDialogBase)
 };
 
     void Init();
     DECLARE_DYNAMIC_CLASS(wxFileDialogBase)
     DECLARE_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 +181,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 +192,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 +218,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