|
@@ -1512,13 +1512,21 @@ void Window::setMouseGrab(bool grab)
|
|
{
|
|
{
|
|
mouseGrabbed = grab;
|
|
mouseGrabbed = grab;
|
|
if (window)
|
|
if (window)
|
|
|
|
+#if SDL_VERSION_ATLEAST(3, 0, 0)
|
|
|
|
+ SDL_SetWindowMouseGrab(window, (SDL_bool) grab);
|
|
|
|
+#else
|
|
SDL_SetWindowGrab(window, (SDL_bool) grab);
|
|
SDL_SetWindowGrab(window, (SDL_bool) grab);
|
|
|
|
+#endif
|
|
}
|
|
}
|
|
|
|
|
|
bool Window::isMouseGrabbed() const
|
|
bool Window::isMouseGrabbed() const
|
|
{
|
|
{
|
|
if (window)
|
|
if (window)
|
|
|
|
+#if SDL_VERSION_ATLEAST(3, 0, 0)
|
|
|
|
+ return SDL_GetWindowMouseGrab(window);
|
|
|
|
+#else
|
|
return SDL_GetWindowGrab(window) != SDL_FALSE;
|
|
return SDL_GetWindowGrab(window) != SDL_FALSE;
|
|
|
|
+#endif
|
|
else
|
|
else
|
|
return mouseGrabbed;
|
|
return mouseGrabbed;
|
|
}
|
|
}
|
|
@@ -1684,7 +1692,11 @@ int Window::showMessageBox(const MessageBoxData &data)
|
|
{
|
|
{
|
|
SDL_MessageBoxButtonData sdlbutton = {};
|
|
SDL_MessageBoxButtonData sdlbutton = {};
|
|
|
|
|
|
|
|
+#if SDL_VERSION_ATLEAST(3, 0, 0)
|
|
|
|
+ sdlbutton.buttonID = i;
|
|
|
|
+#else
|
|
sdlbutton.buttonid = i;
|
|
sdlbutton.buttonid = i;
|
|
|
|
+#endif
|
|
sdlbutton.text = data.buttons[i].c_str();
|
|
sdlbutton.text = data.buttons[i].c_str();
|
|
|
|
|
|
if (i == data.enterButtonIndex)
|
|
if (i == data.enterButtonIndex)
|