compilation warning (and possible bug) fix

[wxWidgets.git] / include / wx / mgl / window.h

diff --git a/include/wx/mgl/window.h b/include/wx/mgl/window.h
index bb3e2792b64c4276791c04bbc83bad0df63363a3..51bc37f24c4b3d97c224314b3cdfffb9805b8c8d 100644 (file)
--- a/include/wx/mgl/window.h
+++ b/include/wx/mgl/window.h
@@ -102,7 +102,8 @@ public:
 #endif // WXWIN_COMPATIBILITY
 
     virtual WXWidget GetHandle() const { return m_wnd; }
 #endif // WXWIN_COMPATIBILITY
 
     virtual WXWidget GetHandle() const { return m_wnd; }

-
+    
+    void SetMGLwindow_t(struct window_t *wnd);

 
     // implementation from now on
     // --------------------------
 
     // implementation from now on
     // --------------------------


@@ -112,9 +113,9 @@ protected:
     struct window_t      *m_wnd;
     // whether there should be wxEraseEvent before wxPaintEvent or not
     // (see wxWindow::Refresh)
     struct window_t      *m_wnd;
     // whether there should be wxEraseEvent before wxPaintEvent or not
     // (see wxWindow::Refresh)

-    bool                  m_frozen;
-    bool                  m_refreshAfterThaw;
-    wxFont                m_font;
+    bool                  m_frozen:1;
+    bool                  m_refreshAfterThaw:1;
+    int                   m_eraseBackground;

 
     // implement the base class pure virtuals
     virtual void DoClientToScreen( int *x, int *y ) const;
 
     // implement the base class pure virtuals
     virtual void DoClientToScreen( int *x, int *y ) const;


@@ -142,9 +143,6 @@ private:
     MGLDevCtx *m_paintMGLDC;
     friend class wxPaintDC;
 
     MGLDevCtx *m_paintMGLDC;
     friend class wxPaintDC;
 

-    void OnEraseBackground(wxEraseEvent& event);
-    void OnSetFocus(wxFocusEvent& event);
-

     DECLARE_DYNAMIC_CLASS(wxWindowMGL);
     DECLARE_NO_COPY_CLASS(wxWindowMGL);
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxWindowMGL);
     DECLARE_NO_COPY_CLASS(wxWindowMGL);
     DECLARE_EVENT_TABLE()


@@ -152,6 +150,7 @@ private:
 public:
     void HandlePaint(MGLDevCtx *dc);
     // needed by wxWindowPainter
 public:
     void HandlePaint(MGLDevCtx *dc);
     // needed by wxWindowPainter

+    MGLDevCtx *GetPaintMGLDC() const { return m_paintMGLDC; }

 };
 
 
 };