Corrected font calculation (use screen resolution now); and check for mask in m_image.cpp

[wxWidgets.git] / utils / glcanvas / win / glcanvas.h

diff --git a/utils/glcanvas/win/glcanvas.h b/utils/glcanvas/win/glcanvas.h
index 186df14fafdf27f5629b61fea3fe91b3a0e82769..9c6dbc746d081ba4efbca6fce7fb2f70bcc8117a 100644 (file)
--- a/utils/glcanvas/win/glcanvas.h
+++ b/utils/glcanvas/win/glcanvas.h
@@ -69,6 +69,12 @@ class wxGLCanvas: public wxScrolledWindow
 {
    DECLARE_CLASS(wxGLCanvas)
  public:
+   wxGLCanvas()
+   {
+       m_glContext = (wxGLContext*) NULL;
+       m_hDC = 0;
+   }
+
    wxGLCanvas(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize, long style = 0,
         const wxString& name = "GLCanvas", int *attribList = 0, const wxPalette& palette = wxNullPalette);
@@ -79,6 +85,10 @@ class wxGLCanvas: public wxScrolledWindow
 
    ~wxGLCanvas();
 
+   // Replaces wxWindow::Create functionality, since we need to use a different window class
+   bool Create(wxWindow *parent, wxWindowID id,
+              const wxPoint& pos, const wxSize& size, long style, const wxString& name);
+
    void SetCurrent();
    void SetColour(const char *colour);
    void SwapBuffers();