[Scummvm-git-logs] scummvm-tools master -> 266e164e7c5b189b5fddd035f4c4fe56ba6ad8df

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm-tools' repo located at https://github.com/scummvm/scummvm-tools .

Summary:
266e164e7c BUILD: Fix compatibility with wxWidgets 3.2


Commit: 266e164e7c5b189b5fddd035f4c4fe56ba6ad8df
    https://github.com/scummvm/scummvm-tools/commit/266e164e7c5b189b5fddd035f4c4fe56ba6ad8df
Author: Scott Talbert (swt at techie.net)
Date: 2022-10-24T21:21:25+02:00

Commit Message:
BUILD: Fix compatibility with wxWidgets 3.2

In wxWidgets 3.2, there are added assertions which occur when
meaningless sizer flags are used.  This removes such sizer flags to
avoid the assertions.

Changed paths:
    gui/main.cpp


diff --git a/gui/main.cpp b/gui/main.cpp
index edcba3ff..446c4f19 100644
--- a/gui/main.cpp
+++ b/gui/main.cpp
@@ -221,11 +221,11 @@ ScummToolsFrame::ScummToolsFrame(const wxString &title, const wxPoint &pos, cons
 	linepanel->SetSizer(linesizer);
 
 	// Add the line to the main panel
-	sizer->Add(linepanel, wxSizerFlags().Expand().Center().Border());
+	sizer->Add(linepanel, wxSizerFlags().Expand().Border());
 
 	// Buttons on the bottom
 	_buttons = new WizardButtons(main, linetext, _configuration);
-	sizer->Add(_buttons, wxSizerFlags().Border().Center().Expand());
+	sizer->Add(_buttons, wxSizerFlags().Border().Expand());
 
 	main->SetSizer(sizer);
 }
@@ -435,19 +435,19 @@ WizardButtons::WizardButtons(wxWindow *parent, wxStaticText *linetext, Configura
 
 	_prev = new wxButton(this, ID_PREV, wxT("< Back"));
 	_prev->SetSize(80, -1);
-	sizer->Add(_prev, wxSizerFlags().Right().ReserveSpaceEvenIfHidden());
+	sizer->Add(_prev, wxSizerFlags().ReserveSpaceEvenIfHidden());
 
 	_next = new wxButton(this, ID_NEXT, wxT("Next >"));
 	_next->SetSize(80, -1);
-	sizer->Add(_next, wxSizerFlags().Right().ReserveSpaceEvenIfHidden());
+	sizer->Add(_next, wxSizerFlags().ReserveSpaceEvenIfHidden());
 
 	sizer->AddSpacer(10);
 
 	_cancel = new wxButton(this, ID_CANCEL, wxT("Cancel"));
 	_cancel->SetSize(80, -1);
-	sizer->Add(_cancel, wxSizerFlags().Right().ReserveSpaceEvenIfHidden());
+	sizer->Add(_cancel, wxSizerFlags().ReserveSpaceEvenIfHidden());
 
-	topsizer->Add(sizer, wxSizerFlags().Right().Border());
+	topsizer->Add(sizer, wxSizerFlags().Border());
 
 	SetSizerAndFit(topsizer);