X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/72adfc4ba718412b278282463fd46e96b78bfa5d..c698eae5a875ca973df44add1ad67ec69a5754ba:/src/msw/glcanvas.cpp?ds=sidebyside

diff --git a/src/msw/glcanvas.cpp b/src/msw/glcanvas.cpp
index 5cbfd68cfb..2772f79ba4 100644
--- a/src/msw/glcanvas.cpp
+++ b/src/msw/glcanvas.cpp
@@ -104,7 +104,7 @@ void wxGLContext::SetCurrent()
   */
 }
 
-void wxGLContext::SetColour(const char *colour)
+void wxGLContext::SetColour(const wxChar *colour)
 {
   float r = 0.0;
   float g = 0.0;
@@ -293,10 +293,6 @@ bool wxGLCanvas::Create(wxWindow *parent,
   parent->AddChild(this);
 
   DWORD msflags = 0;
-  if ( style & wxBORDER )
-    msflags |= WS_BORDER;
-  if ( style & wxTHICK_FRAME )
-    msflags |= WS_THICKFRAME;
 
   /*
   A general rule with OpenGL and Win32 is that any window that will have a
@@ -305,18 +301,9 @@ bool wxGLCanvas::Create(wxWindow *parent,
   books that contain the wgl function descriptions.
   */
 
+  WXDWORD exStyle = 0;
   msflags |= WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN;
-
-  bool want3D;
-  WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D);
-
-  // 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;
-  }
+  msflags |= MSWGetStyle(style, & exStyle) ;
 
   return MSWCreate(wxGLCanvasClassName, NULL, pos, size, msflags, exStyle);
 }
@@ -522,7 +509,7 @@ void wxGLCanvas::SetCurrent()
   }
 }
 
-void wxGLCanvas::SetColour(const char *colour)
+void wxGLCanvas::SetColour(const wxChar *colour)
 {
   if (m_glContext)
     m_glContext->SetColour(colour);