* Fixed and turned on edit_test

dev-ui
erihel 2013-03-29 16:13:37 +01:00
parent 06742cab16
commit 3569adb103
2 changed files with 24 additions and 24 deletions

View File

@ -16,26 +16,26 @@ else()
set(SYSTEM_CPP_MODULE "system_other.cpp")
endif()
#add_executable(edit_test
#${SRC_DIR}/app/system.cpp
#${SRC_DIR}/app/${SYSTEM_CPP_MODULE}
#${SRC_DIR}/common/event.cpp
#${SRC_DIR}/common/logger.cpp
#${SRC_DIR}/common/misc.cpp
#${SRC_DIR}/common/profile.cpp
#${SRC_DIR}/common/iman.cpp
#${SRC_DIR}/common/stringutils.cpp
#${SRC_DIR}/graphics/engine/text.cpp
#${SRC_DIR}/ui/button.cpp
#${SRC_DIR}/ui/control.cpp
#${SRC_DIR}/ui/edit.cpp
#${SRC_DIR}/ui/scroll.cpp
#stubs/app_stub.cpp
#stubs/engine_stub.cpp
#stubs/particle_stub.cpp
#stubs/restext_stub.cpp
#stubs/robotmain_stub.cpp
#edit_test.cpp)
#target_link_libraries(edit_test gtest gmock ${SDL_LIBRARY} ${SDLTTF_LIBRARY} ${Boost_LIBRARIES})
#
#add_test(edit_test ./edit_test)
add_executable(edit_test
${SRC_DIR}/app/system.cpp
${SRC_DIR}/app/${SYSTEM_CPP_MODULE}
${SRC_DIR}/common/event.cpp
${SRC_DIR}/common/logger.cpp
${SRC_DIR}/common/misc.cpp
${SRC_DIR}/common/profile.cpp
${SRC_DIR}/common/iman.cpp
${SRC_DIR}/common/stringutils.cpp
${SRC_DIR}/graphics/engine/text.cpp
${SRC_DIR}/ui/button.cpp
${SRC_DIR}/ui/control.cpp
${SRC_DIR}/ui/edit.cpp
${SRC_DIR}/ui/scroll.cpp
stubs/app_stub.cpp
stubs/engine_stub.cpp
stubs/particle_stub.cpp
stubs/restext_stub.cpp
stubs/robotmain_stub.cpp
edit_test.cpp)
target_link_libraries(edit_test gtest gmock ${SDL_LIBRARY} ${SDLTTF_LIBRARY} ${Boost_LIBRARIES})
add_test(edit_test ./edit_test)

View File

@ -46,7 +46,7 @@ Event CApplication::CreateUpdateEvent()
return Event(EVENT_NULL);
}
char GetLanguageChar()
char CApplication::GetLanguageChar()
{
return 'E';
}