fix wxDataObjectComposite::GetFormatCount and add some comments to explain the reason...

[wxWidgets.git] / src / common / filepickercmn.cpp

diff --git a/src/common/filepickercmn.cpp b/src/common/filepickercmn.cpp
index 97e1913b3471866df137f5502d187f60a53d60be..e1ff02ea92a68aba947144f769396da46d1684fb 100644 (file)
--- a/src/common/filepickercmn.cpp
+++ b/src/common/filepickercmn.cpp
@@ -37,15 +37,15 @@
 // implementation
 // ============================================================================
 
-const wxChar wxFilePickerCtrlNameStr[] = wxT("filepicker");
-const wxChar wxFilePickerWidgetNameStr[] = wxT("filepickerwidget");
-const wxChar wxDirPickerCtrlNameStr[] = wxT("dirpicker");
-const wxChar wxDirPickerWidgetNameStr[] = wxT("dirpickerwidget");
-const wxChar wxFilePickerWidgetLabel[] = wxT("Browse");
-const wxChar wxDirPickerWidgetLabel[] = wxT("Browse");
-
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_FILEPICKER_CHANGED)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_DIRPICKER_CHANGED)
+const char wxFilePickerCtrlNameStr[] = "filepicker";
+const char wxFilePickerWidgetNameStr[] = "filepickerwidget";
+const char wxDirPickerCtrlNameStr[] = "dirpicker";
+const char wxDirPickerWidgetNameStr[] = "dirpickerwidget";
+const char wxFilePickerWidgetLabel[] = wxTRANSLATE("Browse");
+const char wxDirPickerWidgetLabel[] = wxTRANSLATE("Browse");
+
+wxDEFINE_EVENT( wxEVT_COMMAND_FILEPICKER_CHANGED, wxFileDirPickerEvent );
+wxDEFINE_EVENT( wxEVT_COMMAND_DIRPICKER_CHANGED,  wxFileDirPickerEvent );
 IMPLEMENT_DYNAMIC_CLASS(wxFileDirPickerEvent, wxCommandEvent)
 
 // ----------------------------------------------------------------------------
@@ -91,9 +91,7 @@ bool wxFileDirPickerCtrlBase::CreateBase(wxWindow *parent,
     // complete sizer creation
     wxPickerBase::PostCreation();
 
-    m_picker->Connect(GetEventType(),
-            wxFileDirPickerEventHandler(wxFileDirPickerCtrlBase::OnFileDirChange),
-            NULL, this);
+    DoConnect( m_picker, this );
 
     // default's wxPickerBase textctrl limit is too small for this control:
     // make it bigger