ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Linux build fix. Also take care of a few compiler warnings that have developed. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7578 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Glenn Rice 2011-06-02 23:28:47 +00:00
parent 837375a13d
commit bad9fd1f1d
5 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/Core/Src/CoreParameter.cpp
View File

@ -52,14 +52,14 @@ SCoreStartupParameter::SCoreStartupParameter()
bRunCompareServer(false), bRunCompareClient(false), bRunCompareServer(false), bRunCompareClient(false),
bMMU(false), bMMUBAT(false), iTLBHack(0), bVBeam(false), bMMU(false), bMMUBAT(false), iTLBHack(0), bVBeam(false),
bFastDiscSpeed(false), bFastDiscSpeed(false),
SelectedLanguage(0), bWii(false), SelectedLanguage(0), bWii(false), bDisableWiimoteSpeaker(false),
bConfirmStop(false), bHideCursor(false), bConfirmStop(false), bHideCursor(false),
bAutoHideCursor(false), bUsePanicHandlers(true), bAutoHideCursor(false), bUsePanicHandlers(true),
iRenderWindowXPos(-1), iRenderWindowYPos(-1), iRenderWindowXPos(-1), iRenderWindowYPos(-1),
iRenderWindowWidth(640), iRenderWindowHeight(480), iRenderWindowWidth(640), iRenderWindowHeight(480),
bRenderWindowAutoSize(false), bRenderWindowAutoSize(false),
bFullscreen(false), bRenderToMain(false), bFullscreen(false), bRenderToMain(false),
bProgressive(false), bDisableWiimoteSpeaker(false), bProgressive(false),
iTheme(0), iTheme(0),
iPosX(100), iPosY(100), iWidth(800), iHeight(600) iPosX(100), iPosY(100), iWidth(800), iHeight(600)
{ {

4
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.cpp
View File

@ -512,7 +512,7 @@ void CWII_IPC_HLE_Device_fs::DoState(PointerWrap& p)
//now restore from the stream //now restore from the stream
while(1) { while(1) {
char type; char type = 0;
p.Do(type); p.Do(type);
if (!type) if (!type)
break; break;
@ -528,7 +528,7 @@ void CWII_IPC_HLE_Device_fs::DoState(PointerWrap& p)
} }
case 'f': case 'f':
{ {
u32 size; u32 size = 0;
p.Do(size); p.Do(size);
File::IOFile handle(name, "wb"); File::IOFile handle(name, "wb");

2
Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp
View File

@ -120,7 +120,7 @@ void CARCodeAddEdit::SaveCheatData(wxCommandEvent& WXUNUSED (event))
} }
// If the above-mentioned conditions weren't met, then something went wrong. // If the above-mentioned conditions weren't met, then something went wrong.
if (!PanicYesNoT("Unable to parse line %u of the entered AR code as a valid " if (!PanicYesNoT("Unable to parse line %lu of the entered AR code as a valid "
"encrypted or decrypted code. Make sure you typed it correctly.\n" "encrypted or decrypted code. Make sure you typed it correctly.\n"
"Would you like to ignore this line and continue parsing?", i + 1)) "Would you like to ignore this line and continue parsing?", i + 1))
{ {

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

@ -3,11 +3,14 @@
#include "FileUtil.h" #include "FileUtil.h"
#include "TextureCacheBase.h" #include "TextureCacheBase.h"
#include "Core.h" #include "Core.h"
#include "Frame.h"
#include <wx/intl.h> #include <wx/intl.h>
#define _connect_macro_(b, f, c, s) (b)->Connect(wxID_ANY, (c), wxCommandEventHandler( f ), (wxObject*)0, (wxEvtHandler*)s) #define _connect_macro_(b, f, c, s) (b)->Connect(wxID_ANY, (c), wxCommandEventHandler( f ), (wxObject*)0, (wxEvtHandler*)s)
extern CFrame* main_frame;
// template instantiation // template instantiation
template class BoolSetting<wxCheckBox>; template class BoolSetting<wxCheckBox>;
template class BoolSetting<wxRadioButton>; template class BoolSetting<wxRadioButton>;
@ -600,6 +603,16 @@ VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string &title, con
UpdateWindowUI(); UpdateWindowUI();
} }
void VideoConfigDiag::Event_DisplayResolution(wxCommandEvent &ev)
{
SConfig::GetInstance().m_LocalCoreStartupParameter.strFullscreenResolution =
choice_display_resolution->GetStringSelection().mb_str();
#if defined(HAVE_XRANDR) && HAVE_XRANDR
main_frame->m_XRRConfig->Update();
#endif
ev.Skip();
}
SettingCheckBox* VideoConfigDiag::CreateCheckBox(wxWindow* parent, const wxString& label, const wxString& description, bool &setting, bool reverse, long style) SettingCheckBox* VideoConfigDiag::CreateCheckBox(wxWindow* parent, const wxString& label, const wxString& description, bool &setting, bool reverse, long style)
{ {
SettingCheckBox* const cb = new SettingCheckBox(parent, label, wxString(), setting, reverse, style); SettingCheckBox* const cb = new SettingCheckBox(parent, label, wxString(), setting, reverse, style);

13
Source/Core/DolphinWX/Src/VideoConfigDiag.h
View File

@ -20,9 +20,6 @@
#include <wx/spinctrl.h> #include <wx/spinctrl.h>
#include "MsgHandler.h" #include "MsgHandler.h"
#include "Frame.h"
extern CFrame* main_frame;
template <typename W> template <typename W>
class BoolSetting : public W class BoolSetting : public W
@ -109,15 +106,7 @@ protected:
} }
void Event_Adapter(wxCommandEvent &ev) { ev.Skip(); } // TODO void Event_Adapter(wxCommandEvent &ev) { ev.Skip(); } // TODO
void Event_DisplayResolution(wxCommandEvent &ev) void Event_DisplayResolution(wxCommandEvent &ev);
{
SConfig::GetInstance().m_LocalCoreStartupParameter.strFullscreenResolution =
choice_display_resolution->GetStringSelection().mb_str();
#if defined(HAVE_XRANDR) && HAVE_XRANDR
main_frame->m_XRRConfig->Update();
#endif
ev.Skip();
}
void Event_ProgressiveScan(wxCommandEvent &ev) void Event_ProgressiveScan(wxCommandEvent &ev)
{ {