#4479: wx.ComboBox needs a SetFont method

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

diff --git a/include/wx/msw/glcanvas.h b/include/wx/msw/glcanvas.h
index 83362b016709f53e2a6c1dc17ae7c7f1e4ad9a8c..dba1cba083b280efa3976aea8ff5a3d6ac1cad48 100644 (file)
--- a/include/wx/msw/glcanvas.h
+++ b/include/wx/msw/glcanvas.h
@@ -28,7 +28,7 @@ public:
     wxGLContext(wxGLCanvas *win, const wxGLContext* other = NULL);
     virtual ~wxGLContext();
 
-    virtual void SetCurrent(const wxGLCanvas& win) const;
+    virtual bool SetCurrent(const wxGLCanvas& win) const;
 
     HGLRC GetGLRC() const { return m_glContext; }
 
@@ -46,6 +46,7 @@ private:
 class WXDLLIMPEXP_GL wxGLCanvas : public wxGLCanvasBase
 {
 public:
+    wxEXPLICIT // avoid implicitly converting a wxWindow* to wxGLCanvas
     wxGLCanvas(wxWindow *parent,
                wxWindowID id = wxID_ANY,
                const int *attribList = NULL,
@@ -67,7 +68,7 @@ public:
     virtual ~wxGLCanvas();
 
     // implement wxGLCanvasBase methods
-    virtual void SwapBuffers();
+    virtual bool SwapBuffers();
 
 
     // MSW-specific helpers
@@ -140,10 +141,11 @@ protected:
     // 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)
 };
 
 #endif // _WX_GLCANVAS_H_
-