projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Moving the Windows-specific joystick definitions into the Windows-specific header...
[freeglut]
/
src
/
mswin
/
freeglut_main_mswin.c
diff --git
a/src/mswin/freeglut_main_mswin.c
b/src/mswin/freeglut_main_mswin.c
index
b4d1bc9
..
be48b23
100644
(file)
--- a/
src/mswin/freeglut_main_mswin.c
+++ b/
src/mswin/freeglut_main_mswin.c
@@
-108,6
+108,16
@@
void fgPlatformDisplayWindow ( SFG_Window *window )
}
\r
\r
\r
}
\r
\r
\r
+unsigned long fgPlatformSystemTime ( void )
\r
+{
\r
+#if defined(_WIN32_WCE)
\r
+ return GetTickCount();
\r
+#else
\r
+ return timeGetTime();
\r
+#endif
\r
+}
\r
+
\r
+
\r
void fgPlatformSleepForEvents( long msec )
\r
{
\r
MsgWaitForMultipleObjects( 0, NULL, FALSE, msec, QS_ALLINPUT );
\r
void fgPlatformSleepForEvents( long msec )
\r
{
\r
MsgWaitForMultipleObjects( 0, NULL, FALSE, msec, QS_ALLINPUT );
\r
@@
-329,7
+339,7
@@
LRESULT CALLBACK fgPlatformWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam,
"fgPlatformWindowProc" );
\r
\r
window->Window.Handle = hWnd;
\r
"fgPlatformWindowProc" );
\r
\r
window->Window.Handle = hWnd;
\r
- window->Window.Device = GetDC( hWnd );
\r
+ window->Window.pContext.Device = GetDC( hWnd );
\r
if( window->IsMenu )
\r
{
\r
unsigned int current_DisplayMode = fgState.DisplayMode;
\r
if( window->IsMenu )
\r
{
\r
unsigned int current_DisplayMode = fgState.DisplayMode;
\r
@@
-340,7
+350,7
@@
LRESULT CALLBACK fgPlatformWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam,
fgState.DisplayMode = current_DisplayMode;
\r
\r
if( fgStructure.MenuContext )
\r
fgState.DisplayMode = current_DisplayMode;
\r
\r
if( fgStructure.MenuContext )
\r
- wglMakeCurrent( window->Window.Device,
\r
+ wglMakeCurrent( window->Window.pContext.Device,
\r
fgStructure.MenuContext->MContext
\r
);
\r
else
\r
fgStructure.MenuContext->MContext
\r
);
\r
else
\r
@@
-348,11
+358,11
@@
LRESULT CALLBACK fgPlatformWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam,
fgStructure.MenuContext =
\r
(SFG_MenuContext *)malloc( sizeof(SFG_MenuContext) );
\r
fgStructure.MenuContext->MContext =
\r
fgStructure.MenuContext =
\r
(SFG_MenuContext *)malloc( sizeof(SFG_MenuContext) );
\r
fgStructure.MenuContext->MContext =
\r
- wglCreateContext( window->Window.Device );
\r
+ wglCreateContext( window->Window.pContext.Device );
\r
}
\r
\r
/* window->Window.Context = wglGetCurrentContext (); */
\r
}
\r
\r
/* window->Window.Context = wglGetCurrentContext (); */
\r
- window->Window.Context = wglCreateContext( window->Window.Device );
\r
+ window->Window.Context = wglCreateContext( window->Window.pContext.Device );
\r
}
\r
else
\r
{
\r
}
\r
else
\r
{
\r
@@
-362,13
+372,13
@@
LRESULT CALLBACK fgPlatformWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam,
\r
if( ! fgState.UseCurrentContext )
\r
window->Window.Context =
\r
\r
if( ! fgState.UseCurrentContext )
\r
window->Window.Context =
\r
- wglCreateContext( window->Window.Device );
\r
+ wglCreateContext( window->Window.pContext.Device );
\r
else
\r
{
\r
window->Window.Context = wglGetCurrentContext( );
\r
if( ! window->Window.Context )
\r
window->Window.Context =
\r
else
\r
{
\r
window->Window.Context = wglGetCurrentContext( );
\r
if( ! window->Window.Context )
\r
window->Window.Context =
\r
- wglCreateContext( window->Window.Device );
\r
+ wglCreateContext( window->Window.pContext.Device );
\r
}
\r
\r
#if !defined(_WIN32_WCE)
\r
}
\r
\r
#if !defined(_WIN32_WCE)
\r
@@
-391,7
+401,7
@@
LRESULT CALLBACK fgPlatformWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam,
fgSetWindow( current_window );
\r
}
\r
\r
fgSetWindow( current_window );
\r
}
\r
\r
- ReleaseDC( window->Window.Handle, window->Window.Device );
\r
+ ReleaseDC( window->Window.Handle, window->Window.pContext.Device );
\r
\r
#if defined(_WIN32_WCE)
\r
/* Take over button handling */
\r
\r
#if defined(_WIN32_WCE)
\r
/* Take over button handling */
\r