diff options
| author | Soren Jorvang <soren.jorvang@gmail.com> | 2010-08-04 14:00:59 +0000 |
|---|---|---|
| committer | Soren Jorvang <soren.jorvang@gmail.com> | 2010-08-04 14:00:59 +0000 |
| commit | 7ddf0aa711d01d0ea03fcfc89e9dfdcf7726d5f0 (patch) | |
| tree | f933a2fae42717d54f74fc5c25076220a97d4021 /Source/Core | |
| parent | e9424bcafaa5e0991c0aa8aa8320640ed2fe5cc6 (diff) | |
Silence gcc warnings about empty statements and out-of-order initializers.
Increase ISO properties window size to make room for the new Gecko codes.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6050 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/DolphinWX/Src/ConfigMain.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/Src/ISOProperties.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Source/Core/DolphinWX/Src/ConfigMain.cpp b/Source/Core/DolphinWX/Src/ConfigMain.cpp index 4080c19142..9677da51c4 100644 --- a/Source/Core/DolphinWX/Src/ConfigMain.cpp +++ b/Source/Core/DolphinWX/Src/ConfigMain.cpp @@ -36,7 +36,7 @@ #include "../../Common/Src/OpenCL.h" #ifdef __APPLE__ -#include <Cocoa/Cocoa.h> +#include <ApplicationServices/ApplicationServices.h> #endif extern CFrame* main_frame; diff --git a/Source/Core/DolphinWX/Src/ISOProperties.cpp b/Source/Core/DolphinWX/Src/ISOProperties.cpp index 929d17f919..86dd86b5ac 100644 --- a/Source/Core/DolphinWX/Src/ISOProperties.cpp +++ b/Source/Core/DolphinWX/Src/ISOProperties.cpp @@ -524,9 +524,9 @@ void CISOProperties::CreateGUIControls(bool IsWad) sMain = new wxBoxSizer(wxVERTICAL); sMain->Add(m_Notebook, 1, wxEXPAND|wxALL, 5); sMain->Add(sButtons, 0, wxEXPAND, 5); - sMain->SetMinSize(wxSize(400, 600)); + sMain->SetMinSize(wxSize(550, 600)); - m_Notebook->SetMaxSize(wxSize(400, 600)); + m_Notebook->SetMaxSize(wxSize(550, 600)); SetSizerAndFit(sMain); } |