X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fmswin%2Ffreeglut_init_mswin.c;h=d75765f4ccd4904a4009645c8caa733f23fc2018;hb=f08f8f9f43e88afba1dd52ca0f79ce9506b81e4f;hp=ff476fd849c849d9e70cf559d187bd1bad9ad7ac;hpb=d7c65149e8416abadd0437fabfdf527091bf1bfe;p=freeglut diff --git a/src/mswin/freeglut_init_mswin.c b/src/mswin/freeglut_init_mswin.c index ff476fd..d75765f 100644 --- a/src/mswin/freeglut_init_mswin.c +++ b/src/mswin/freeglut_init_mswin.c @@ -29,10 +29,15 @@ #include "freeglut_internal_mswin.h" + +extern LRESULT CALLBACK fgPlatformWindowProc( HWND hWnd, UINT uMsg, + WPARAM wParam, LPARAM lParam ); + + /* * A call to this function should initialize all the display stuff... */ -void fghInitialize( const char* displayName ) +void fgPlatformInitialize( const char* displayName ) { WNDCLASS wc; ATOM atom; @@ -54,7 +59,7 @@ void fghInitialize( const char* displayName ) * XXX Old code had "| CS_DBCLCKS" commented out. Plans for the * XXX future? Dead-end idea? */ - wc.lpfnWndProc = fgWindowProc; + wc.lpfnWndProc = fgPlatformWindowProc; wc.cbClsExtra = 0; wc.cbWndExtra = 0; wc.hInstance = fgDisplay.Instance; @@ -75,7 +80,7 @@ void fghInitialize( const char* displayName ) /* Register the window class */ atom = RegisterClass( &wc ); - FREEGLUT_INTERNAL_ERROR_EXIT ( atom, "Window Class Not Registered", "fghInitialize" ); + FREEGLUT_INTERNAL_ERROR_EXIT ( atom, "Window Class Not Registered", "fgPlatformInitialize" ); } /* The screen dimensions can be obtained via GetSystemMetrics() calls */ @@ -104,7 +109,7 @@ void fghInitialize( const char* displayName ) DeleteDC(context); } else - fgWarning("fghInitialize: " + fgWarning("fgPlatformInitialize: " "CreateDC failed, Screen size info may be incorrect\n" "This is quite likely caused by a bad '-display' parameter"); @@ -131,7 +136,7 @@ void fghInitialize( const char* displayName ) /* Platform-Specific Deinitialization Functions: */ extern void fghCloseInputDevices ( void ); -void fghDeinitialiseInputDevices ( void ) +void fgPlatformDeinitialiseInputDevices ( void ) { #if !defined(_WIN32_WCE) fghCloseInputDevices (); @@ -140,7 +145,7 @@ void fghDeinitialiseInputDevices ( void ) fgState.InputDevsInitialised = GL_FALSE; } -void fghCloseDisplay ( void ) +void fgPlatformCloseDisplay ( void ) { if( fgDisplay.DisplayName ) {