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

compiletime warning fixes, possible wxw crashes fixed, disable build of njoy_test until it's more mature.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1502 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Shawn Hoffman
2008-12-12 03:38:50 +00:00
parent 835f38c6e0
commit 66536235e6
8 changed files with 84 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Source/Core/DolphinWX/Src/FrameWiimote.cpp
View File

@ -44,7 +44,7 @@ namespace WiimoteLeds
int SPEAKER_SIZE_X = 8;
int SPEAKER_SIZE_Y = 8;
int ConnectionStatusWidth = 103; // This needs to be wider, for vista at least
int ConnectionStatusWidth = 103; // These widths need to be revised, for vista at least
int ConnectionStatusOnlyAdj = 7;
int RightmostMargin = 6;
int SpIconMargin = 11;
@ -105,9 +105,9 @@ void CFrame::ModifyStatusBar()
{ LedsOn = false; SpeakersOn = false; }
// Declarations
int Fields;
int *Widths;
int *StylesFields;
int Fields = 0;
int *Widths = 0;
int *StylesFields = 0;
// ---------------------------------------
// Leds only
@ -227,7 +227,7 @@ void CFrame::CreateLeds()
for(int i = 0; i < 4; i++)
{
m_StatBmp[i] = new wxStaticBitmap(m_pStatusBar, wxID_ANY,
CreateBitmapForLeds((bool)g_Leds[i]));
CreateBitmapForLeds(g_Leds[i] == 1));
}
}
// Update leds
@ -235,7 +235,7 @@ void CFrame::UpdateLeds()
{
for(int i = 0; i < 4; i++)
{
m_StatBmp[i]->SetBitmap(CreateBitmapForLeds((bool)g_Leds[i]));
m_StatBmp[i]->SetBitmap(CreateBitmapForLeds(g_Leds[i] != 0));
}
}
// ==============
@ -252,7 +252,7 @@ void CFrame::CreateSpeakers()
for(int i = 0; i < 3; i++)
{
m_StatBmp[i+4] = new wxStaticBitmap(m_pStatusBar, wxID_ANY,
CreateBitmapForSpeakers(i, (bool)g_Speakers[i]));
CreateBitmapForSpeakers(i, g_Speakers[i] != 0));
}
}
// Update icons
@ -265,7 +265,7 @@ void CFrame::UpdateSpeakers()
{ PanicAlert("Not Wii");}*/
for(int i = 0; i < 3; i++)
{
m_StatBmp[i+4]->SetBitmap(CreateBitmapForSpeakers(i, (bool)g_Speakers[i]));
m_StatBmp[i+4]->SetBitmap(CreateBitmapForSpeakers(i, g_Speakers[i] != 0));
}
}
// ==============
@ -348,12 +348,6 @@ wxBitmap CFrame::CreateBitmapForSpeakers(int BitmapType, bool On)
// =======================================================
// Move the bitmaps
// -------------
void CFrame::MoveIcons(wxSizeEvent& event)
{
DoMoveIcons();
event.Skip();
}
void CFrame::DoMoveIcons()
{
if(HaveLeds) MoveLeds();