lauchmelder/SFML
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replaced unsigned long with Uint32 in the public API (avoids size problems with bindings)

Browse source
This commit is contained in:
Laurent Gomila 2011-11-20 13:50:11 +01:00
parent 017ef652f9
commit a5d40de8a2
16 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/SFML/Audio/SoundStream.hpp
View file

@ -284,7 +284,7 @@ private :
unsigned int myBuffers[BuffersCount]; ///< Sound buffers used to store temporary audio data
unsigned int myChannelsCount; ///< Number of channels (1 = mono, 2 = stereo, ...)
unsigned int mySampleRate; ///< Frequency (samples / second)
unsigned long myFormat; ///< Format of the internal sound buffers
Uint32 myFormat; ///< Format of the internal sound buffers
bool myLoop; ///< Loop flag (true to loop, false to play once)
Uint64 mySamplesProcessed; ///< Number of buffers processed since beginning of the stream
bool myEndBuffers[BuffersCount]; ///< Each buffer is marked as "end buffer" or not, for proper duration calculation

2
include/SFML/Graphics/RenderWindow.hpp
View file

@ -72,7 +72,7 @@ public :
/// \param settings Additional settings for the underlying OpenGL context
///
////////////////////////////////////////////////////////////
RenderWindow(VideoMode mode, const std::string& title, unsigned long style = Style::Default, const ContextSettings& settings = ContextSettings());
RenderWindow(VideoMode mode, const std::string& title, Uint32 style = Style::Default, const ContextSettings& settings = ContextSettings());
////////////////////////////////////////////////////////////
/// \brief Construct the window from an existing control

6
include/SFML/Graphics/Text.hpp
View file

@ -133,7 +133,7 @@ public :
/// \see GetStyle
///
////////////////////////////////////////////////////////////
void SetStyle(unsigned long style);
void SetStyle(Uint32 style);
////////////////////////////////////////////////////////////
/// \brief Get the text's string
@ -185,7 +185,7 @@ public :
/// \see SetStyle
///
////////////////////////////////////////////////////////////
unsigned long GetStyle() const;
Uint32 GetStyle() const;
////////////////////////////////////////////////////////////
/// \brief Return the position of the \a index-th character
@ -240,7 +240,7 @@ private :
String myString; ///< String to display
const Font* myFont; ///< Font used to display the string
unsigned int myCharacterSize; ///< Base size of characters, in pixels
unsigned long myStyle; ///< Text style (see Style enum)
Uint32 myStyle; ///< Text style (see Style enum)
mutable FloatRect myBaseRect; ///< Bounding rectangle of the text in object coordinates
mutable bool myRectUpdated; ///< Is the bounding rectangle up-to-date ?
};

4
include/SFML/Window/Window.hpp
View file

@ -85,7 +85,7 @@ public :
/// \param settings Additional settings for the underlying OpenGL context
///
////////////////////////////////////////////////////////////
Window(VideoMode mode, const std::string& title, unsigned long style = Style::Default, const ContextSettings& settings = ContextSettings());
Window(VideoMode mode, const std::string& title, Uint32 style = Style::Default, const ContextSettings& settings = ContextSettings());
////////////////////////////////////////////////////////////
/// \brief Construct the window from an existing control
@ -124,7 +124,7 @@ public :
/// \param settings Additional settings for the underlying OpenGL context
///
////////////////////////////////////////////////////////////
void Create(VideoMode mode, const std::string& title, unsigned long style = Style::Default, const ContextSettings& settings = ContextSettings());
void Create(VideoMode mode, const std::string& title, Uint32 style = Style::Default, const ContextSettings& settings = ContextSettings());
////////////////////////////////////////////////////////////
/// \brief Create (or recreate) the window from an existing control