piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-29 00:59:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

Layout should not be called until after a sizer is inserted into its parent. This fixes the "gtk_widget_size_allocate(): attempt to allocate widget with width -5 and height 17" type console warnings that are annoying on linux. If there are issues with this on other platforms let me know, but there shouldn't be.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6459 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Glenn Rice
2010-11-22 15:25:59 +00:00
parent 3ebd09efc9
commit cefaa393e6
3 changed files with 7 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Source/Core/DolphinWX/Src/ISOProperties.cpp
View File

@ -317,9 +317,9 @@ void CISOProperties::CreateGUIControls(bool IsWad)
}
else
{
//Progressive Scan is not used by Dolphin itself,
//and changing it on a per-game basis would have the side-effect of changing the SysConf,
//making this setting rather useless.
// Progressive Scan is not used by Dolphin itself, and changing it on a per-game
// basis would have the side-effect of changing the SysConf, making this setting
// rather useless.
EnableProgressiveScan->Disable();
}
// Video
@ -397,7 +397,6 @@ void CISOProperties::CreateGUIControls(bool IsWad)
sEmuState->Add(EmuIssues,1,wxEXPAND);
sConfigPage->Add(sEmuState, 0, wxEXPAND|wxALL, 5);
m_GameConfig->SetSizer(sConfigPage);
sConfigPage->Layout();
// Patches
@ -420,7 +419,6 @@ void CISOProperties::CreateGUIControls(bool IsWad)
sPatches->Add(sPatchButtons, 0, wxEXPAND|wxALL, 0);
sPatchPage->Add(sPatches, 1, wxEXPAND|wxALL, 5);
m_PatchPage->SetSizer(sPatchPage);
sPatchPage->Layout();
// Action Replay Cheats
@ -443,7 +441,6 @@ void CISOProperties::CreateGUIControls(bool IsWad)
sCheats->Add(sCheatButtons, 0, wxEXPAND|wxALL, 0);
sCheatPage->Add(sCheats, 1, wxEXPAND|wxALL, 5);
m_CheatPage->SetSizer(sCheatPage);
sCheatPage->Layout();
m_NameText = new wxStaticText(m_Information, ID_NAME_TEXT, _("Name:"), wxDefaultPosition, wxDefaultSize);
@ -516,7 +513,6 @@ void CISOProperties::CreateGUIControls(bool IsWad)
sInfoPage->Add(sbISODetails, 0, wxEXPAND|wxALL, 5);
sInfoPage->Add(sbBannerDetails, 0, wxEXPAND|wxALL, 5);
m_Information->SetSizer(sInfoPage);
sInfoPage->Layout();
// Filesystem icons
m_iconList = new wxImageList(16, 16);
@ -533,7 +529,6 @@ void CISOProperties::CreateGUIControls(bool IsWad)
sTreePage = new wxBoxSizer(wxVERTICAL);
sTreePage->Add(m_Treectrl, 1, wxEXPAND|wxALL, 5);
m_Filesystem->SetSizer(sTreePage);
sTreePage->Layout();
// It's a wad file, so we remove the FileSystem page
if (IsWad)
@ -547,8 +542,8 @@ void CISOProperties::CreateGUIControls(bool IsWad)
sMain->Add(sButtons, 0, wxEXPAND, 5);
sMain->SetMinSize(wxSize(550, 600));
m_Notebook->SetMaxSize(wxSize(550, 600));
SetSizerAndFit(sMain);
Layout();
}
void CISOProperties::OnClose(wxCloseEvent& WXUNUSED (event))