Deal with some clang-inspired buglets.

Respect the initial fullscreen setting in nowx.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7089 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang
2011-02-06 01:56:45 +00:00
parent 35edf1b236
commit 0f7ff9c23e
9 changed files with 284 additions and 256 deletions

View File

@ -137,22 +137,35 @@ class CMemcardManager : public wxDialog
struct _mcmSettings
{
bool twoCardsLoaded,
usePages,
column[NUMBER_OF_COLUMN+1];
}mcmSettings;
bool twoCardsLoaded;
bool usePages;
bool column[NUMBER_OF_COLUMN + 1];
} mcmSettings;
class CMemcardListCtrl : public wxListCtrl
{
//BEGIN_EVENT_TABLE(CMemcardManager::CMemcardListCtrl, wxListCtrl)
// EVT_RIGHT_DOWN(CMemcardManager::CMemcardListCtrl::OnRightClick)
//END_EVENT_TABLE()
public:
CMemcardListCtrl(wxWindow* parent, const wxWindowID id, const wxPoint& pos, const wxSize& size, long style, _mcmSettings& _mcmSetngs)
: wxListCtrl(parent, id, pos, size, style), __mcmSettings(_mcmSetngs){;}
~CMemcardListCtrl(){;}
CMemcardListCtrl(wxWindow* parent, const wxWindowID id,
const wxPoint& pos, const wxSize& size,
long style, _mcmSettings& _mcmSetngs)
: wxListCtrl(parent, id, pos, size, style)
, __mcmSettings(_mcmSetngs)
{
Connect(wxEVT_RIGHT_DOWN, wxMouseEventHandler(
CMemcardListCtrl::OnRightClick));
}
~CMemcardListCtrl()
{
Disconnect(wxEVT_RIGHT_DOWN, wxMouseEventHandler(
CMemcardListCtrl::OnRightClick));
}
_mcmSettings & __mcmSettings;
bool prevPage,
nextPage;
private:
DECLARE_EVENT_TABLE()
void OnRightClick(wxMouseEvent& event);
};