From: Nigel Stewart Date: Tue, 16 Mar 2004 00:17:11 +0000 (+0000) Subject: Whitespace conversion - tabs to 4 spaces X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=commitdiff_plain;h=bc0d27e8c973c916fc87fa752e60a9de7d54b55b;p=freeglut Whitespace conversion - tabs to 4 spaces git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@487 7f0cb862-5218-0410-a997-914c9d46530a --- diff --git a/src/freeglut_init.c b/src/freeglut_init.c index 2e18660..6b69f9b 100644 --- a/src/freeglut_init.c +++ b/src/freeglut_init.c @@ -173,11 +173,11 @@ void fgInitialize( const char* displayName ) wc.hIcon = LoadIcon( fgDisplay.Instance, _T("GLUT_ICON") ); #if TARGET_HOST_WIN32 - wc.style = CS_OWNDC | CS_HREDRAW | CS_VREDRAW; + wc.style = CS_OWNDC | CS_HREDRAW | CS_VREDRAW; if (!wc.hIcon) wc.hIcon = LoadIcon( NULL, IDI_WINLOGO ); #else //TARGET_HOST_WINCE - wc.style = CS_HREDRAW | CS_VREDRAW; + wc.style = CS_HREDRAW | CS_VREDRAW; #endif wc.hCursor = LoadCursor( NULL, IDC_ARROW ); diff --git a/src/freeglut_main.c b/src/freeglut_main.c index 3e3a344..b1d7165 100644 --- a/src/freeglut_main.c +++ b/src/freeglut_main.c @@ -1285,8 +1285,8 @@ LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, ReleaseDC( window->Window.Handle, window->Window.Device ); #if TARGET_HOST_WINCE - // Take over button handling - wince_OpenInput(); + // Take over button handling + wince_OpenInput(); #endif //TARGET_HOST_WINCE break; @@ -1708,27 +1708,27 @@ LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, } #if TARGET_HOST_WINCE - if(!(lParam & 0x40000000)) // Prevent auto-repeat - { - wince_GetDefaultKeys(&gxKeyList, 0x03); - - if(wParam==(unsigned)gxKeyList.vkRight) - keypress = GLUT_KEY_RIGHT; - else if(wParam==(unsigned)gxKeyList.vkLeft) - keypress = GLUT_KEY_LEFT; - else if(wParam==(unsigned)gxKeyList.vkUp) - keypress = GLUT_KEY_UP; - else if(wParam==(unsigned)gxKeyList.vkDown) - keypress = GLUT_KEY_DOWN; - else if(wParam==(unsigned)gxKeyList.vkA) - keypress = GLUT_KEY_F1; - else if(wParam==(unsigned)gxKeyList.vkB) - keypress = GLUT_KEY_F2; - else if(wParam==(unsigned)gxKeyList.vkC) - keypress = GLUT_KEY_F3; - else if(wParam==(unsigned)gxKeyList.vkStart) - keypress = GLUT_KEY_F4; - } + if(!(lParam & 0x40000000)) // Prevent auto-repeat + { + wince_GetDefaultKeys(&gxKeyList, 0x03); + + if(wParam==(unsigned)gxKeyList.vkRight) + keypress = GLUT_KEY_RIGHT; + else if(wParam==(unsigned)gxKeyList.vkLeft) + keypress = GLUT_KEY_LEFT; + else if(wParam==(unsigned)gxKeyList.vkUp) + keypress = GLUT_KEY_UP; + else if(wParam==(unsigned)gxKeyList.vkDown) + keypress = GLUT_KEY_DOWN; + else if(wParam==(unsigned)gxKeyList.vkA) + keypress = GLUT_KEY_F1; + else if(wParam==(unsigned)gxKeyList.vkB) + keypress = GLUT_KEY_F2; + else if(wParam==(unsigned)gxKeyList.vkC) + keypress = GLUT_KEY_F3; + else if(wParam==(unsigned)gxKeyList.vkStart) + keypress = GLUT_KEY_F4; + } #endif if( keypress != -1 ) diff --git a/src/freeglut_state.c b/src/freeglut_state.c index 7b7eedc..f210612 100644 --- a/src/freeglut_state.c +++ b/src/freeglut_state.c @@ -400,21 +400,21 @@ int FGAPIENTRY glutGet( GLenum eWhat ) case GLUT_WINDOW_BORDER_WIDTH : #if TARGET_HOST_WINCE - return 0; + return 0; #else return GetSystemMetrics( SM_CXSIZEFRAME ); #endif //TARGET_HOST_WINCE case GLUT_WINDOW_HEADER_HEIGHT : #if TARGET_HOST_WINCE - return 0; + return 0; #else return GetSystemMetrics( SM_CYCAPTION ); #endif //TARGET_HOST_WINCE case GLUT_DISPLAY_MODE_POSSIBLE: #if TARGET_HOST_WINCE - return GL_FALSE; + return GL_FALSE; #else return fgSetupPixelFormat( fgStructure.Window, GL_TRUE, PFD_MAIN_PLANE ); @@ -535,7 +535,7 @@ int FGAPIENTRY glutDeviceGet( GLenum eWhat ) * We are much more fortunate under Win32 about this... */ #if TARGET_HOST_WINCE - return 1; + return 1; #else return GetSystemMetrics( SM_CMOUSEBUTTONS ); #endif //TARGET_HOST_WINCE