Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
home:goupilmtos:games
scorched3d
fix-wx3.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File fix-wx3.patch of Package scorched3d
--- scorched.orig/src/launcher/wxdialogs/Display.cpp +++ scorched/src/launcher/wxdialogs/Display.cpp @@ -88,7 +88,7 @@ static void createMainControls(wxWindow // Sound settings wxStaticBox *soundBox = new wxStaticBox(parent, -1, wxT("&Sound")); wxStaticBoxSizer *soundSizerMain = new wxStaticBoxSizer(soundBox, wxVERTICAL); - wxFlexGridSizer *soundSizer1 = new wxFlexGridSizer(4, 2); + wxFlexGridSizer *soundSizer1 = new wxFlexGridSizer(4, 2, 0); wxStaticText *volumeText = new wxStaticText(parent, -1, wxT("Sound Volume :")); wxStaticText *musicVolumeText = new wxStaticText(parent, -1, wxT("Music Volume :")); wxStaticText *ambientVolumeText = new wxStaticText(parent, -1, wxT("Ambient Volume :")); @@ -137,7 +137,7 @@ static void createMainControls(wxWindow wxT("Game Detail Options")); wxStaticBoxSizer *speedSizer = new wxStaticBoxSizer(speedBox, wxHORIZONTAL); - wxGridSizer *loadSizer = new wxFlexGridSizer(2, 2); + wxGridSizer *loadSizer = new wxFlexGridSizer(2, 2, 0); IDC_LOADULTRA_CTRL = new wxButton(parent, ID_LOADULTRA, wxT("&Ultra Detail"), wxDefaultPosition, wxSize(120,-1)); IDC_LOADDEFAULTS_CTRL = new wxButton(parent, ID_LOADDEFAULTS, wxT("&Normal Detail"), wxDefaultPosition, wxSize(120,-1)); IDC_LOADMEDIUM_CTRL = new wxButton(parent, ID_LOADMEDIUM, wxT("Faster Detail"), wxDefaultPosition, wxSize(120,-1)); @@ -471,7 +471,7 @@ static void createKeysControls(wxWindow { wxScrolledWindow *scrolledWindow = new wxScrolledWindow(parent, -1, wxDefaultPosition, wxSize(480, 250)); - wxSizer *sizer = new wxFlexGridSizer(5, 1); + wxSizer *sizer = new wxFlexGridSizer(5, 1, 0); keyboardKeyList.clear(); if (!Keyboard::instance()->loadKeyFile()) --- scorched.orig/src/launcher/wxdialogs/DisplayDialog.cpp +++ scorched/src/launcher/wxdialogs/DisplayDialog.cpp @@ -449,15 +449,15 @@ void DisplayFrame::refreshScreen() IDC_SLIDER1_CTRL->SetValue(OptionsDisplay::instance()->getBrightness()); IDC_SLIDER1_CTRL->SetToolTip(wxString(OptionsDisplay::instance()->getBrightnessEntry().getDescription(), wxConvUTF8)); IDC_VOLUME_CTRL->SetRange(0, 128); - IDC_VOLUME_CTRL->SetTickFreq(4, 0); + IDC_VOLUME_CTRL->SetTickFreq(4); IDC_VOLUME_CTRL->SetValue(OptionsDisplay::instance()->getSoundVolume()); IDC_VOLUME_CTRL->SetToolTip(wxString(OptionsDisplay::instance()->getSoundVolumeEntry().getDescription(), wxConvUTF8)); IDC_MUSICVOLUME_CTRL->SetRange(0, 128); - IDC_MUSICVOLUME_CTRL->SetTickFreq(4, 0); + IDC_MUSICVOLUME_CTRL->SetTickFreq(4); IDC_MUSICVOLUME_CTRL->SetValue(OptionsDisplay::instance()->getMusicVolume()); IDC_MUSICVOLUME_CTRL->SetToolTip(wxString(OptionsDisplay::instance()->getMusicVolumeEntry().getDescription(), wxConvUTF8)); IDC_AMBIENTVOLUME_CTRL->SetRange(0, 128); - IDC_AMBIENTVOLUME_CTRL->SetTickFreq(4, 0); + IDC_AMBIENTVOLUME_CTRL->SetTickFreq(4); IDC_AMBIENTVOLUME_CTRL->SetValue(OptionsDisplay::instance()->getAmbientSoundVolume()); IDC_AMBIENTVOLUME_CTRL->SetToolTip(wxString(OptionsDisplay::instance()->getAmbientSoundVolumeEntry().getDescription(), wxConvUTF8)); IDC_USERNAME_CTRL->SetValue(wxString(OptionsDisplay::instance()->getOnlineUserName(), wxConvUTF8)); --- scorched.orig/src/launcher/wxdialogs/SettingsDialog.cpp +++ scorched/src/launcher/wxdialogs/SettingsDialog.cpp @@ -105,7 +105,7 @@ void SettingsFrame::createMainPanel(bool mainPanel_ = new wxPanel(book_, -1); book_->AddPage(mainPanel_, wxT("Main")); wxSizer *mainPanelSizer = new wxBoxSizer(wxVERTICAL); - wxSizer *sizer = new wxFlexGridSizer(2, 2); + wxSizer *sizer = new wxFlexGridSizer(2, 2, 0); mainPanelSizer->Add(sizer, 0, wxALL | wxALIGN_CENTER, 10); setters_.push_back( @@ -166,7 +166,7 @@ void SettingsFrame::createMoneyPanel() { moneyPanel_ = new wxPanel(book_, -1); wxSizer *ecoPanelSizer = new wxBoxSizer(wxVERTICAL); - wxSizer *sizer = new wxFlexGridSizer(2, 2); + wxSizer *sizer = new wxFlexGridSizer(2, 2, 0); ecoPanelSizer->Add(sizer, 0, wxALL | wxALIGN_CENTER, 10); setters_.push_back( @@ -215,7 +215,7 @@ void SettingsFrame::createScorePanel() { scorePanel_ = new wxPanel(book_, -1); wxSizer *ecoPanelSizer = new wxBoxSizer(wxVERTICAL); - wxSizer *sizer = new wxFlexGridSizer(2, 2); + wxSizer *sizer = new wxFlexGridSizer(2, 2, 0); ecoPanelSizer->Add(sizer, 0, wxALL | wxALIGN_CENTER, 10); setters_.push_back( @@ -249,7 +249,7 @@ void SettingsFrame::createWeaponsPanel() { weaponsPanel_ = new wxPanel(book_, -1); wxSizer *ecoPanelSizer = new wxBoxSizer(wxVERTICAL); - wxSizer *sizer = new wxFlexGridSizer(2, 2); + wxSizer *sizer = new wxFlexGridSizer(2, 2, 0); ecoPanelSizer->Add(sizer, 0, wxALL | wxALIGN_CENTER, 10); setters_.push_back( @@ -286,7 +286,7 @@ void SettingsFrame::createEnvPanel() { envPanel_ = new wxPanel(book_, -1); wxSizer *envPanelSizer = new wxBoxSizer(wxVERTICAL); - wxSizer *sizer = new wxFlexGridSizer(2, 2); + wxSizer *sizer = new wxFlexGridSizer(2, 2, 0); envPanelSizer->Add(sizer, 0, wxALL | wxALIGN_CENTER, 10); setters_.push_back( @@ -337,7 +337,7 @@ void SettingsFrame::createLandPanel() wxScrolledWindow *scrolledWindow = new wxScrolledWindow(landPanel_, -1, wxDefaultPosition, wxSize(225, 200)); - wxSizer *sizer = new wxFlexGridSizer(3, 3); + wxSizer *sizer = new wxFlexGridSizer(3, 3, 0); int i = 0; std::list<LandscapeDefinitionsEntry> &defns = landscapeDefinitions.getAllLandscapes(); @@ -438,7 +438,7 @@ void SettingsFrame::createPlayersPanel() wxT("Players are persistent for game")); playersPanelSizer->Add(IDC_SERVER_RESIDUAL_CTRL, 0, wxALIGN_CENTER | wxTOP, 10); - wxSizer *sizer = new wxGridSizer(3, 3); + wxSizer *sizer = new wxGridSizer(3, 3, 0); playersPanelSizer->Add(sizer, 0, wxALL | wxALIGN_CENTER, 10); for (int i=0; i<24; i++)
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor