Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/generic/filepickerg.h b/include/wx/generic/filepickerg.h
index d7a0b495e637b23dcef8e48d2b22f5437f21b85c..679c8546f5432072081ec45b86b5b8212fc69135 100644 (file)
--- a/include/wx/generic/filepickerg.h
+++ b/include/wx/generic/filepickerg.h
@@ -17,8 +17,8 @@
 #include "wx/dirdlg.h"
 
 
 #include "wx/dirdlg.h"
 
 

-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_DIRPICKER_CHANGED, wxFileDirPickerEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_FILEPICKER_CHANGED, wxFileDirPickerEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_DIRPICKER_CHANGED, wxFileDirPickerEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_FILEPICKER_CHANGED, wxFileDirPickerEvent );

 
 
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------


@@ -58,6 +58,8 @@ public:     // overridable
 
     virtual wxEventType GetEventType() const = 0;
 
 
     virtual wxEventType GetEventType() const = 0;
 

+    virtual void SetInitialDirectory(const wxString& dir);
+

 public:
 
     bool Create(wxWindow *parent, wxWindowID id,
 public:
 
     bool Create(wxWindow *parent, wxWindowID id,


@@ -82,6 +84,9 @@ protected:
     // just doesn't make sense to use picker styles for wxButton anyhow
     long m_pickerStyle;
 
     // just doesn't make sense to use picker styles for wxButton anyhow
     long m_pickerStyle;
 

+    // Initial directory set by SetInitialDirectory() call or empty.
+    wxString m_initialDir;
+

 private:
     // common part of all ctors
     void Init() { m_pickerStyle = -1; }
 private:
     // common part of all ctors
     void Init() { m_pickerStyle = -1; }


@@ -140,19 +145,10 @@ public:     // overridable
         return filedlgstyle;
     }
 
         return filedlgstyle;
     }
 

-    virtual wxDialog *CreateDialog()
-    {
-        wxFileDialog *p = new wxFileDialog(GetDialogParent(), m_message,
-                                    wxEmptyString, wxEmptyString,
-                                    m_wildcard, GetDialogStyle());
-
-        // this sets both the default folder and the default file of the dialog
-        p->SetPath(m_path);
-        return p;
-    }
+    virtual wxDialog *CreateDialog();

 
     wxEventType GetEventType() const
 
     wxEventType GetEventType() const

-        { return wxEVT_COMMAND_FILEPICKER_CHANGED; }
+        { return wxEVT_FILEPICKER_CHANGED; }

 
 protected:
     void UpdateDialogPath(wxDialog *p)
 
 protected:
     void UpdateDialogPath(wxDialog *p)


@@ -204,14 +200,10 @@ public:     // overridable
         return dirdlgstyle;
     }
 
         return dirdlgstyle;
     }
 

-    virtual wxDialog *CreateDialog()
-    {
-        return new wxDirDialog(GetDialogParent(), m_message, m_path,
-                                   GetDialogStyle());
-    }
+    virtual wxDialog *CreateDialog();

 
     wxEventType GetEventType() const
 
     wxEventType GetEventType() const

-        { return wxEVT_COMMAND_DIRPICKER_CHANGED; }
+        { return wxEVT_DIRPICKER_CHANGED; }

 
 protected:
     void UpdateDialogPath(wxDialog *p)
 
 protected:
     void UpdateDialogPath(wxDialog *p)


@@ -223,5 +215,8 @@ private:
     DECLARE_DYNAMIC_CLASS(wxGenericDirButton)
 };
 
     DECLARE_DYNAMIC_CLASS(wxGenericDirButton)
 };
 

+// old wxEVT_COMMAND_* constants
+//#define wxEVT_COMMAND_DIRPICKER_CHANGED wxEVT_DIRPICKER_CHANGED
+//#define wxEVT_COMMAND_FILEPICKER_CHANGED wxEVT_FILEPICKER_CHANGED

 
 #endif // _WX_FILEDIRPICKER_H_
 
 #endif // _WX_FILEDIRPICKER_H_