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

Merge pull request #2014 from degasus/master 

HotKey: fix warnings
This commit is contained in:
Markus Wick 2015-02-05 13:32:07 +01:00
parent 235fa05171 68c70be960
commit 550dc273f3
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/HotkeyManager.cpp
View File

@ -153,6 +153,8 @@ const int num_hotkeys = (sizeof(hotkey_labels) / sizeof(hotkey_labels[0]));
namespace HotkeyManagerEmu
{
static u32 hotkeyDown[6];
static InputConfig s_config("Hotkeys", _trans("Hotkeys"), "Hotkeys");
InputConfig* GetConfig()
{

2
Source/Core/Core/HotkeyManager.h
View File

@ -36,6 +36,4 @@ namespace HotkeyManagerEmu
InputConfig* GetConfig();
void GetStatus(u8 _port, HotkeyStatus* _pKeyboardStatus);
bool IsPressed(int Id, bool held);
static u32 hotkeyDown[6];
}

6
Source/Core/DolphinWX/InputConfigDiagBitmaps.cpp
View File

@ -41,7 +41,7 @@ struct ShapePosition
};
// regular octagon
void DrawOctagon(wxDC* dc, ShapePosition p)
static void DrawOctagon(wxDC* dc, ShapePosition p)
{
const int vertices = 8;
double radius = p.max;
@ -63,7 +63,7 @@ void DrawOctagon(wxDC* dc, ShapePosition p)
}
// irregular dodecagon
void DrawDodecagon(wxDC* dc, ShapePosition p)
static void DrawDodecagon(wxDC* dc, ShapePosition p)
{
const int vertices = 12;
@ -108,7 +108,7 @@ static void DrawCoordinate(wxDC &dc, ControlState x, ControlState y)
DrawCenteredRectangle(dc, xc, yc, COORD_VIS_SIZE, COORD_VIS_SIZE);
}
void DrawButton(unsigned int* const bitmasks, unsigned int buttons, unsigned int n, wxDC& dc, ControlGroupBox* g, unsigned int row)
static void DrawButton(unsigned int* const bitmasks, unsigned int buttons, unsigned int n, wxDC& dc, ControlGroupBox* g, unsigned int row)
{
if (buttons & bitmasks[(row * 8) + n])
{