From 31a505768de78af7b5dcd54620a0f10cea250b3f Mon Sep 17 00:00:00 2001
From: Jonathan Li <jonathan.li@hotmail.co.uk>
Date: Fri, 4 Sep 2015 17:23:50 +0100
Subject: [PATCH] gui: Use SetSizerAndFit after dialogs are constructed.

It seems to fix the button UI problem for Linux wx3.0 builds.
---
 pcsx2/gui/Dialogs/ConfirmationDialogs.cpp | 1 +
 pcsx2/gui/Dialogs/GameDatabaseDialog.cpp  | 2 ++
 pcsx2/gui/Dialogs/LogOptionsDialog.cpp    | 2 ++
 pcsx2/gui/Dialogs/SysConfigDialog.cpp     | 8 +++++++-
 4 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/pcsx2/gui/Dialogs/ConfirmationDialogs.cpp b/pcsx2/gui/Dialogs/ConfirmationDialogs.cpp
index 9c91ffab9d..072d85bf4e 100644
--- a/pcsx2/gui/Dialogs/ConfirmationDialogs.cpp
+++ b/pcsx2/gui/Dialogs/ConfirmationDialogs.cpp
@@ -147,6 +147,7 @@ wxWindowID pxIssueConfirmation( wxDialogWithHelpers& confirmDlg, const MsgButton
 
 	confirmDlg += new ModalButtonPanel( &confirmDlg, buttons ) | pxCenter.Border( wxTOP, 8 );
 	buttons.SetBestFocus( confirmDlg );
+	confirmDlg.SetSizerAndFit(confirmDlg.GetSizer());
 	return confirmDlg.ShowModal();
 }
 
diff --git a/pcsx2/gui/Dialogs/GameDatabaseDialog.cpp b/pcsx2/gui/Dialogs/GameDatabaseDialog.cpp
index 1231180496..ef4ee36fc4 100644
--- a/pcsx2/gui/Dialogs/GameDatabaseDialog.cpp
+++ b/pcsx2/gui/Dialogs/GameDatabaseDialog.cpp
@@ -26,4 +26,6 @@ Dialogs::GameDatabaseDialog::GameDatabaseDialog(wxWindow* parent)
 	ScopedBusyCursor busy( Cursor_ReallyBusy );
 	*this += new GameDatabasePanel(this) | StdExpand();
 	AddOkCancel();
+
+	SetSizerAndFit(GetSizer());
 }
diff --git a/pcsx2/gui/Dialogs/LogOptionsDialog.cpp b/pcsx2/gui/Dialogs/LogOptionsDialog.cpp
index dbcdf2d14c..990cad6b9f 100644
--- a/pcsx2/gui/Dialogs/LogOptionsDialog.cpp
+++ b/pcsx2/gui/Dialogs/LogOptionsDialog.cpp
@@ -28,4 +28,6 @@ Dialogs::LogOptionsDialog::LogOptionsDialog( wxWindow* parent )
 {
 	*this += new LogOptionsPanel( this ) | StdExpand();
 	AddOkCancel();
+
+	SetSizerAndFit(GetSizer());
 }
diff --git a/pcsx2/gui/Dialogs/SysConfigDialog.cpp b/pcsx2/gui/Dialogs/SysConfigDialog.cpp
index d2b4050ec3..f7b82194b6 100644
--- a/pcsx2/gui/Dialogs/SysConfigDialog.cpp
+++ b/pcsx2/gui/Dialogs/SysConfigDialog.cpp
@@ -229,6 +229,8 @@ Dialogs::SysConfigDialog::SysConfigDialog(wxWindow* parent)
 	AddOkCancel();
 	AddPresetsControl();
 
+	SetSizerAndFit(GetSizer());
+
 	if( wxGetApp().Overrides.HasCustomHacks() )
 		wxGetApp().PostMethod( CheckHacksOverrides );
 }
@@ -248,11 +250,13 @@ Dialogs::ComponentsConfigDialog::ComponentsConfigDialog(wxWindow* parent)
 	AddListbook();
 	AddOkCancel();
 
+	SetSizerAndFit(GetSizer());
+
 	if( wxGetApp().Overrides.HasPluginsOverride() )
 		wxGetApp().PostMethod( CheckPluginsOverrides );
 }
 
-
+// FIXME: Purge? It's unused and does nothing.
 Dialogs::InterfaceConfigDialog::InterfaceConfigDialog(wxWindow *parent)
 	: BaseConfigurationDialog( parent, AddAppName(_("Appearance/Themes - %s")), 400 )
 {
@@ -281,6 +285,8 @@ Dialogs::InterfaceLanguageDialog::InterfaceLanguageDialog(wxWindow* parent)
 	*this += new Panels::LanguageSelectionPanel(this, false) | StdCenter();
 
 	AddOkCancel();
+
+	SetSizerAndFit(GetSizer());
 }
 
 // ------------------------------------------------------------------------