diff options
| author | Alexander Sulfrian <alexander@sulfrian.net> | 2011-11-08 10:26:04 +0100 |
|---|---|---|
| committer | Alexander Sulfrian <alexander@sulfrian.net> | 2013-01-05 17:17:49 +0100 |
| commit | c1c799117e7076046182e12d71d06e2c9444e9be (patch) | |
| tree | 7940de26d0c786134fa103703320bd3efcbba00c /src/menu | |
| parent | 31ba94d4efa6e3f64ffacf1711438e88d8b3035d (diff) | |
| download | usdx-c1c799117e7076046182e12d71d06e2c9444e9be.tar.gz usdx-c1c799117e7076046182e12d71d06e2c9444e9be.tar.xz usdx-c1c799117e7076046182e12d71d06e2c9444e9be.zip | |
changed all wstring/wchar_t to string/char
Diffstat (limited to 'src/menu')
| -rw-r--r-- | src/menu/application.cpp | 4 | ||||
| -rw-r--r-- | src/menu/event_manager.cpp | 2 | ||||
| -rw-r--r-- | src/menu/software_mouse_pointer.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/menu/application.cpp b/src/menu/application.cpp index 089388c0..37e532a2 100644 --- a/src/menu/application.cpp +++ b/src/menu/application.cpp @@ -119,7 +119,7 @@ namespace usdx repaint(); SDL_GL_SwapBuffers(); - LOG4CXX_TRACE(log, L"repaint"); + LOG4CXX_TRACE(log, "repaint"); // poll current events while (event_manager.available() && SDL_PollEvent(&event)) { @@ -185,7 +185,7 @@ namespace usdx } if (! display) { - LOG4CXX_ERROR(log, L"SDL_SetVideoMode failed."); + LOG4CXX_ERROR(log, "SDL_SetVideoMode failed."); throw new std::exception(); } diff --git a/src/menu/event_manager.cpp b/src/menu/event_manager.cpp index 6d607e6d..8f09f202 100644 --- a/src/menu/event_manager.cpp +++ b/src/menu/event_manager.cpp @@ -100,7 +100,7 @@ namespace usdx switch (event.type) { case SDL_KEYDOWN: - LOG4CXX_ERROR(log, L"key"); + LOG4CXX_ERROR(log, "key"); break; case SDL_MOUSEMOTION: diff --git a/src/menu/software_mouse_pointer.cpp b/src/menu/software_mouse_pointer.cpp index 1723ce9b..c0787e05 100644 --- a/src/menu/software_mouse_pointer.cpp +++ b/src/menu/software_mouse_pointer.cpp @@ -72,8 +72,8 @@ namespace usdx this->texture[6] = 0.0f; this->texture[7] = 0.0f; - texture_normal = new Texture(L"game/themes/Deluxe/interface/cursor.png"); - texture_pressed = new Texture(L"game/themes/Deluxe/interface/cursor_pressed.png"); + texture_normal = new Texture("game/themes/Deluxe/interface/cursor.png"); + texture_pressed = new Texture("game/themes/Deluxe/interface/cursor_pressed.png"); mouse_move_connection = event_manager->mouse_move.connect( boost::bind(&SoftwareMousePointer::on_mouse_move, this, _1, _2)); |