mirrors/SFML
1
0
Fork 0
mirror of https://github.com/SFML/SFML.git synced 2024-11-25 12:51:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

[Android] Fixed WindowHandle and getSystemHandle()

Browse Source
This commit is contained in:
Jonathan De Wachter 2013-10-26 14:02:23 +02:00
parent 77567e9656
commit 4626e95491
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/SFML/Window/WindowHandle.hpp
View File

@ -63,7 +63,7 @@ namespace sf
#elif defined(SFML_SYSTEM_ANDROID) #elif defined(SFML_SYSTEM_ANDROID)
// Window handle doesn't exist on Android // Window handle is ANativeWindow (void*) on Android
typedef void* WindowHandle; typedef void* WindowHandle;
#endif #endif

5
src/SFML/Window/Android/WindowImplAndroid.cpp
View File

@ -61,7 +61,10 @@ WindowImplAndroid::~WindowImplAndroid()
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
WindowHandle WindowImplAndroid::getSystemHandle() const WindowHandle WindowImplAndroid::getSystemHandle() const
{ {
return NULL; ActivityStates* states = getActivity(NULL);
sf::Lock lock(states->mutex);
return states->window;
} }

4
src/SFML/Window/Window.cpp
View File

@ -30,10 +30,6 @@
#include <SFML/Window/WindowImpl.hpp> #include <SFML/Window/WindowImpl.hpp>
#include <SFML/System/Sleep.hpp> #include <SFML/System/Sleep.hpp>
#include <SFML/System/Err.hpp> #include <SFML/System/Err.hpp>
#ifdef SFML_SYSTEM_ANDROID
#include <SFML/Window/Android/WindowImplAndroid.hpp>
#include <SFML/Window/Android/EglContext.hpp>
#endif
namespace namespace