From d28ebff56e669b04b2591f3e5b19f054d5fd955e Mon Sep 17 00:00:00 2001 From: tjw Date: Tue, 22 May 2007 03:46:11 +0000 Subject: * updated the included libSDL header files and Mac OS X lib to SDL 1.2.11 git-svn-id: svn://svn.icculus.org/quake3/trunk@1089 edf5b092-35ff-0310-97b2-ce42778d08ea --- code/SDL12/include/SDL_mouse.h | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) (limited to 'code/SDL12/include/SDL_mouse.h') diff --git a/code/SDL12/include/SDL_mouse.h b/code/SDL12/include/SDL_mouse.h index e250293..c2364d8 100644 --- a/code/SDL12/include/SDL_mouse.h +++ b/code/SDL12/include/SDL_mouse.h @@ -1,36 +1,32 @@ /* SDL - Simple DirectMedia Layer - Copyright (C) 1997-2004 Sam Lantinga + Copyright (C) 1997-2006 Sam Lantinga This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public + modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. + version 2.1 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. + Lesser General Public License for more details. - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the Free - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Sam Lantinga slouken@libsdl.org */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id: SDL_mouse.h,v 1.9 2005/04/17 10:16:30 icculus Exp $"; -#endif - /* Include file for SDL mouse event handling */ #ifndef _SDL_mouse_h #define _SDL_mouse_h -#include "SDL_types.h" +#include "SDL_stdinc.h" +#include "SDL_error.h" #include "SDL_video.h" #include "begin_code.h" @@ -120,7 +116,7 @@ extern DECLSPEC int SDLCALL SDL_ShowCursor(int toggle); Button 4: Mouse wheel up (may also be a real button) Button 5: Mouse wheel down (may also be a real button) */ -#define SDL_BUTTON(X) (SDL_PRESSED << ((X)-1)) +#define SDL_BUTTON(X) (1 << ((X)-1)) #define SDL_BUTTON_LEFT 1 #define SDL_BUTTON_MIDDLE 2 #define SDL_BUTTON_RIGHT 3 -- cgit v1.2.3