diff options
Diffstat (limited to '')
-rw-r--r-- | gui/button.cpp | 2 | ||||
-rw-r--r-- | gui/hardwarekeyboard.cpp | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/gui/button.cpp b/gui/button.cpp index 45614e461..a9b02a305 100644 --- a/gui/button.cpp +++ b/gui/button.cpp @@ -85,7 +85,7 @@ GUIButton::GUIButton(xml_node<>* node) mHighlightColor = LoadAttrColor(FindNode(node, "highlight"), "color", &hasHighlightColor); - int x, y, w, h; + int x = 0, y = 0, w = 0, h = 0; TextPlacement = TOP_LEFT; if (mButtonImg) { mButtonImg->GetRenderPos(x, y, w, h); diff --git a/gui/hardwarekeyboard.cpp b/gui/hardwarekeyboard.cpp index f831727d1..68be9065d 100644 --- a/gui/hardwarekeyboard.cpp +++ b/gui/hardwarekeyboard.cpp @@ -37,6 +37,7 @@ extern "C" { #include "../common.h" } +#include "../twcommon.h" #include "objects.hpp" #include <linux/input.h> @@ -361,7 +362,7 @@ static int KeyCodeToChar(int key_code, bool shiftkey, bool ctrlkey) #ifdef _EVENT_LOGGING default: - LOGE("Unmapped keycode: %i\n", key_code); + LOGERR("Unmapped keycode: %i\n", key_code); break; #endif } @@ -384,7 +385,7 @@ bool HardwareKeyboard::IsKeyDown(int key_code) int HardwareKeyboard::KeyDown(int key_code) { #ifdef _EVENT_LOGGING - LOGE("HardwareKeyboard::KeyDown %i\n", key_code); + LOGERR("HardwareKeyboard::KeyDown %i\n", key_code); #endif key_code = TranslateKeyCode(key_code); mPressedKeys.insert(key_code); @@ -410,7 +411,7 @@ int HardwareKeyboard::KeyDown(int key_code) int HardwareKeyboard::KeyUp(int key_code) { #ifdef _EVENT_LOGGING - LOGE("HardwareKeyboard::KeyUp %i\n", key_code); + LOGERR("HardwareKeyboard::KeyUp %i\n", key_code); #endif key_code = TranslateKeyCode(key_code); std::set<int>::iterator itr = mPressedKeys.find(key_code); @@ -424,7 +425,7 @@ int HardwareKeyboard::KeyUp(int key_code) int HardwareKeyboard::KeyRepeat() { #ifdef _EVENT_LOGGING - LOGE("HardwareKeyboard::KeyRepeat: %i\n", mLastKeyChar); + LOGERR("HardwareKeyboard::KeyRepeat: %i\n", mLastKeyChar); #endif if (mLastKeyChar) PageManager::NotifyCharInput(mLastKeyChar); |