From 68c70be9602be6ae2e8f5a5367b6fa874a3c9de1 Mon Sep 17 00:00:00 2001 From: degasus Date: Wed, 4 Feb 2015 20:19:16 +0100 Subject: [PATCH] HotKey: fix warnings --- Source/Core/Core/HotkeyManager.cpp | 2 ++ Source/Core/Core/HotkeyManager.h | 2 -- Source/Core/DolphinWX/InputConfigDiagBitmaps.cpp | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Source/Core/Core/HotkeyManager.cpp b/Source/Core/Core/HotkeyManager.cpp index e677c96cef..00aad63d5c 100644 --- a/Source/Core/Core/HotkeyManager.cpp +++ b/Source/Core/Core/HotkeyManager.cpp @@ -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() { diff --git a/Source/Core/Core/HotkeyManager.h b/Source/Core/Core/HotkeyManager.h index 159ba2dff6..1e03163def 100644 --- a/Source/Core/Core/HotkeyManager.h +++ b/Source/Core/Core/HotkeyManager.h @@ -36,6 +36,4 @@ namespace HotkeyManagerEmu InputConfig* GetConfig(); void GetStatus(u8 _port, HotkeyStatus* _pKeyboardStatus); bool IsPressed(int Id, bool held); - - static u32 hotkeyDown[6]; } diff --git a/Source/Core/DolphinWX/InputConfigDiagBitmaps.cpp b/Source/Core/DolphinWX/InputConfigDiagBitmaps.cpp index a78c7b013c..3da0253581 100644 --- a/Source/Core/DolphinWX/InputConfigDiagBitmaps.cpp +++ b/Source/Core/DolphinWX/InputConfigDiagBitmaps.cpp @@ -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]) {