diff --git a/launcher/launcherMain.cpp b/launcher/launcherMain.cpp index a850c4d7..aa1e2d86 100644 --- 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 index 709ab43c..3b061c85 100644 --- a/launcher/launcherMain.h +++ b/launcher/launcherMain.h @@ -146,12 +146,12 @@ 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; @@ -159,11 +159,11 @@ class launcherFrame: public wxFrame 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 index ac6665c4..1279d044 100644 --- a/launcher/wxsmith/launcherframe.wxs +++ b/launcher/wxsmith/launcherframe.wxs @@ -111,7 +111,9 @@ - + + + wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL 5