diff --git a/include/SFML/Graphics/RenderWindow.h b/include/SFML/Graphics/RenderWindow.h index 6564a09..610da61 100644 --- a/include/SFML/Graphics/RenderWindow.h +++ b/include/SFML/Graphics/RenderWindow.h @@ -47,7 +47,7 @@ /// \param settings : Creation settings (pass NULL to use default values) /// //////////////////////////////////////////////////////////// -CSFML_API sfRenderWindow* sfRenderWindow_Create(sfVideoMode mode, const char* title, unsigned long style, const sfContextSettings* settings); +CSFML_API sfRenderWindow* sfRenderWindow_Create(sfVideoMode mode, const char* title, sfUint32 style, const sfContextSettings* settings); //////////////////////////////////////////////////////////// /// Construct a renderwindow from an existing control diff --git a/include/SFML/Graphics/Text.h b/include/SFML/Graphics/Text.h index 56b762c..bd295a0 100644 --- a/include/SFML/Graphics/Text.h +++ b/include/SFML/Graphics/Text.h @@ -356,7 +356,7 @@ CSFML_API void sfText_SetCharacterSize(sfText* text, unsigned int size); /// \param style : New style (see sfTextStyle enum) /// //////////////////////////////////////////////////////////// -CSFML_API void sfText_SetStyle(sfText* text, unsigned long style); +CSFML_API void sfText_SetStyle(sfText* text, sfUint32 style); //////////////////////////////////////////////////////////// /// Get the string of a text (returns a unicode string) @@ -406,7 +406,7 @@ CSFML_API unsigned int sfText_GetCharacterSize(const sfText* text); /// \return Current string style (see sfTextStyle enum) /// //////////////////////////////////////////////////////////// -CSFML_API unsigned long sfText_GetStyle(const sfText* text); +CSFML_API sfUint32 sfText_GetStyle(const sfText* text); //////////////////////////////////////////////////////////// /// Return the visual position of the Index-th character of the text, diff --git a/include/SFML/Window/Window.h b/include/SFML/Window/Window.h index ecc2d36..3495f9f 100644 --- a/include/SFML/Window/Window.h +++ b/include/SFML/Window/Window.h @@ -85,7 +85,7 @@ typedef struct /// \return A new sfWindow object /// //////////////////////////////////////////////////////////// -CSFML_API sfWindow* sfWindow_Create(sfVideoMode mode, const char* title, unsigned long style, const sfContextSettings* settings); +CSFML_API sfWindow* sfWindow_Create(sfVideoMode mode, const char* title, sfUint32 style, const sfContextSettings* settings); //////////////////////////////////////////////////////////// /// \brief Construct a window from an existing control diff --git a/src/SFML/Graphics/RenderWindow.cpp b/src/SFML/Graphics/RenderWindow.cpp index 8c5b631..4f3ab11 100644 --- a/src/SFML/Graphics/RenderWindow.cpp +++ b/src/SFML/Graphics/RenderWindow.cpp @@ -39,7 +39,7 @@ //////////////////////////////////////////////////////////// /// Construct a new renderwindow //////////////////////////////////////////////////////////// -sfRenderWindow* sfRenderWindow_Create(sfVideoMode mode, const char* title, unsigned long style, const sfContextSettings* settings) +sfRenderWindow* sfRenderWindow_Create(sfVideoMode mode, const char* title, sfUint32 style, const sfContextSettings* settings) { // Convert video mode sf::VideoMode videoMode(mode.Width, mode.Height, mode.BitsPerPixel); diff --git a/src/SFML/Graphics/Text.cpp b/src/SFML/Graphics/Text.cpp index 9738482..eb6e7ef 100644 --- a/src/SFML/Graphics/Text.cpp +++ b/src/SFML/Graphics/Text.cpp @@ -340,7 +340,7 @@ void sfText_SetCharacterSize(sfText* text, unsigned int size) //////////////////////////////////////////////////////////// /// Set the style of a string //////////////////////////////////////////////////////////// -void sfText_SetStyle(sfText* text, unsigned long style) +void sfText_SetStyle(sfText* text, sfUint32 style) { CSFML_CALL(text, SetStyle(style)) } @@ -393,7 +393,7 @@ unsigned int sfText_GetCharacterSize(const sfText* text) //////////////////////////////////////////////////////////// /// Get the style of a text //////////////////////////////////////////////////////////// -unsigned long sfText_GetStyle(const sfText* text) +sfUint32 sfText_GetStyle(const sfText* text) { CSFML_CALL_RETURN(text, GetStyle(), 0) } diff --git a/src/SFML/Window/Window.cpp b/src/SFML/Window/Window.cpp index ec028d9..30f3696 100644 --- a/src/SFML/Window/Window.cpp +++ b/src/SFML/Window/Window.cpp @@ -32,7 +32,7 @@ //////////////////////////////////////////////////////////// -sfWindow* sfWindow_Create(sfVideoMode mode, const char* title, unsigned long style, const sfContextSettings* settings) +sfWindow* sfWindow_Create(sfVideoMode mode, const char* title, sfUint32 style, const sfContextSettings* settings) { // Convert video mode sf::VideoMode videoMode(mode.Width, mode.Height, mode.BitsPerPixel);