Ensure that message boxes with only "OK" can be closed with Escape in wxMSW.

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

diff --git a/src/common/filepickercmn.cpp b/src/common/filepickercmn.cpp
index bec014f6b4c8b09d3c58eb568fcc27fe61877ec4..9236761eed6e9639f7733d672fa607e2cee46dc7 100644 (file)
--- a/src/common/filepickercmn.cpp
+++ b/src/common/filepickercmn.cpp
@@ -41,11 +41,11 @@ const char wxFilePickerCtrlNameStr[] = "filepicker";
 const char wxFilePickerWidgetNameStr[] = "filepickerwidget";
 const char wxDirPickerCtrlNameStr[] = "dirpicker";
 const char wxDirPickerWidgetNameStr[] = "dirpickerwidget";
-const char wxFilePickerWidgetLabel[] = "Browse";
-const char wxDirPickerWidgetLabel[] = "Browse";
+const char wxFilePickerWidgetLabel[] = wxTRANSLATE("Browse");
+const char wxDirPickerWidgetLabel[] = wxTRANSLATE("Browse");
 
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_FILEPICKER_CHANGED)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_DIRPICKER_CHANGED)
+wxDEFINE_EVENT( wxEVT_COMMAND_FILEPICKER_CHANGED, wxFileDirPickerEvent );
+wxDEFINE_EVENT( wxEVT_COMMAND_DIRPICKER_CHANGED,  wxFileDirPickerEvent );
 IMPLEMENT_DYNAMIC_CLASS(wxFileDirPickerEvent, wxCommandEvent)
 
 // ----------------------------------------------------------------------------
@@ -74,13 +74,13 @@ bool wxFileDirPickerCtrlBase::CreateBase(wxWindow *parent,
 
     // check that the styles are not contradictory
     wxASSERT_MSG( !(HasFlag(wxFLP_SAVE) && HasFlag(wxFLP_OPEN)),
-                  _T("can't specify both wxFLP_SAVE and wxFLP_OPEN at once") );
+                  wxT("can't specify both wxFLP_SAVE and wxFLP_OPEN at once") );
 
     wxASSERT_MSG( !HasFlag(wxFLP_SAVE) || !HasFlag(wxFLP_FILE_MUST_EXIST),
-                   _T("wxFLP_FILE_MUST_EXIST can't be used with wxFLP_SAVE" ) );
+                   wxT("wxFLP_FILE_MUST_EXIST can't be used with wxFLP_SAVE" ) );
 
     wxASSERT_MSG( !HasFlag(wxFLP_OPEN) || !HasFlag(wxFLP_OVERWRITE_PROMPT),
-                  _T("wxFLP_OVERWRITE_PROMPT can't be used with wxFLP_OPEN") );
+                  wxT("wxFLP_OVERWRITE_PROMPT can't be used with wxFLP_OPEN") );
 
     // create a wxFilePickerWidget or a wxDirPickerWidget...
     m_pickerIface = CreatePicker(this, path, message, wildcard);
@@ -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