Basics of in-place i18n with support for wxStaticText and wxCheckBox.

[dcpomatic.git] / src / wx / dir_picker_ctrl.cc

diff --git a/src/wx/dir_picker_ctrl.cc b/src/wx/dir_picker_ctrl.cc
index 18d3ac6f42ae89c708acc847978538ed25b7861c..ffd3b6fa115a116b63d6c352c1c7d29d2c5487b0 100644 (file)
--- a/src/wx/dir_picker_ctrl.cc
+++ b/src/wx/dir_picker_ctrl.cc
@@ -18,12 +18,13 @@
 
 */
 
+#include "dir_picker_ctrl.h"
+#include "wx_util.h"
+#include "static_text.h"
 #include <wx/wx.h>
 #include <wx/stdpaths.h>
 #include <wx/filepicker.h>
 #include <boost/filesystem.hpp>
-#include "dir_picker_ctrl.h"
-#include "wx_util.h"
 
 using namespace std;
 using namespace boost;
@@ -33,14 +34,14 @@ DirPickerCtrl::DirPickerCtrl (wxWindow* parent)
 {
        _sizer = new wxBoxSizer (wxHORIZONTAL);
 
-       _folder = new wxStaticText (this, wxID_ANY, wxT (""));
+       _folder = new StaticText (this, wxT(""));
        _sizer->Add (_folder, 1, wxEXPAND | wxALL, 6);
        _browse = new wxButton (this, wxID_ANY, _("Browse..."));
        _sizer->Add (_browse, 0);
 
        SetSizer (_sizer);
 
-       _browse->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&DirPickerCtrl::browse_clicked, this));
+       _browse->Bind (wxEVT_BUTTON, boost::bind (&DirPickerCtrl::browse_clicked, this));
 }
 
 void
@@ -54,7 +55,7 @@ DirPickerCtrl::SetPath (wxString p)
                _folder->SetLabel (std_to_wx (filesystem::path (wx_to_std (_path)).leaf().string()));
        }
 
-       wxCommandEvent ev (wxEVT_COMMAND_DIRPICKER_CHANGED, wxID_ANY);
+       wxCommandEvent ev (wxEVT_DIRPICKER_CHANGED, wxID_ANY);
        GetEventHandler()->ProcessEvent (ev);
 
        _sizer->Layout ();