X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/75cb911c7c8a475269901bf5f0c69c583d79e498..d642db66a5efc82d374b813022c72ba88bc50839:/include/wx/generic/filepickerg.h

diff --git a/include/wx/generic/filepickerg.h b/include/wx/generic/filepickerg.h
index 203bd6e682..679c8546f5 100644
--- a/include/wx/generic/filepickerg.h
+++ b/include/wx/generic/filepickerg.h
@@ -17,8 +17,8 @@
 #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 );
 
 
 //-----------------------------------------------------------------------------
@@ -148,7 +148,7 @@ public:     // overridable
     virtual wxDialog *CreateDialog();
 
     wxEventType GetEventType() const
-        { return wxEVT_COMMAND_FILEPICKER_CHANGED; }
+        { return wxEVT_FILEPICKER_CHANGED; }
 
 protected:
     void UpdateDialogPath(wxDialog *p)
@@ -156,10 +156,6 @@ protected:
     void UpdatePathFromDialog(wxDialog *p)
         { m_path = wxStaticCast(p, wxFileDialog)->GetPath(); }
 
-    // Set the initial directory for the dialog but without overriding the
-    // directory of the currently selected file, if any.
-    void DoSetInitialDirectory(wxFileDialog* dialog, const wxString& dir);
-
 private:
     DECLARE_DYNAMIC_CLASS(wxGenericFileButton)
 };
@@ -207,7 +203,7 @@ public:     // overridable
     virtual wxDialog *CreateDialog();
 
     wxEventType GetEventType() const
-        { return wxEVT_COMMAND_DIRPICKER_CHANGED; }
+        { return wxEVT_DIRPICKER_CHANGED; }
 
 protected:
     void UpdateDialogPath(wxDialog *p)
@@ -219,5 +215,8 @@ private:
     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_