Merge.

[dcpomatic.git] / src / wx / config_dialog.h

diff --git a/src/wx/config_dialog.h b/src/wx/config_dialog.h
index fdbe99a4c843671ebdc0353e77e5085941ca8ccb..f6f3b3707db4c914e89f15347621cd0243afd4fb 100644 (file)
--- a/src/wx/config_dialog.h
+++ b/src/wx/config_dialog.h
@@ -39,6 +39,8 @@ public:
        ConfigDialog (wxWindow *);
 
 private:
+       void set_language_changed (wxCommandEvent &);
+       void language_changed (wxCommandEvent &);
        void tms_ip_changed (wxCommandEvent &);
        void tms_path_changed (wxCommandEvent &);
        void tms_user_changed (wxCommandEvent &);
@@ -55,7 +57,10 @@ private:
        void server_selection_changed (wxListEvent &);
 
        void add_server_to_control (ServerDescription *);
-       
+       void setup_language_sensitivity ();
+
+       wxCheckBox* _set_language;
+       wxChoice* _language;
        wxTextCtrl* _tms_ip;
        wxTextCtrl* _tms_path;
        wxTextCtrl* _tms_user;
@@ -67,7 +72,7 @@ private:
        wxDirPickerCtrl* _default_directory;
 #endif
        wxButton* _default_dci_metadata_button;
-       wxComboBox* _reference_scaler;
+       wxChoice* _reference_scaler;
        wxStaticText* _reference_filters;
        wxButton* _reference_filters_button;
        wxListCtrl* _servers;