pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Renamed SDL_GetWindowDisplay() to SDL_GetWindowDisplayIndex()

Browse source
This commit is contained in:
Sam Lantinga 2012-12-31 10:29:17 -08:00
parent ac0f89315c
commit 5e519b21ed
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/SDL_video.h
View file

@ -339,7 +339,7 @@ extern DECLSPEC SDL_DisplayMode * SDLCALL SDL_GetClosestDisplayMode(int displayI
* \return the display index of the display containing the center of the * \return the display index of the display containing the center of the
* window, or -1 on error. * window, or -1 on error.
*/ */
extern DECLSPEC int SDLCALL SDL_GetWindowDisplay(SDL_Window * window); extern DECLSPEC int SDLCALL SDL_GetWindowDisplayIndex(SDL_Window * window);
/** /**
* \brief Set the display mode used when a fullscreen window is visible. * \brief Set the display mode used when a fullscreen window is visible.

4
src/video/SDL_video.c
View file

@ -914,7 +914,7 @@ SDL_SetDisplayModeForDisplay(SDL_VideoDisplay * display, const SDL_DisplayMode *
} }
int int
SDL_GetWindowDisplay(SDL_Window * window) SDL_GetWindowDisplayIndex(SDL_Window * window)
{ {
int displayIndex; int displayIndex;
int i, dist; int i, dist;
@ -976,7 +976,7 @@ SDL_GetWindowDisplay(SDL_Window * window)
SDL_VideoDisplay * SDL_VideoDisplay *
SDL_GetDisplayForWindow(SDL_Window *window) SDL_GetDisplayForWindow(SDL_Window *window)
{ {
int displayIndex = SDL_GetWindowDisplay(window); int displayIndex = SDL_GetWindowDisplayIndex(window);
if (displayIndex >= 0) { if (displayIndex >= 0) {
return &_this->displays[displayIndex]; return &_this->displays[displayIndex];
} else { } else {

2
test/testwm2.c
View file

@ -87,7 +87,7 @@ main(int argc, char *argv[])
event.window.windowID, event.window.windowID,
event.window.data1, event.window.data1,
event.window.data2, event.window.data2,
SDL_GetWindowDisplay(window)); SDL_GetWindowDisplayIndex(window));
} }
} }
} }