Renamed SDL_GetWindowDisplay() to SDL_GetWindowDisplayIndex()
authorSam Lantinga <slouken@libsdl.org>
Mon, 31 Dec 2012 10:29:17 -0800
changeset 67867174fb08017a
parent 6785 c094c438c0a6
child 6787 95a4c5a5464c
Renamed SDL_GetWindowDisplay() to SDL_GetWindowDisplayIndex()
include/SDL_video.h
src/video/SDL_video.c
test/testwm2.c
     1.1 --- a/include/SDL_video.h	Mon Dec 31 10:26:38 2012 -0800
     1.2 +++ b/include/SDL_video.h	Mon Dec 31 10:29:17 2012 -0800
     1.3 @@ -339,7 +339,7 @@
     1.4   *  \return the display index of the display containing the center of the
     1.5   *          window, or -1 on error.
     1.6   */
     1.7 -extern DECLSPEC int SDLCALL SDL_GetWindowDisplay(SDL_Window * window);
     1.8 +extern DECLSPEC int SDLCALL SDL_GetWindowDisplayIndex(SDL_Window * window);
     1.9  
    1.10  /**
    1.11   *  \brief Set the display mode used when a fullscreen window is visible.
     2.1 --- a/src/video/SDL_video.c	Mon Dec 31 10:26:38 2012 -0800
     2.2 +++ b/src/video/SDL_video.c	Mon Dec 31 10:29:17 2012 -0800
     2.3 @@ -914,7 +914,7 @@
     2.4  }
     2.5  
     2.6  int
     2.7 -SDL_GetWindowDisplay(SDL_Window * window)
     2.8 +SDL_GetWindowDisplayIndex(SDL_Window * window)
     2.9  {
    2.10      int displayIndex;
    2.11      int i, dist;
    2.12 @@ -976,7 +976,7 @@
    2.13  SDL_VideoDisplay *
    2.14  SDL_GetDisplayForWindow(SDL_Window *window)
    2.15  {
    2.16 -    int displayIndex = SDL_GetWindowDisplay(window);
    2.17 +    int displayIndex = SDL_GetWindowDisplayIndex(window);
    2.18      if (displayIndex >= 0) {
    2.19          return &_this->displays[displayIndex];
    2.20      } else {
     3.1 --- a/test/testwm2.c	Mon Dec 31 10:26:38 2012 -0800
     3.2 +++ b/test/testwm2.c	Mon Dec 31 10:29:17 2012 -0800
     3.3 @@ -87,7 +87,7 @@
     3.4                              event.window.windowID,
     3.5                              event.window.data1,
     3.6                              event.window.data2,
     3.7 -                            SDL_GetWindowDisplay(window));
     3.8 +                            SDL_GetWindowDisplayIndex(window));
     3.9                      }
    3.10                  }
    3.11              }