admin/CSFML
1
0 Fork 0
mirror of https://github.com/SFML/CSFML.git synced 2026-10-28 21:56:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Replaced unsigned long with sfUint32 in the public API

Browse Source
This commit is contained in:
Laurent Gomila committed 2011-11-20 13:51:28 +01:00
1 parent 1fb3612287
commit 37327577a8
6 files changed
+8 -8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

include/SFML/Graphics/RenderWindow.h
+1 -1
View File
@@ -47,7 +47,7 @@
/// \param settings : Creation settings (pass NULL to use default values) /// \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 /// Construct a renderwindow from an existing control
include/SFML/Graphics/Text.h
+2 -2
View File
@@ -356,7 +356,7 @@ CSFML_API void sfText_SetCharacterSize(sfText* text, unsigned int size);
/// \param style : New style (see sfTextStyle enum) /// \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) /// 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) /// \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, /// Return the visual position of the Index-th character of the text,
include/SFML/Window/Window.h
+1 -1
View File
@@ -85,7 +85,7 @@ typedef struct
/// \return A new sfWindow object /// \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 /// \brief Construct a window from an existing control
src/SFML/Graphics/RenderWindow.cpp
+1 -1
View File
@@ -39,7 +39,7 @@
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// Construct a new renderwindow /// 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 // Convert video mode
sf::VideoMode videoMode(mode.Width, mode.Height, mode.BitsPerPixel); sf::VideoMode videoMode(mode.Width, mode.Height, mode.BitsPerPixel);
src/SFML/Graphics/Text.cpp
+2 -2
View File
@@ -340,7 +340,7 @@ void sfText_SetCharacterSize(sfText* text, unsigned int size)
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// Set the style of a string /// 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)) CSFML_CALL(text, SetStyle(style))
} }
@@ -393,7 +393,7 @@ unsigned int sfText_GetCharacterSize(const sfText* text)
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// Get the style of a 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) CSFML_CALL_RETURN(text, GetStyle(), 0)
} }
src/SFML/Window/Window.cpp
+1 -1
View File
@@ -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 // Convert video mode
sf::VideoMode videoMode(mode.Width, mode.Height, mode.BitsPerPixel); sf::VideoMode videoMode(mode.Width, mode.Height, mode.BitsPerPixel);