From cc99affa41dd1414c4e7bb37a07e67a2194e97d5 Mon Sep 17 00:00:00 2001 From: jules Date: Tue, 4 Sep 2007 18:04:42 +0000 Subject: [PATCH] --- .../juce_win32_Windowing.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/build/win32/platform_specific_code/juce_win32_Windowing.cpp b/build/win32/platform_specific_code/juce_win32_Windowing.cpp index 92cbc7fef9..54c924ab8c 100644 --- a/build/win32/platform_specific_code/juce_win32_Windowing.cpp +++ b/build/win32/platform_specific_code/juce_win32_Windowing.cpp @@ -3120,7 +3120,7 @@ public: wglShareLists (renderContext, contextToShareWith); } - ~WindowedGLContext() + ~WindowedGLContext() { makeInactive(); @@ -3196,7 +3196,7 @@ public: PFNWGLCHOOSEPIXELFORMATARBPROC wglChoosePixelFormatARB = 0; - if (availableExtensions.contains ("WGL_ARB_pixel_format") + if (availableExtensions.contains ("WGL_ARB_pixel_format") && WGL_EXT_FUNCTION_INIT (PFNWGLCHOOSEPIXELFORMATARBPROC, wglChoosePixelFormatARB)) { int attributes[64]; @@ -3302,14 +3302,14 @@ public: void findAlternativeOpenGLPixelFormats (OwnedArray & results) { jassert (isActive()); - + StringArray availableExtensions; getWglExtensions (dc, availableExtensions); PFNWGLGETPIXELFORMATATTRIBIVARBPROC wglGetPixelFormatAttribivARB = 0; int numTypes = 0; - if (availableExtensions.contains("WGL_ARB_pixel_format") + if (availableExtensions.contains("WGL_ARB_pixel_format") && WGL_EXT_FUNCTION_INIT (PFNWGLGETPIXELFORMATATTRIBIVARBPROC, wglGetPixelFormatAttribivARB)) { int attributes = WGL_NUMBER_PIXEL_FORMATS_ARB; @@ -3349,7 +3349,7 @@ private: HDC dc; //============================================================================== - bool fillInPixelFormatDetails (const int pixelFormatIndex, + bool fillInPixelFormatDetails (const int pixelFormatIndex, OpenGLPixelFormat& result, const StringArray& availableExtensions) const throw() { @@ -3444,11 +3444,11 @@ private: }; //============================================================================== -OpenGLContext* OpenGLContext::createContextForWindow (Component* const component, +OpenGLContext* OpenGLContext::createContextForWindow (Component* const component, const OpenGLPixelFormat& pixelFormat, const OpenGLContext* const contextToShareWith) { - WindowedGLContext* c = new WindowedGLContext (component, + WindowedGLContext* c = new WindowedGLContext (component, contextToShareWith != 0 ? (HGLRC) contextToShareWith->getRawContext() : 0); if (c->renderContext == 0 || ! c->setPixelFormat (pixelFormat))