Rebake from clean wx tree.

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

diff --git a/include/wx/generic/filedlgg.h b/include/wx/generic/filedlgg.h
index 45f37b666d684625d178d964b9ba37b55ed1123e..b4f35b3afd52cdff93c80653da06b8e4221f7d57 100644 (file)
--- a/include/wx/generic/filedlgg.h
+++ b/include/wx/generic/filedlgg.h
@@ -32,7 +32,7 @@ class WXDLLIMPEXP_FWD_CORE wxFileCtrlEvent;
 // wxGenericFileDialog
 //-------------------------------------------------------------------------
 
 // wxGenericFileDialog
 //-------------------------------------------------------------------------
 

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

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


@@ -61,6 +61,10 @@ public:
 
     virtual ~wxGenericFileDialog();
 
 
     virtual ~wxGenericFileDialog();
 

+    virtual void SetDirectory(const wxString& dir)
+        { m_filectrl->SetDirectory(dir); }
+    virtual void SetFilename(const wxString& name)
+        { m_filectrl->SetFilename(name); }

     virtual void SetMessage(const wxString& message) { SetTitle(message); }
     virtual void SetPath(const wxString& path)
         { m_filectrl->SetPath(path); }
     virtual void SetMessage(const wxString& message) { SetTitle(message); }
     virtual void SetPath(const wxString& path)
         { m_filectrl->SetPath(path); }


@@ -128,10 +132,10 @@ private:
 
 #ifdef wxHAS_GENERIC_FILEDIALOG
 
 
 #ifdef wxHAS_GENERIC_FILEDIALOG
 

-class WXDLLEXPORT wxFileDialog: public wxGenericFileDialog
+class WXDLLIMPEXP_CORE wxFileDialog: public wxGenericFileDialog

 {
 public:
 {
 public:

-     wxFileDialog() {}
+    wxFileDialog() {}

 
     wxFileDialog(wxWindow *parent,
                  const wxString& message = wxFileSelectorPromptStr,
 
     wxFileDialog(wxWindow *parent,
                  const wxString& message = wxFileSelectorPromptStr,


@@ -139,8 +143,12 @@ public:
                  const wxString& defaultFile = wxEmptyString,
                  const wxString& wildCard = wxFileSelectorDefaultWildcardStr,
                  long style = 0,
                  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)

      {
      }
 
      {
      }