Minor corrections to make dist after reports

[wxWidgets.git] / include / wx / generic / filedlgg.h

diff --git a/include/wx/generic/filedlgg.h b/include/wx/generic/filedlgg.h
index 661d7f88b744cdaddd2abec18d2e8fec87071363..e27901cee50b51d05a8383c7249b62258b022e3b 100644 (file)
--- 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(); }
@@ -61,13 +62,28 @@ public:
     virtual ~wxGenericFileDialog();
 
     virtual void SetMessage(const wxString& message) { SetTitle(message); }
-    virtual void SetPath(const wxString& path);
-    virtual void SetFilterIndex(int filterIndex);
-    virtual void SetWildcard(const wxString& wildCard);
-
-    // for multiple file selection
-    virtual void GetPaths(wxArrayString& paths) const;
-    virtual void GetFilenames(wxArrayString& files) const;
+    virtual void SetPath(const wxString& path)
+        { m_filectrl->SetPath(path); }
+    virtual void SetFilterIndex(int filterIndex)
+        { m_filectrl->SetFilterIndex(filterIndex); }
+    virtual void SetWildcard(const wxString& wildCard)
+        { m_filectrl->SetWildcard(wildCard); }
+
+    virtual wxString GetPath() const
+        { return m_filectrl->GetPath(); }
+    virtual void GetPaths(wxArrayString& paths) const
+        { 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
+        { 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
     // -------------------------------
@@ -83,13 +99,14 @@ public:
     void OnNew( wxCommandEvent &event );
     void OnFileActivated( wxFileCtrlEvent &event);
 
-    virtual void UpdateControls();
-
 private:
-    // Don't use this implementation at all :-)
+    // if true, don't use this implementation at all
     bool m_bypassGenericImpl;
 
 protected:
+    // update the state of m_upDirButton and m_newDirButton depending on the
+    // currently selected directory
+    void OnUpdateButtonsUI(wxUpdateUIEvent& event);
 
     wxString               m_filterExtension;
     wxGenericFileCtrl     *m_filectrl;
@@ -98,6 +115,9 @@ protected:
 
 private:
     void Init();
+    wxBitmapButton* AddBitmapButton( wxWindowID winId, const wxArtID& artId,
+                                     const wxString& tip, wxSizer *sizer );
+
     DECLARE_DYNAMIC_CLASS(wxGenericFileDialog)
     DECLARE_EVENT_TABLE()
 
@@ -108,7 +128,7 @@ private:
 
 #ifdef wxHAS_GENERIC_FILEDIALOG
 
-class WXDLLEXPORT wxFileDialog: public wxGenericFileDialog
+class WXDLLIMPEXP_CORE wxFileDialog: public wxGenericFileDialog
 {
 public:
      wxFileDialog() {}