X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/398eebb155b2a5804359a0f40935e75424e169e2..e143fb636d50d5802dcc8c7c2e9e8e2944afa467:/include/wx/generic/filedlgg.h

diff --git a/include/wx/generic/filedlgg.h b/include/wx/generic/filedlgg.h
index 239eea1072..2f66fee199 100644
--- a/include/wx/generic/filedlgg.h
+++ b/include/wx/generic/filedlgg.h
@@ -15,6 +15,7 @@
 #include "wx/listctrl.h"
 #include "wx/datetime.h"
 #include "wx/filefn.h"
+#include "wx/artprov.h"
 #include "wx/filedlg.h"
 #include "wx/generic/filectrlg.h"
 
@@ -31,7 +32,7 @@ class WXDLLIMPEXP_FWD_CORE wxFileCtrlEvent;
 // wxGenericFileDialog
 //-------------------------------------------------------------------------
 
-class WXDLLEXPORT wxGenericFileDialog: public wxFileDialogBase
+class WXDLLIMPEXP_CORE wxGenericFileDialog: public wxFileDialogBase
 {
 public:
     wxGenericFileDialog() : wxFileDialogBase() { Init(); }
@@ -71,17 +72,18 @@ public:
     virtual wxString GetPath() const
         { return m_filectrl->GetPath(); }
     virtual void GetPaths(wxArrayString& paths) const
-        { return m_filectrl->GetPaths(paths); }
+        { m_filectrl->GetPaths(paths); }
     virtual wxString GetDirectory() const
         { return m_filectrl->GetDirectory(); }
     virtual wxString GetFilename() const
         { return m_filectrl->GetFilename(); }
     virtual void GetFilenames(wxArrayString& files) const
-        { return m_filectrl->GetFilenames(files); }
+        { m_filectrl->GetFilenames(files); }
     virtual wxString GetWildcard() const
         { return m_filectrl->GetWildcard(); }
     virtual int GetFilterIndex() const
         { return m_filectrl->GetFilterIndex(); }
+    virtual bool SupportsExtraControl() const { return true; }
 
     // implementation only from now on
     // -------------------------------
@@ -113,6 +115,8 @@ protected:
 
 private:
     void Init();
+    wxBitmapButton* AddBitmapButton( wxWindowID winId, const wxArtID& artId,
+                                     const wxString& tip, wxSizer *sizer );
 
     DECLARE_DYNAMIC_CLASS(wxGenericFileDialog)
     DECLARE_EVENT_TABLE()
@@ -124,10 +128,10 @@ private:
 
 #ifdef wxHAS_GENERIC_FILEDIALOG
 
-class WXDLLEXPORT wxFileDialog: public wxGenericFileDialog
+class WXDLLIMPEXP_CORE wxFileDialog: public wxGenericFileDialog
 {
 public:
-     wxFileDialog() {}
+    wxFileDialog() {}
 
     wxFileDialog(wxWindow *parent,
                  const wxString& message = wxFileSelectorPromptStr,
@@ -135,8 +139,12 @@ public:
                  const wxString& defaultFile = wxEmptyString,
                  const wxString& wildCard = wxFileSelectorDefaultWildcardStr,
                  long style = 0,
-                 const wxPoint& pos = wxDefaultPosition)
-          :wxGenericFileDialog(parent, message, defaultDir, defaultFile, wildCard, style, pos)
+                 const wxPoint& pos = wxDefaultPosition,
+                 const wxSize& size = wxDefaultSize)
+          :wxGenericFileDialog(parent, message,
+                               defaultDir, defaultFile, wildCard,
+                               style,
+                               pos, size)
      {
      }