From: <ma...@us...> - 2003-12-22 10:45:36
|
Update of /cvsroot/sharedaemon/ui-wx/src In directory sc8-pr-cvs1:/tmp/cvs-serv14509 Modified Files: ServerWnd.cpp Log Message: Changed the ugly wxComboBox on serverpage to wxTextCtrl (wxComboBox doesnt have native look on wxGTK) Index: ServerWnd.cpp =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/ServerWnd.cpp,v retrieving revision 1.49 retrieving revision 1.50 diff -u -d -r1.49 -r1.50 --- ServerWnd.cpp 22 Dec 2003 05:30:00 -0000 1.49 +++ ServerWnd.cpp 22 Dec 2003 10:45:32 -0000 1.50 @@ -217,7 +217,7 @@ /* Button to toggle sidebar on/off */ wxButton *toggler = new wxButton( this, ID_BTN_TOGGLE_SIDEBAR, wxT("<"), - wxDefaultPosition, wxSize(12, 100) + wxDefaultPosition, wxSize(12, 100), wxNO_BORDER ); toggler->SetFont(wxFont(14, wxNORMAL, wxNORMAL, wxBOLD)); mainsizer->Add(toggler, 0, wxALIGN_CENTER, 5 ); @@ -245,27 +245,22 @@ wxFlexGridSizer *s_top_v = new wxFlexGridSizer(2); s_top_v->AddGrowableCol(0); - wxComboBox *c_url = new wxComboBox(top_panel, ID_SERVERLISTURL); - c_url->Append( + + wxTextCtrl *txt = new wxTextCtrl( + top_panel, ID_SERVERLISTURL, wxT("http://ocbmaurice.dyndns.org/pl/slist.pl/") wxT("server.met?download/server-best.met") ); - c_url->Append( - wxT("http://ocbmaurice.dyndns.org/pl/slist.pl/") - wxT("server.met?download/server-good.met") - ); - c_url->Append( - wxT("http://ocbmaurice.dyndns.org/pl/slist.pl/") - wxT("server.met?download/server-max.met") - ); - c_url->SetSelection(0); #ifndef __WXX11__ - c_url->SetToolTip( + txt->SetToolTip( _("Enter the URL or .met file location to update list from") ); #endif - s_top_v->Add(c_url, 0, wxGROW|wxEXPAND|wxALL, 0); - wxButton *b_upd = new wxButton(top_panel, ID_UPDATE, _("Update")); + s_top_v->Add(txt, 0, wxGROW|wxEXPAND|wxALL, 0); + wxButton *b_upd = new wxButton( + top_panel, ID_UPDATE, _("Update"), + wxDefaultPosition, wxDefaultSize, wxNO_BORDER + ); s_top_v->Add(b_upd, 0, wxGROW|wxEXPAND|wxRIGHT, 5); s_top->Add(s_top_v, 0, wxGROW|wxEXPAND|wxALL, 0); |