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

Removes a few compiler warnings and fix the bitmap for the sticks being cut off on the right

Browse Source
This commit is contained in:
Braden
2012-11-04 15:49:52 -06:00
parent 793e547e15
commit 3429db1115
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -951,7 +951,7 @@ void CFrame::OnKeyDown(wxKeyEvent& event)
else else
{ {
unsigned int i = NUM_HOTKEYS; unsigned int i = NUM_HOTKEYS;
if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain || g_TASInputDlg->HasFocus()) if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain || g_TASInputDlg->TASInputDlgHasFocus())
{ {
for (i = 0; i < NUM_HOTKEYS; i++) for (i = 0; i < NUM_HOTKEYS; i++)
{ {

5
Source/Core/DolphinWX/Src/TASInputDlg.cpp
View File

@ -682,7 +682,7 @@ void TASInputDlg::OnCloseWindow(wxCloseEvent& event)
} }
} }
bool TASInputDlg::HasFocus() bool TASInputDlg::TASInputDlgHasFocus()
{ {
//allows numbers to be used as hotkeys //allows numbers to be used as hotkeys
if(TextBoxHasFocus()) if(TextBoxHasFocus())
@ -753,7 +753,6 @@ void TASInputDlg::OnMouseUpR(wxMouseEvent& event)
return; return;
} }
wxPoint ptM(event.GetPosition());
*x = 128; *x = 128;
*y = 128; *y = 128;
@ -1027,7 +1026,7 @@ wxBitmap TASInputDlg::CreateStickBitmap(int x, int y)
y = y/2; y = y/2;
wxMemoryDC memDC; wxMemoryDC memDC;
wxBitmap bitmap(127, 127); wxBitmap bitmap(129, 129);
memDC.SelectObject(bitmap); memDC.SelectObject(bitmap);
memDC.SetBackground(*wxLIGHT_GREY_BRUSH); memDC.SetBackground(*wxLIGHT_GREY_BRUSH);
memDC.Clear(); memDC.Clear();

2
Source/Core/DolphinWX/Src/TASInputDlg.h
View File

@ -46,7 +46,7 @@ class TASInputDlg : public wxDialog
void ButtonTurbo(); void ButtonTurbo();
void GetKeyBoardInput(SPADStatus *PadStatus); void GetKeyBoardInput(SPADStatus *PadStatus);
bool TextBoxHasFocus(); bool TextBoxHasFocus();
bool HasFocus(); bool TASInputDlgHasFocus();
wxBitmap CreateStickBitmap(int x, int y); wxBitmap CreateStickBitmap(int x, int y);