thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

WINCE: Run astyle over WinCE source files.

Browse source
This commit is contained in:
Johannes Schickel 2011-03-09 03:02:46 +01:00
parent 438f2b2e1b
commit bd82ebd080
24 changed files with 298 additions and 303 deletions
Download patch file Download diff file Expand all files Collapse all files

3
backends/platform/wince/CELauncherDialog.cpp
View file

@ -113,7 +113,6 @@ void CELauncherDialog::addGame() {
ConfMan.flushToDisk(); ConfMan.flushToDisk();
updateListing(); updateListing();
draw(); draw();
} } else
else
GUILauncherDialog::addGame(); GUILauncherDialog::addGame();
} }

7
backends/platform/wince/CEgui/GUIElement.cpp
View file

@ -45,9 +45,7 @@ bool GUIElement::setBackground(WORD backgroundReference) {
if (!_height && !_width) { if (!_height && !_width) {
_height = _background->height(); _height = _background->height();
_width = _background->width(); _width = _background->width();
} } else if (_background->height() != _height || _background->width() != _width) {
else
if (_background->height() != _height || _background->width() != _width) {
delete _background; delete _background;
_background = NULL; _background = NULL;
return false; return false;
@ -74,8 +72,7 @@ bool GUIElement::draw(SDL_Surface *surface) {
_drawn = true; _drawn = true;
return true; return true;
} } else
else
return false; return false;
} }

3
backends/platform/wince/CEgui/Panel.cpp
View file

@ -50,8 +50,7 @@ bool Panel::draw(SDL_Surface *surface) {
((GUIElement *)(iterator->_value))->draw(surface); ((GUIElement *)(iterator->_value))->draw(surface);
} }
return true; return true;
} } else
else
return false; return false;
} }

9
backends/platform/wince/CEgui/PanelKeyboard.cpp
View file

@ -31,7 +31,8 @@ namespace CEGUI {
const char KEYBOARD_MAPPING_ALPHA[][14] = { {"abcdefghijklm"}, {"nopqrstuvwxyz"} }; const char KEYBOARD_MAPPING_ALPHA[][14] = { {"abcdefghijklm"}, {"nopqrstuvwxyz"} };
const char KEYBOARD_MAPPING_NUMERIC[][6] = { {"12345"}, {"67890"} }; const char KEYBOARD_MAPPING_NUMERIC[][6] = { {"12345"}, {"67890"} };
const int KEYBOARD_MAPPING_SPECIAL[][3][2] = { { {1, SDLK_ESCAPE}, {224, SDLK_UP}, {32, SDLK_SPACE} }, const int KEYBOARD_MAPPING_SPECIAL[][3][2] = { { {1, SDLK_ESCAPE}, {224, SDLK_UP}, {32, SDLK_SPACE} },
{ {224,SDLK_LEFT}, {224,SDLK_DOWN}, {224,SDLK_RIGHT} } }; { {224, SDLK_LEFT}, {224, SDLK_DOWN}, {224, SDLK_RIGHT} }
};
PanelKeyboard::PanelKeyboard(WORD reference) : Toolbar() { PanelKeyboard::PanelKeyboard(WORD reference) : Toolbar() {
setBackground(reference); setBackground(reference);
@ -62,10 +63,12 @@ bool PanelKeyboard::action(int x, int y, bool pushed) {
} else if (x >= 302 && x <= 316) { } else if (x >= 302 && x <= 316) {
if (y < _y + 20) { if (y < _y + 20) {
// Backspace // Backspace
keyAscii = VK_BACK; keyCode = keyAscii; keyAscii = VK_BACK;
keyCode = keyAscii;
} else { } else {
// Enter // Enter
keyAscii = 13; keyCode = 13; keyAscii = 13;
keyCode = 13;
} }
} }

3
backends/platform/wince/CEgui/ToolbarHandler.cpp
View file

@ -67,8 +67,7 @@ bool ToolbarHandler::action(int x, int y, bool pushed) {
return _active->action(x / 2, (y - _offset) / 2, pushed); return _active->action(x / 2, (y - _offset) / 2, pushed);
else else
return _active->action(x, y - _offset, pushed); return _active->action(x, y - _offset, pushed);
} } else
else
return false; return false;
} }

3
backends/platform/wince/missing/time.h
View file

@ -6,8 +6,7 @@
#include <stdlib.h> #include <stdlib.h>
#ifndef __MINGW32CE__ #ifndef __MINGW32CE__
struct tm struct tm {
{
short tm_year; short tm_year;
short tm_mon; short tm_mon;
short tm_mday; short tm_mday;

3
backends/platform/wince/wince-sdl.cpp
View file

@ -437,8 +437,7 @@ Common::String OSystem_WINCE3::getDefaultConfigFileName() {
OSystem_WINCE3::OSystem_WINCE3() : OSystem_SDL(), OSystem_WINCE3::OSystem_WINCE3() : OSystem_SDL(),
_forcePanelInvisible(false) _forcePanelInvisible(false) {
{
// Initialze File System Factory // Initialze File System Factory
_fsFactory = new WindowsFilesystemFactory(); _fsFactory = new WindowsFilesystemFactory();
_mixer = 0; _mixer = 0;