treectrl -> treetest

[wxWidgets.git] / src / msw / glcanvas.cpp

diff --git a/src/msw/glcanvas.cpp b/src/msw/glcanvas.cpp
index f415d6030adfdbc79f1ebfd242377d0633839d5a..97cb556e372e929908c1340b8570fc7e020edc95 100644 (file)
--- a/src/msw/glcanvas.cpp
+++ b/src/msw/glcanvas.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:       wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -33,7 +33,8 @@
 
 #include <wx/glcanvas.h>
 
 
 #include <wx/glcanvas.h>
 

-wxChar wxGLCanvasClassName[]        = wxT("wxGLCanvasClass");
+static const wxChar *wxGLCanvasClassName = wxT("wxGLCanvasClass");
+static const wxChar *wxGLCanvasClassNameNoRedraw = wxT("wxGLCanvasClassNR");

 
 LRESULT WXDLLEXPORT APIENTRY _EXPORT wxWndProc(HWND hWnd, UINT message,
                                    WPARAM wParam, LPARAM lParam);
 
 LRESULT WXDLLEXPORT APIENTRY _EXPORT wxWndProc(HWND hWnd, UINT message,
                                    WPARAM wParam, LPARAM lParam);


@@ -49,7 +50,7 @@ wxGLContext::wxGLContext(bool isRGB, wxGLCanvas *win, const wxPalette& palette)
   m_hDC = win->GetHDC();
 
   m_glContext = wglCreateContext((HDC) m_hDC);
   m_hDC = win->GetHDC();
 
   m_glContext = wglCreateContext((HDC) m_hDC);

-  wxCHECK_RET( m_glContext, "Couldn't create OpenGl context" );
+  wxCHECK_RET( m_glContext, wxT("Couldn't create OpenGl context") );

 
   wglMakeCurrent((HDC) m_hDC, m_glContext);
 }
 
   wglMakeCurrent((HDC) m_hDC, m_glContext);
 }


@@ -57,20 +58,20 @@ wxGLContext::wxGLContext(bool isRGB, wxGLCanvas *win, const wxPalette& palette)
 wxGLContext::wxGLContext(
                bool isRGB, wxGLCanvas *win,
                const wxPalette& palette,
 wxGLContext::wxGLContext(
                bool isRGB, wxGLCanvas *win,
                const wxPalette& palette,

-               const wxGLContext *other        /* for sharing display lists */
-)
+               const wxGLContext *other  /* for sharing display lists */
+             )

 {
 {

-    m_window = win;
+  m_window = win;

 
 

-    m_hDC = win->GetHDC();
+  m_hDC = win->GetHDC();

 
 

-    m_glContext = wglCreateContext((HDC) m_hDC);
-    wxCHECK_RET( m_glContext, "Couldn't create OpenGl context" );
+  m_glContext = wglCreateContext((HDC) m_hDC);
+  wxCHECK_RET( m_glContext, wxT("Couldn't create OpenGl context") );

 
 

-    if( other != 0 )
-      wglShareLists( other->m_glContext, m_glContext );
+  if( other != 0 )
+    wglShareLists( other->m_glContext, m_glContext );

 
 

-    wglMakeCurrent((HDC) m_hDC, m_glContext);
+  wglMakeCurrent((HDC) m_hDC, m_glContext);

 }
 
 wxGLContext::~wxGLContext()
 }
 
 wxGLContext::~wxGLContext()


@@ -78,7 +79,7 @@ wxGLContext::~wxGLContext()
   if (m_glContext)
   {
     wglMakeCurrent(NULL, NULL);
   if (m_glContext)
   {
     wglMakeCurrent(NULL, NULL);

-       wglDeleteContext(m_glContext);
+    wglDeleteContext(m_glContext);

   }
 }
 
   }
 }
 


@@ -98,10 +99,10 @@ void wxGLContext::SetCurrent()
     wglMakeCurrent((HDC) m_hDC, m_glContext);
   }
 
     wglMakeCurrent((HDC) m_hDC, m_glContext);
   }
 

-/*
-       setupPixelFormat(hDC);
-       setupPalette(hDC);
-*/
+  /*
+  setupPixelFormat(hDC);
+  setupPalette(hDC);
+  */

 }
 
 void wxGLContext::SetColour(const char *colour)
 }
 
 void wxGLContext::SetColour(const char *colour)


@@ -124,9 +125,9 @@ void wxGLContext::SetColour(const char *colour)
  * wxGLCanvas implementation
  */
 
  * wxGLCanvas implementation
  */
 

-IMPLEMENT_CLASS(wxGLCanvas, wxScrolledWindow)
+IMPLEMENT_CLASS(wxGLCanvas, wxWindow)

 
 

-BEGIN_EVENT_TABLE(wxGLCanvas, wxScrolledWindow)
+BEGIN_EVENT_TABLE(wxGLCanvas, wxWindow)

     EVT_SIZE(wxGLCanvas::OnSize)
     EVT_PALETTE_CHANGED(wxGLCanvas::OnPaletteChanged)
     EVT_QUERY_NEW_PALETTE(wxGLCanvas::OnQueryNewPalette)
     EVT_SIZE(wxGLCanvas::OnSize)
     EVT_PALETTE_CHANGED(wxGLCanvas::OnPaletteChanged)
     EVT_QUERY_NEW_PALETTE(wxGLCanvas::OnQueryNewPalette)


@@ -134,76 +135,75 @@ END_EVENT_TABLE()
 
 wxGLCanvas::wxGLCanvas(wxWindow *parent, wxWindowID id,
     const wxPoint& pos, const wxSize& size, long style, const wxString& name,
 
 wxGLCanvas::wxGLCanvas(wxWindow *parent, wxWindowID id,
     const wxPoint& pos, const wxSize& size, long style, const wxString& name,

-    int *attribList /* not used yet! */, const wxPalette& palette):
-  wxScrolledWindow()
+    int *attribList, const wxPalette& palette) : wxWindow()

 {
 {

-    m_glContext = (wxGLContext*) NULL;
+  m_glContext = (wxGLContext*) NULL;

 
 

-    bool ret = Create(parent, id, pos, size, style, name);
+  bool ret = Create(parent, id, pos, size, style, name);

 
 

-    if ( ret )
-    {
-        SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
-        SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
-    }
+  if ( ret )
+  {
+    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
+    SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
+  }

 
 

-       m_hDC = (WXHDC) ::GetDC((HWND) GetHWND());
+  m_hDC = (WXHDC) ::GetDC((HWND) GetHWND());

 
 

-    SetupPixelFormat();
-    SetupPalette(palette);
+  SetupPixelFormat(attribList);
+  SetupPalette(palette);

 
 

-    m_glContext = new wxGLContext(TRUE, this, palette);
+  m_glContext = new wxGLContext(TRUE, this, palette);

 }
 
 wxGLCanvas::wxGLCanvas( wxWindow *parent,
               const wxGLContext *shared, wxWindowID id,
               const wxPoint& pos, const wxSize& size, long style, const wxString& name,
               int *attribList, const wxPalette& palette )
 }
 
 wxGLCanvas::wxGLCanvas( wxWindow *parent,
               const wxGLContext *shared, wxWindowID id,
               const wxPoint& pos, const wxSize& size, long style, const wxString& name,
               int *attribList, const wxPalette& palette )

-  : wxScrolledWindow()
+  : wxWindow()

 {
 {

-   m_glContext = (wxGLContext*) NULL;
+  m_glContext = (wxGLContext*) NULL;

 
 

-   bool ret = Create(parent, id, pos, size, style, name);
+  bool ret = Create(parent, id, pos, size, style, name);

 
 

-    if ( ret )
-    {
-        SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
-        SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
-    }
+  if ( ret )
+  {
+    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
+    SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
+  }

 
 

-    m_hDC = (WXHDC) ::GetDC((HWND) GetHWND());
+  m_hDC = (WXHDC) ::GetDC((HWND) GetHWND());

 
 

-    SetupPixelFormat();
-    SetupPalette(palette);
+  SetupPixelFormat(attribList);
+  SetupPalette(palette);

 
 

-    m_glContext = new wxGLContext(TRUE, this, palette, shared );
+  m_glContext = new wxGLContext(TRUE, this, palette, shared );

 }
 
 }
 

-// Not very usefull for wxMSW, but this is to be wxGTK compliant
+// Not very useful for wxMSW, but this is to be wxGTK compliant

 
 wxGLCanvas::wxGLCanvas( wxWindow *parent, const wxGLCanvas *shared, wxWindowID id,
                         const wxPoint& pos, const wxSize& size, long style, const wxString& name,
                         int *attribList, const wxPalette& palette ):
 
 wxGLCanvas::wxGLCanvas( wxWindow *parent, const wxGLCanvas *shared, wxWindowID id,
                         const wxPoint& pos, const wxSize& size, long style, const wxString& name,
                         int *attribList, const wxPalette& palette ):

-  wxScrolledWindow()
+  wxWindow()

 {
 {

-    m_glContext = (wxGLContext*) NULL;
+  m_glContext = (wxGLContext*) NULL;

 
 

-    bool ret = Create(parent, id, pos, size, style, name);
+  bool ret = Create(parent, id, pos, size, style, name);

 
 

-    if ( ret )
-    {
-        SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
-        SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
-    }
+  if ( ret )
+  {
+    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
+    SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
+  }

 
 

-       m_hDC = (WXHDC) ::GetDC((HWND) GetHWND());
+  m_hDC = (WXHDC) ::GetDC((HWND) GetHWND());

 
 

-    SetupPixelFormat();
-    SetupPalette(palette);
+  SetupPixelFormat(attribList);
+  SetupPalette(palette);

 
 

-    wxGLContext *sharedContext=0;
-    if (shared) sharedContext=shared->GetContext();
-    m_glContext = new wxGLContext(TRUE, this, palette, sharedContext );
+  wxGLContext *sharedContext=0;
+  if (shared) sharedContext=shared->GetContext();
+  m_glContext = new wxGLContext(TRUE, this, palette, sharedContext );

 }
 
 wxGLCanvas::~wxGLCanvas()
 }
 
 wxGLCanvas::~wxGLCanvas()


@@ -214,142 +214,225 @@ wxGLCanvas::~wxGLCanvas()
   ::ReleaseDC((HWND) GetHWND(), (HDC) m_hDC);
 }
 
   ::ReleaseDC((HWND) GetHWND(), (HDC) m_hDC);
 }
 

-// Replaces wxWindow::Create functionality, since we need to use a different window class
-bool wxGLCanvas::Create(wxWindow *parent, wxWindowID id,
-              const wxPoint& pos, const wxSize& size, long style, const wxString& name)
+// Replaces wxWindow::Create functionality, since we need to use a different
+// window class
+bool wxGLCanvas::Create(wxWindow *parent,
+                        wxWindowID id,
+                        const wxPoint& pos,
+                        const wxSize& size,
+                        long style,
+                        const wxString& name)

 {
 {

-    static bool registeredGLCanvasClass = FALSE;
+  static bool s_registeredGLCanvasClass = FALSE;

 
 

-    // We have to register a special window class because we need
-    // the CS_OWNDC style for GLCanvas.
+  // We have to register a special window class because we need
+  // the CS_OWNDC style for GLCanvas.

 
 

-/*
-    From Angel Popov <jumpo@bitex.com>
+  /*
+  From Angel Popov <jumpo@bitex.com>

 
 

-    Here are two snips from a dicussion in the OpenGL Gamedev list that explains
-    how this problem can be fixed:
+  Here are two snips from a dicussion in the OpenGL Gamedev list that explains
+  how this problem can be fixed:

 
 

-    "There are 5 common DCs available in Win95. These are aquired when you call
-    GetDC or GetDCEx from a window that does _not_ have the OWNDC flag.
-    OWNDC flagged windows do not get their DC from the common DC pool, the issue
-    is they require 800 bytes each from the limited 64Kb local heap for GDI."
+  "There are 5 common DCs available in Win95. These are aquired when you call
+  GetDC or GetDCEx from a window that does _not_ have the OWNDC flag.
+  OWNDC flagged windows do not get their DC from the common DC pool, the issue
+  is they require 800 bytes each from the limited 64Kb local heap for GDI."

 
 

-    "The deal is, if you hold onto one of the 5 shared DC's too long (as GL apps
-    do), Win95 will actually "steal" it from you.  MakeCurrent fails,
-    apparently, because Windows re-assigns the HDC to a different window.  The
-    only way to prevent this, the only reliable means, is to set CS_OWNDC."
-*/
+  "The deal is, if you hold onto one of the 5 shared DC's too long (as GL apps
+  do), Win95 will actually "steal" it from you.  MakeCurrent fails,
+  apparently, because Windows re-assigns the HDC to a different window.  The
+  only way to prevent this, the only reliable means, is to set CS_OWNDC."
+  */

 
 

-    if (!registeredGLCanvasClass)
+  if (!s_registeredGLCanvasClass)
+  {
+    WNDCLASS wndclass;
+
+    // the fields which are common to all classes
+    wndclass.lpfnWndProc   = (WNDPROC)wxWndProc;
+    wndclass.cbClsExtra    = 0;
+    wndclass.cbWndExtra    = sizeof( DWORD ); // VZ: what is this DWORD used for?
+    wndclass.hInstance     = wxhInstance;
+    wndclass.hIcon         = (HICON) NULL;
+    wndclass.hCursor       = ::LoadCursor((HINSTANCE)NULL, IDC_ARROW);
+    wndclass.lpszMenuName  = NULL;
+
+    // Register the GLCanvas class name
+    wndclass.hbrBackground = (HBRUSH)NULL;
+    wndclass.lpszClassName = wxGLCanvasClassName;
+    wndclass.style         = CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS | CS_OWNDC;
+
+    if ( !::RegisterClass(&wndclass) )

     {
     {

-        WNDCLASS wndclass;
-
-        static const long styleNormal = CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS | CS_OWNDC;
-
-        // the fields which are common to all classes
-        wndclass.lpfnWndProc   = (WNDPROC)wxWndProc;
-        wndclass.cbClsExtra    = 0;
-        wndclass.cbWndExtra    = sizeof( DWORD ); // VZ: what is this DWORD used for?
-        wndclass.hInstance     = wxhInstance;
-        wndclass.hIcon         = (HICON) NULL;
-        wndclass.hCursor       = ::LoadCursor((HINSTANCE)NULL, IDC_ARROW);
-        wndclass.lpszMenuName  = NULL;
-
-        // Register the GLCanvas class name
-        wndclass.hbrBackground = (HBRUSH)NULL;
-        wndclass.lpszClassName = wxGLCanvasClassName;
-        wndclass.style         = styleNormal;
-
-        if ( !RegisterClass(&wndclass) )
-        {
-            wxLogLastError("RegisterClass(wxGLCanvasClass)");
-
-            return FALSE;
-        }
-        registeredGLCanvasClass = TRUE;
+      wxLogLastError(wxT("RegisterClass(wxGLCanvasClass)"));
+      return FALSE;

     }
 
     }
 

-    wxCHECK_MSG( parent, FALSE, wxT("can't create wxWindow without parent") );
+    // Register the GLCanvas class name for windows which don't do full repaint
+    // on resize
+    wndclass.lpszClassName = wxGLCanvasClassNameNoRedraw;
+    wndclass.style        &= ~(CS_HREDRAW | CS_VREDRAW);
+
+    if ( !::RegisterClass(&wndclass) )
+    {
+        wxLogLastError(wxT("RegisterClass(wxGLCanvasClassNameNoRedraw)"));
+
+        ::UnregisterClass(wxGLCanvasClassName, wxhInstance);

 
 

-    if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) )

         return FALSE;
         return FALSE;

+    }
+
+    s_registeredGLCanvasClass = TRUE;
+  }

 
 

-    parent->AddChild(this);
+  wxCHECK_MSG( parent, FALSE, wxT("can't create wxWindow without parent") );

 
 

-    DWORD msflags = 0;
-    if ( style & wxBORDER )
-        msflags |= WS_BORDER;
-    if ( style & wxTHICK_FRAME )
-        msflags |= WS_THICKFRAME;
+  if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) )
+    return FALSE;

 
 

-    msflags |= WS_CHILD | WS_VISIBLE;
-    if ( style & wxCLIP_CHILDREN )
-        msflags |= WS_CLIPCHILDREN;
+  parent->AddChild(this);

 
 

-    bool want3D;
-    WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D);
+  DWORD msflags = 0;
+  if ( style & wxBORDER )
+    msflags |= WS_BORDER;
+  if ( style & wxTHICK_FRAME )
+    msflags |= WS_THICKFRAME;

 
 

-    // Even with extended styles, need to combine with WS_BORDER
-    // for them to look right.
-    if ( want3D || (m_windowStyle & wxSIMPLE_BORDER) || (m_windowStyle & wxRAISED_BORDER ) ||
-        (m_windowStyle & wxSUNKEN_BORDER) || (m_windowStyle & wxDOUBLE_BORDER))
-    {
-        msflags |= WS_BORDER;
-    }
+  /*
+  A general rule with OpenGL and Win32 is that any window that will have a
+  HGLRC built for it must have two flags:  WS_CLIPCHILDREN & WS_CLIPSIBLINGS.
+  You can find references about this within the knowledge base and most OpenGL
+  books that contain the wgl function descriptions.
+  */
+
+  msflags |= WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN;
+
+  bool want3D;
+  WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D);

 
 

-    // calculate the value to return from WM_GETDLGCODE handler
-    if ( GetWindowStyleFlag() & wxWANTS_CHARS )
+  // Even with extended styles, need to combine with WS_BORDER
+  // for them to look right.
+  if ( want3D || (m_windowStyle & wxSIMPLE_BORDER) || (m_windowStyle & wxRAISED_BORDER ) ||
+       (m_windowStyle & wxSUNKEN_BORDER) || (m_windowStyle & wxDOUBLE_BORDER))
+  {
+    msflags |= WS_BORDER;
+  }
+
+  return MSWCreate(wxGLCanvasClassName, NULL, pos, size, msflags, exStyle);
+}
+
+static void AdjustPFDForAttributes(PIXELFORMATDESCRIPTOR& pfd, int *attribList)
+{
+  if (attribList) {
+    pfd.dwFlags &= ~PFD_DOUBLEBUFFER;
+    pfd.iPixelType = PFD_TYPE_COLORINDEX;
+    pfd.cColorBits = 0;
+    int arg=0;
+
+    while( (attribList[arg]!=0) )

     {
     {

-        // want everything: i.e. all keys and WM_CHAR message
-        m_lDlgCode = DLGC_WANTARROWS | DLGC_WANTCHARS |
-                     DLGC_WANTTAB | DLGC_WANTMESSAGE;
+      switch( attribList[arg++] )
+      {
+        case WX_GL_RGBA:
+          pfd.iPixelType = PFD_TYPE_RGBA;
+          break;
+        case WX_GL_BUFFER_SIZE:
+          pfd.cColorBits = attribList[arg++];
+          break;
+        case WX_GL_LEVEL:
+          // this member looks like it may be obsolete
+          if (attribList[arg] > 0) {
+            pfd.iLayerType = (BYTE)PFD_OVERLAY_PLANE;
+          } else if (attribList[arg] < 0) {
+            pfd.iLayerType = (BYTE)PFD_UNDERLAY_PLANE;
+          } else {
+            pfd.iLayerType = (BYTE)PFD_MAIN_PLANE;
+          }
+          arg++;
+          break;
+        case WX_GL_DOUBLEBUFFER:
+          pfd.dwFlags |= PFD_DOUBLEBUFFER;
+          break;
+        case WX_GL_STEREO:
+          pfd.dwFlags |= PFD_STEREO;
+          break;
+        case WX_GL_AUX_BUFFERS:
+          pfd.cAuxBuffers = attribList[arg++];
+          break;
+        case WX_GL_MIN_RED:
+          pfd.cColorBits += (pfd.cRedBits = attribList[arg++]);
+          break;
+        case WX_GL_MIN_GREEN:
+          pfd.cColorBits += (pfd.cGreenBits = attribList[arg++]);
+          break;
+        case WX_GL_MIN_BLUE:
+          pfd.cColorBits += (pfd.cBlueBits = attribList[arg++]);
+          break;
+        case WX_GL_MIN_ALPHA:
+          // doesn't count in cColorBits
+          pfd.cAlphaBits = attribList[arg++];
+          break;
+        case WX_GL_DEPTH_SIZE:
+          pfd.cDepthBits = attribList[arg++];
+          break;
+        case WX_GL_STENCIL_SIZE:
+          pfd.cStencilBits = attribList[arg++];
+          break;
+        case WX_GL_MIN_ACCUM_RED:
+          pfd.cAccumBits += (pfd.cAccumRedBits = attribList[arg++]);
+          break;
+        case WX_GL_MIN_ACCUM_GREEN:
+          pfd.cAccumBits += (pfd.cAccumGreenBits = attribList[arg++]);
+          break;
+        case WX_GL_MIN_ACCUM_BLUE:
+          pfd.cAccumBits += (pfd.cAccumBlueBits = attribList[arg++]);
+          break;
+        case WX_GL_MIN_ACCUM_ALPHA:
+          pfd.cAccumBits += (pfd.cAccumAlphaBits = attribList[arg++]);
+          break;
+        default:
+          break;
+      }

     }
     }

+  }
+}

 
 

-    MSWCreate(m_windowId, parent, wxGLCanvasClassName, this, NULL,
-              pos.x, pos.y,
-              WidthDefault(size.x), HeightDefault(size.y),
-              msflags, NULL, exStyle);
-
-    return TRUE;
-
-}
-
-void wxGLCanvas::SetupPixelFormat() // (HDC hDC)
-{
-    PIXELFORMATDESCRIPTOR pfd = {
-       sizeof(PIXELFORMATDESCRIPTOR),  /* size */
-       1,                              /* version */
-       PFD_SUPPORT_OPENGL |
-       PFD_DRAW_TO_WINDOW |
-       PFD_DOUBLEBUFFER,               /* support double-buffering */
-       PFD_TYPE_RGBA,                  /* color type */
-       16,                             /* prefered color depth */
-       0, 0, 0, 0, 0, 0,               /* color bits (ignored) */
-       0,                              /* no alpha buffer */
-       0,                              /* alpha bits (ignored) */
-       0,                              /* no accumulation buffer */
-       0, 0, 0, 0,                     /* accum bits (ignored) */
-       16,                             /* depth buffer */
-       0,                              /* no stencil buffer */
-       0,                              /* no auxiliary buffers */
-       PFD_MAIN_PLANE,                 /* main layer */
-       0,                              /* reserved */
-       0, 0, 0,                        /* no layer, visible, damage masks */
+void wxGLCanvas::SetupPixelFormat(int *attribList) // (HDC hDC)
+{
+  int pixelFormat;
+  PIXELFORMATDESCRIPTOR pfd = {
+        sizeof(PIXELFORMATDESCRIPTOR),    /* size */
+        1,                /* version */
+        PFD_SUPPORT_OPENGL |
+        PFD_DRAW_TO_WINDOW |
+        PFD_DOUBLEBUFFER,        /* support double-buffering */
+        PFD_TYPE_RGBA,            /* color type */
+        16,                /* prefered color depth */
+        0, 0, 0, 0, 0, 0,        /* color bits (ignored) */
+        0,                /* no alpha buffer */
+        0,                /* alpha bits (ignored) */
+        0,                /* no accumulation buffer */
+        0, 0, 0, 0,            /* accum bits (ignored) */
+        16,                /* depth buffer */
+        0,                /* no stencil buffer */
+        0,                /* no auxiliary buffers */
+        PFD_MAIN_PLANE,            /* main layer */
+        0,                /* reserved */
+        0, 0, 0,            /* no layer, visible, damage masks */

     };
     };

-    int pixelFormat;

 
 

-    pixelFormat = ChoosePixelFormat((HDC) m_hDC, &pfd);
-    if (pixelFormat == 0) {
-       MessageBox(WindowFromDC((HDC) m_hDC), "ChoosePixelFormat failed.", "Error",
-               MB_ICONERROR | MB_OK);
-       exit(1);
-    }
+  AdjustPFDForAttributes(pfd, attribList);

 
 

+  pixelFormat = ChoosePixelFormat((HDC) m_hDC, &pfd);
+  if (pixelFormat == 0) {
+    wxLogWarning(_("ChoosePixelFormat failed."));
+  }
+  else {

     if (SetPixelFormat((HDC) m_hDC, pixelFormat, &pfd) != TRUE) {
     if (SetPixelFormat((HDC) m_hDC, pixelFormat, &pfd) != TRUE) {

-       MessageBox(WindowFromDC((HDC) m_hDC), "SetPixelFormat failed.", "Error",
-               MB_ICONERROR | MB_OK);
-       exit(1);
+      wxLogWarning(_("SetPixelFormat failed."));

     }
     }

+  }

 }
 
 void wxGLCanvas::SetupPalette(const wxPalette& palette)
 }
 
 void wxGLCanvas::SetupPalette(const wxPalette& palette)


@@ -364,7 +447,7 @@ void wxGLCanvas::SetupPalette(const wxPalette& palette)
     }
     else
     {
     }
     else
     {

-         return;
+      return;

     }
 
     m_palette = palette;
     }
 
     m_palette = palette;


@@ -389,7 +472,7 @@ wxPalette wxGLCanvas::CreateDefaultPalette()
 
     DescribePixelFormat((HDC) m_hDC, pixelFormat, sizeof(PIXELFORMATDESCRIPTOR), &pfd);
 
 
     DescribePixelFormat((HDC) m_hDC, pixelFormat, sizeof(PIXELFORMATDESCRIPTOR), &pfd);
 

-       paletteSize = 1 << pfd.cColorBits;
+    paletteSize = 1 << pfd.cColorBits;

 
     LOGPALETTE* pPal =
      (LOGPALETTE*) malloc(sizeof(LOGPALETTE) + paletteSize * sizeof(PALETTEENTRY));
 
     LOGPALETTE* pPal =
      (LOGPALETTE*) malloc(sizeof(LOGPALETTE) + paletteSize * sizeof(PALETTEENTRY));


@@ -398,20 +481,20 @@ wxPalette wxGLCanvas::CreateDefaultPalette()
 
     /* build a simple RGB color palette */
     {
 
     /* build a simple RGB color palette */
     {

-       int redMask = (1 << pfd.cRedBits) - 1;
-       int greenMask = (1 << pfd.cGreenBits) - 1;
-       int blueMask = (1 << pfd.cBlueBits) - 1;
-       int i;
-
-       for (i=0; i<paletteSize; ++i) {
-           pPal->palPalEntry[i].peRed =
-                   (((i >> pfd.cRedShift) & redMask) * 255) / redMask;
-           pPal->palPalEntry[i].peGreen =
-                   (((i >> pfd.cGreenShift) & greenMask) * 255) / greenMask;
-           pPal->palPalEntry[i].peBlue =
-                   (((i >> pfd.cBlueShift) & blueMask) * 255) / blueMask;
-           pPal->palPalEntry[i].peFlags = 0;
-       }
+    int redMask = (1 << pfd.cRedBits) - 1;
+    int greenMask = (1 << pfd.cGreenBits) - 1;
+    int blueMask = (1 << pfd.cBlueBits) - 1;
+    int i;
+
+    for (i=0; i<paletteSize; ++i) {
+        pPal->palPalEntry[i].peRed =
+            (((i >> pfd.cRedShift) & redMask) * 255) / redMask;
+        pPal->palPalEntry[i].peGreen =
+            (((i >> pfd.cGreenShift) & greenMask) * 255) / greenMask;
+        pPal->palPalEntry[i].peBlue =
+            (((i >> pfd.cBlueShift) & blueMask) * 255) / blueMask;
+        pPal->palPalEntry[i].peFlags = 0;
+    }

     }
 
     HPALETTE hPalette = CreatePalette(pPal);
     }
 
     HPALETTE hPalette = CreatePalette(pPal);


@@ -431,19 +514,6 @@ void wxGLCanvas::SwapBuffers()
 
 void wxGLCanvas::OnSize(wxSizeEvent& event)
 {
 
 void wxGLCanvas::OnSize(wxSizeEvent& event)
 {

-  int width, height;
-  GetClientSize(& width, & height);
-
-  if (m_glContext)
-  {
-    m_glContext->SetCurrent();
-
-    glViewport(0, 0, (GLint)width, (GLint)height);
-    glMatrixMode(GL_PROJECTION);
-    glLoadIdentity();
-    glFrustum( -1.0, 1.0, -1.0, 1.0, 5.0, 15.0 );
-    glMatrixMode(GL_MODELVIEW);
-  }

 }
 
 void wxGLCanvas::SetCurrent()
 }
 
 void wxGLCanvas::SetCurrent()


@@ -464,30 +534,30 @@ void wxGLCanvas::SetColour(const char *colour)
 // So we need wxFrame to call OnQueryNewPalette for all children...
 void wxGLCanvas::OnQueryNewPalette(wxQueryNewPaletteEvent& event)
 {
 // So we need wxFrame to call OnQueryNewPalette for all children...
 void wxGLCanvas::OnQueryNewPalette(wxQueryNewPaletteEvent& event)
 {

-       /* realize palette if this is the current window */
-       if ( GetPalette()->Ok() ) {
-           ::UnrealizeObject((HPALETTE) GetPalette()->GetHPALETTE());
-           ::SelectPalette((HDC) GetHDC(), (HPALETTE) GetPalette()->GetHPALETTE(), FALSE);
-           ::RealizePalette((HDC) GetHDC());
-           Refresh();
-           event.SetPaletteRealized(TRUE);
-    }
-    else
-           event.SetPaletteRealized(FALSE);
+  /* realize palette if this is the current window */
+  if ( GetPalette()->Ok() ) {
+    ::UnrealizeObject((HPALETTE) GetPalette()->GetHPALETTE());
+    ::SelectPalette((HDC) GetHDC(), (HPALETTE) GetPalette()->GetHPALETTE(), FALSE);
+    ::RealizePalette((HDC) GetHDC());
+    Refresh();
+    event.SetPaletteRealized(TRUE);
+  }
+  else
+    event.SetPaletteRealized(FALSE);

 }
 
 // I think this doesn't have to be propagated to child windows.
 void wxGLCanvas::OnPaletteChanged(wxPaletteChangedEvent& event)
 {
 }
 
 // I think this doesn't have to be propagated to child windows.
 void wxGLCanvas::OnPaletteChanged(wxPaletteChangedEvent& event)
 {

-       /* realize palette if this is *not* the current window */
-       if ( GetPalette() &&
+  /* realize palette if this is *not* the current window */
+  if ( GetPalette() &&

        GetPalette()->Ok() && (this != event.GetChangedWindow()) )
        GetPalette()->Ok() && (this != event.GetChangedWindow()) )

-    {
-           ::UnrealizeObject((HPALETTE) GetPalette()->GetHPALETTE());
-           ::SelectPalette((HDC) GetHDC(), (HPALETTE) GetPalette()->GetHPALETTE(), FALSE);
-           ::RealizePalette((HDC) GetHDC());
-           Refresh();
-       }
+  {
+    ::UnrealizeObject((HPALETTE) GetPalette()->GetHPALETTE());
+    ::SelectPalette((HDC) GetHDC(), (HPALETTE) GetPalette()->GetHPALETTE(), FALSE);
+    ::RealizePalette((HDC) GetHDC());
+    Refresh();
+  }

 }
 
 /* Give extensions proper function names. */
 }
 
 /* Give extensions proper function names. */


@@ -531,15 +601,15 @@ void glIndexPointerEXT(GLenum type, GLsizei stride, GLsizei count, const GLvoid
 void glNormalPointerEXT(GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer)
 {
 #ifdef GL_EXT_vertex_array
 void glNormalPointerEXT(GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer)
 {
 #ifdef GL_EXT_vertex_array

-    static PFNGLNORMALPOINTEREXTPROC proc = 0;
+  static PFNGLNORMALPOINTEREXTPROC proc = 0;

 
 

-    if ( !proc )
-    {
-        proc = (PFNGLNORMALPOINTEREXTPROC) wglGetProcAddress("glNormalPointerEXT");
-    }
+  if ( !proc )
+  {
+    proc = (PFNGLNORMALPOINTEREXTPROC) wglGetProcAddress("glNormalPointerEXT");
+  }

 
 

-    if ( proc )
-        (* proc) (type, stride, count, pointer);
+  if ( proc )
+    (* proc) (type, stride, count, pointer);

 #endif
 }
 
 #endif
 }
 


@@ -550,15 +620,14 @@ void glTexCoordPointerEXT(GLint size, GLenum type, GLsizei stride, GLsizei count
 void glVertexPointerEXT(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer)
 {
 #ifdef GL_EXT_vertex_array
 void glVertexPointerEXT(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer)
 {
 #ifdef GL_EXT_vertex_array

-    static PFNGLVERTEXPOINTEREXTPROC proc = 0;
-
-    if ( !proc )
-    {
-        proc = (PFNGLVERTEXPOINTEREXTPROC) wglGetProcAddress("glVertexPointerEXT");
-    }
+  static PFNGLVERTEXPOINTEREXTPROC proc = 0;

 
 

-    if ( proc )
-        (* proc) (size, type, stride, count, pointer);
+  if ( !proc )
+  {
+    proc = (PFNGLVERTEXPOINTEREXTPROC) wglGetProcAddress("glVertexPointerEXT");
+  }
+  if ( proc )
+    (* proc) (size, type, stride, count, pointer);

 #endif
 }
 
 #endif
 }
 


@@ -622,5 +691,53 @@ void glAddSwapHintRectWin(GLint x, GLint y, GLsizei width, GLsizei height)
 {
 }
 
 {
 }
 

+
+//---------------------------------------------------------------------------
+// wxGLApp
+//---------------------------------------------------------------------------
+
+IMPLEMENT_CLASS(wxGLApp, wxApp)
+
+bool wxGLApp::InitGLVisual(int *attribList)
+{
+  int pixelFormat;
+  PIXELFORMATDESCRIPTOR pfd = {
+        sizeof(PIXELFORMATDESCRIPTOR),    /* size */
+        1,                /* version */
+        PFD_SUPPORT_OPENGL |
+        PFD_DRAW_TO_WINDOW |
+        PFD_DOUBLEBUFFER,        /* support double-buffering */
+        PFD_TYPE_RGBA,            /* color type */
+        16,                /* prefered color depth */
+        0, 0, 0, 0, 0, 0,        /* color bits (ignored) */
+        0,                /* no alpha buffer */
+        0,                /* alpha bits (ignored) */
+        0,                /* no accumulation buffer */
+        0, 0, 0, 0,            /* accum bits (ignored) */
+        16,                /* depth buffer */
+        0,                /* no stencil buffer */
+        0,                /* no auxiliary buffers */
+        PFD_MAIN_PLANE,            /* main layer */
+        0,                /* reserved */
+        0, 0, 0,            /* no layer, visible, damage masks */
+    };
+
+  AdjustPFDForAttributes(pfd, attribList);
+
+  // use DC for whole (root) screen, since no windows have yet been created
+  pixelFormat = ChoosePixelFormat((HDC) ::GetDC(NULL), &pfd);
+
+  if (pixelFormat == 0) {
+    wxLogError(_("Failed to initialize OpenGL"));
+    return FALSE;
+  }
+
+  return TRUE;
+}
+
+wxGLApp::~wxGLApp()
+{
+}
+

 #endif
     // wxUSE_GLCANVAS
 #endif
     // wxUSE_GLCANVAS