Merge branch 'master' of github.com:LaurentGomila/SFML

This commit is contained in:
Laurent Gomila 2013-11-30 22:37:02 +01:00
commit 58f60f2279

View File

@ -103,7 +103,7 @@ m_useSizeHints(false)
if (m_window) if (m_window)
{ {
// Make sure the window is listening to all the requiered events // Make sure the window is listening to all the required events
XSelectInput(m_display, m_window, eventMask & ~ButtonPressMask); XSelectInput(m_display, m_window, eventMask & ~ButtonPressMask);
// Do some common initializations // Do some common initializations
@ -557,7 +557,7 @@ void WindowImplX11::initialize()
XMapWindow(m_display, m_window); XMapWindow(m_display, m_window);
XFlush(m_display); XFlush(m_display);
// Create the hiden cursor // Create the hidden cursor
createHiddenCursor(); createHiddenCursor();
// Flush the commands queue // Flush the commands queue
@ -693,7 +693,7 @@ bool WindowImplX11::processEvent(XEvent windowEvent)
// Resize event // Resize event
case ConfigureNotify : case ConfigureNotify :
{ {
// ConfigureNotify can be triggered for other reasons, check if the size has acutally changed // ConfigureNotify can be triggered for other reasons, check if the size has actually changed
if ((windowEvent.xconfigure.width != m_previousSize.x) || (windowEvent.xconfigure.height != m_previousSize.y)) if ((windowEvent.xconfigure.width != m_previousSize.x) || (windowEvent.xconfigure.height != m_previousSize.y))
{ {
Event event; Event event;