#268

matlo · Jul 29, 2014 · 9a05b28 · 9a05b28
1 parent faba33b
commit 9a05b28
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/launcher/launcherMain.cpp b/launcher/launcherMain.cpp
@@ -777,7 +777,7 @@ launcherFrame::launcherFrame(wxWindow* parent,wxWindowID id)
     SourceIpSizer = new wxFlexGridSizer(1, 3, 0, 0);
     StaticText2 = new wxStaticText(Panel1, ID_STATICTEXT2, _("IP:port"), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT2"));
     SourceIpSizer->Add(StaticText2, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
-    InputChoice = new wxChoice(Panel1, ID_CHOICE5, wxDefaultPosition, wxDefaultSize, 0, 0, 0, wxDefaultValidator, _T("ID_CHOICE5"));
+    InputChoice = new wxChoice(Panel1, ID_CHOICE5, wxDefaultPosition, wxDefaultSize, 0, 0, wxCB_SORT, wxDefaultValidator, _T("ID_CHOICE5"));
     SourceIpSizer->Add(InputChoice, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
     Button1 = new wxButton(Panel1, ID_BUTTON4, _("New"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _T("ID_BUTTON4"));
     SourceIpSizer->Add(Button1, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);

diff --git a/launcher/launcherMain.h b/launcher/launcherMain.h
@@ -146,24 +146,24 @@ class launcherFrame: public wxFrame
         wxChoice* Output;
         wxFlexGridSizer* FlexGridSizer1;
         wxPanel* Panel1;
-        wxChoice* OutputChoice;
         wxCheckBox* CheckBoxGui;
         wxStatusBar* StatusBar1;
         wxMenuItem* MenuAutoBindControls;
         wxButton* ButtonCheck;
         wxMenuItem* MenuEditFpsConfig;
+        wxChoice* InputChoice;
         wxButton* OutputNewButton;
         wxButton* Button1;
         wxMenuItem* MenuGetConfigs;
         wxMenuItem* MenuUpdate;
         wxFlexGridSizer* OutputSizer;
         wxStaticText* StaticText1;
         wxFlexGridSizer* IOSizer;
+        wxChoice* OutputChoice;
         wxMenuItem* MenuRefresh;
         wxMenuItem* MenuStartupUpdates;
         wxMenuItem* MenuItem3;
         wxChoice* Input;
-        wxChoice* InputChoice;
         wxStaticText* StaticText4;
         wxCheckBox* CheckBoxGrab;
         wxFlexGridSizer* SourceIpSizer;

diff --git a/launcher/wxsmith/launcherframe.wxs b/launcher/wxsmith/launcherframe.wxs
@@ -111,7 +111,9 @@
 									<option>1</option>
 								</object>
 								<object class="sizeritem">
-									<object class="wxChoice" name="ID_CHOICE5" variable="InputChoice" member="yes" />
+									<object class="wxChoice" name="ID_CHOICE5" variable="InputChoice" member="yes">
+										<style>wxCB_SORT</style>
+									</object>
 									<flag>wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL</flag>
 									<border>5</border>
 									<option>1</option>