supporting clang memory management annotations

[wxWidgets.git] / include / wx / msw / glcanvas.h

diff --git a/include/wx/msw/glcanvas.h b/include/wx/msw/glcanvas.h
index dba1cba083b280efa3976aea8ff5a3d6ac1cad48..ba8388d35df8c3bf2a6bca1f19806450bd0887e6 100644 (file)
--- a/include/wx/msw/glcanvas.h
+++ b/include/wx/msw/glcanvas.h
@@ -134,15 +134,23 @@ protected:
     // common part of all ctors
     void Init();
 
     // common part of all ctors
     void Init();
 

+    // the real window creation function, Create() may reuse it twice as we may
+    // need to create an OpenGL window to query the available extensions and
+    // then potentially delete and recreate it with another pixel format
+    bool CreateWindow(wxWindow *parent,
+                      wxWindowID id = wxID_ANY,
+                      const wxPoint& pos = wxDefaultPosition,
+                      const wxSize& size = wxDefaultSize,
+                      long style = 0,
+                      const wxString& name = wxGLCanvasName);
+

     // set up the pixel format using the given attributes and palette
     // set up the pixel format using the given attributes and palette

-    bool DoSetup(const int *attribList);
+    int DoSetup(PIXELFORMATDESCRIPTOR &pfd, const int *attribList);

 
 
     // HDC for this window, we keep it all the time
     HDC m_hDC;
 
 
 
     // HDC for this window, we keep it all the time
     HDC m_hDC;
 

-    void wxGLCanvas::DestroyWindowPFD(wxWindow *parent);
-

 private:
     DECLARE_EVENT_TABLE()
     DECLARE_CLASS(wxGLCanvas)
 private:
     DECLARE_EVENT_TABLE()
     DECLARE_CLASS(wxGLCanvas)