applied wxDirSelector() patch and regenerated the makefiles to include the new src...

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

diff --git a/include/wx/mgl/window.h b/include/wx/mgl/window.h
index bb3e2792b64c4276791c04bbc83bad0df63363a3..5bf12728de000e9bb2990bba37fb64ed6bd90382 100644 (file)
--- a/include/wx/mgl/window.h
+++ b/include/wx/mgl/window.h
@@ -103,7 +103,6 @@ public:
 
     virtual WXWidget GetHandle() const { return m_wnd; }
 
-
     // implementation from now on
     // --------------------------
 
@@ -112,9 +111,9 @@ protected:
     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;
@@ -142,9 +141,6 @@ private:
     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()
@@ -152,6 +148,7 @@ private:
 public:
     void HandlePaint(MGLDevCtx *dc);
     // needed by wxWindowPainter
+    MGLDevCtx *GetPaintMGLDC() const { return m_paintMGLDC; }
 };