summaryrefslogtreecommitdiff
path: root/include/SFML/Window/WindowHandle.hpp
diff options
context:
space:
mode:
Diffstat (limited to 'include/SFML/Window/WindowHandle.hpp')
-rw-r--r--include/SFML/Window/WindowHandle.hpp41
1 files changed, 34 insertions, 7 deletions
diff --git a/include/SFML/Window/WindowHandle.hpp b/include/SFML/Window/WindowHandle.hpp
index 9da3042..c8b0149 100644
--- a/include/SFML/Window/WindowHandle.hpp
+++ b/include/SFML/Window/WindowHandle.hpp
@@ -1,7 +1,7 @@
////////////////////////////////////////////////////////////
//
// SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2015 Laurent Gomila (laurent@sfml-dev.org)
+// Copyright (C) 2007-2016 Laurent Gomila (laurent@sfml-dev.org)
//
// This software is provided 'as-is', without any express or implied warranty.
// In no event will the authors be held liable for any damages arising from the use of this software.
@@ -37,10 +37,6 @@
namespace sf
{
-////////////////////////////////////////////////////////////
-/// Define a low-level window handle type, specific to
-/// each platform
-////////////////////////////////////////////////////////////
#if defined(SFML_SYSTEM_WINDOWS)
// Window handle is HWND (HWND__*) on Windows
@@ -53,7 +49,7 @@ namespace sf
#elif defined(SFML_SYSTEM_MACOS)
- // Window handle is NSWindow (void*) on Mac OS X - Cocoa
+ // Window handle is NSWindow or NSView (void*) on Mac OS X - Cocoa
typedef void* WindowHandle;
#elif defined(SFML_SYSTEM_IOS)
@@ -63,12 +59,43 @@ namespace sf
#elif defined(SFML_SYSTEM_ANDROID)
- // Window handle is ANativeWindow (void*) on Android
+ // Window handle is ANativeWindow* (void*) on Android
typedef void* WindowHandle;
+#elif defined(SFML_DOXYGEN)
+
+ // Define typedef symbol so that Doxygen can attach some documentation to it
+ typedef "platform–specific" WindowHandle;
+
#endif
} // namespace sf
#endif // SFML_WINDOWHANDLE_HPP
+
+////////////////////////////////////////////////////////////
+/// \typedef sf::WindowHandle
+/// \ingroup window
+///
+/// Define a low-level window handle type, specific to
+/// each platform.
+///
+/// Platform | Type
+/// ----------------|------------------------------------------------------------
+/// Windows | \p HWND
+/// Linux/FreeBSD | \p %Window
+/// Mac OS X | either \p NSWindow* or \p NSView*, disguised as \p void*
+/// iOS | \p UIWindow*
+/// Android | \p ANativeWindow*
+///
+/// \par Mac OS X Specification
+///
+/// On Mac OS X, a sf::Window can be created either from an
+/// existing \p NSWindow* or an \p NSView*. When the window
+/// is created from a window, SFML will use its content view
+/// as the OpenGL area. sf::Window::getSystemHandle() will
+/// return the handle that was used to create the window,
+/// which is a \p NSWindow* by default.
+///
+////////////////////////////////////////////////////////////