Compile CSFML with SFML 3.0

include/SFML/Window/Clipboard.h

@@ -55,7 +55,7 @@ CSFML_WINDOW_API const char* sfClipboard_getString(void);
 /// \return Clipboard contents as UTF-32
 ///
 ////////////////////////////////////////////////////////////
-CSFML_WINDOW_API const uint32_t* sfClipboard_getUnicodeString(void);
+CSFML_WINDOW_API const sfChar32* sfClipboard_getUnicodeString(void);
 
 ////////////////////////////////////////////////////////////
 /// \brief Set the content of the clipboard as ANSI string data
@@ -79,7 +79,6 @@ CSFML_WINDOW_API void sfClipboard_setString(const char* text);
 /// to the clipboard
 ///
 ////////////////////////////////////////////////////////////
-CSFML_WINDOW_API void sfClipboard_setUnicodeString(const uint32_t* text);
-
+CSFML_WINDOW_API void sfClipboard_setUnicodeString(const sfChar32* text);
 
 #endif // SFML_CURSOR_H

include/SFML/Window/Window.h

@@ -81,12 +81,13 @@ typedef struct
 /// \param mode     Video mode to use (defines the width, height and depth of the rendering area of the window)
 /// \param title    Title of the window
 /// \param style    Window style
+/// \param state    Window state
 /// \param settings Additional settings for the underlying OpenGL context
 ///
 /// \return A new sfWindow object
 ///
 ////////////////////////////////////////////////////////////
-CSFML_WINDOW_API sfWindow* sfWindow_create(sfVideoMode mode, const char* title, uint32_t style, const sfContextSettings* settings);
+CSFML_WINDOW_API sfWindow* sfWindow_create(sfVideoMode mode, const char* title, uint32_t style, sfWindowState state, const sfContextSettings* settings);
 
 ////////////////////////////////////////////////////////////
 /// \brief Construct a new window (with a UTF-32 title)
@@ -104,12 +105,13 @@ CSFML_WINDOW_API sfWindow* sfWindow_create(sfVideoMode mode, const char* title,
 /// \param mode     Video mode to use (defines the width, height and depth of the rendering area of the window)
 /// \param title    Title of the window (UTF-32)
 /// \param style    Window style
+/// \param state    Window state
 /// \param settings Additional settings for the underlying OpenGL context
 ///
 /// \return A new sfWindow object
 ///
 ////////////////////////////////////////////////////////////
-CSFML_WINDOW_API sfWindow* sfWindow_createUnicode(sfVideoMode mode, const uint32_t* title, uint32_t style, const sfContextSettings* settings);
+CSFML_WINDOW_API sfWindow* sfWindow_createUnicode(sfVideoMode mode, const sfChar32* title, uint32_t style, sfWindowState state, const sfContextSettings* settings);
 
 ////////////////////////////////////////////////////////////
 /// \brief Construct a window from an existing control
@@ -277,7 +279,7 @@ CSFML_WINDOW_API void sfWindow_setTitle(sfWindow* window, const char* title);
 /// \param title  New title
 ///
 ////////////////////////////////////////////////////////////
-CSFML_WINDOW_API void sfWindow_setUnicodeTitle(sfWindow* window, const uint32_t* title);
+CSFML_WINDOW_API void sfWindow_setUnicodeTitle(sfWindow* window, const sfChar32* title);
 
 ////////////////////////////////////////////////////////////
 /// \brief Change a window's icon
@@ -472,7 +474,7 @@ CSFML_WINDOW_API void sfWindow_display(sfWindow* window);
 /// \return System handle of the window
 ///
 ////////////////////////////////////////////////////////////
-CSFML_WINDOW_API sfWindowHandle sfWindow_getSystemHandle(const sfWindow* window);
+CSFML_WINDOW_API sfWindowHandle sfWindow_getNativeHandle(const sfWindow* window);
 
 
 #endif // SFML_WINDOW_H

include/SFML/Window/WindowBase.h

@@ -47,11 +47,22 @@ typedef enum
     sfTitlebar     = 1 << 0, ///< Title bar + fixed border
     sfResize       = 1 << 1, ///< Titlebar + resizable border + maximize button
     sfClose        = 1 << 2, ///< Titlebar + close button
-    sfFullscreen   = 1 << 3, ///< Fullscreen mode (this flag and all others are mutually exclusive)
+
     sfDefaultStyle = sfTitlebar | sfResize | sfClose ///< Default window style
 } sfWindowStyle;
 
 
+////////////////////////////////////////////////////////////
+/// \brief Enumeration of the window states
+///
+////////////////////////////////////////////////////////////
+typedef enum
+{
+    sfWindowed,  //!< Floating window
+    sfFullscreen //!< Fullscreen window
+} sfWindowState;
+
+
 ////////////////////////////////////////////////////////////
 /// \brief Construct a new window
 ///
@@ -86,7 +97,7 @@ CSFML_WINDOW_API sfWindowBase* sfWindowBase_create(sfVideoMode mode, const char*
 /// \return A new sfWindow object
 ///
 ////////////////////////////////////////////////////////////
-CSFML_WINDOW_API sfWindowBase* sfWindowBase_createUnicode(sfVideoMode mode, const uint32_t* title, uint32_t style);
+CSFML_WINDOW_API sfWindowBase* sfWindowBase_createUnicode(sfVideoMode mode, const sfChar32* title, uint32_t style);
 
 ////////////////////////////////////////////////////////////
 /// \brief Construct a window from an existing control
@@ -231,7 +242,7 @@ CSFML_WINDOW_API void sfWindowBase_setTitle(sfWindowBase* windowBase, const char
 /// \param title      New title
 ///
 ////////////////////////////////////////////////////////////
-CSFML_WINDOW_API void sfWindowBase_setUnicodeTitle(sfWindowBase* windowBase, const uint32_t* title);
+CSFML_WINDOW_API void sfWindowBase_setUnicodeTitle(sfWindowBase* windowBase, const sfChar32* title);
 
 ////////////////////////////////////////////////////////////
 /// \brief Change a window's icon
@@ -366,7 +377,7 @@ CSFML_WINDOW_API bool sfWindowBase_hasFocus(const sfWindowBase* windowBase);
 /// \return System handle of the window
 ///
 ////////////////////////////////////////////////////////////
-CSFML_WINDOW_API sfWindowHandle sfWindowBase_getSystemHandle(const sfWindowBase* windowBase);
+CSFML_WINDOW_API sfWindowHandle sfWindowBase_getNativeHandle(const sfWindowBase* windowBase);
 
 ////////////////////////////////////////////////////////////
 /// \brief Create a Vulkan rendering surface