A few tweaks and cleanups

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

diff --git a/include/wx/mgl/window.h b/include/wx/mgl/window.h
index 6fc01f5d827915be797e37bcdf189110d5370192..7b99981b6c41374b0ed80cb1d8aa27db21ce239d 100644 (file)
--- a/include/wx/mgl/window.h
+++ b/include/wx/mgl/window.h
@@ -3,7 +3,7 @@
 // Purpose:     wxWindow class
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
-// Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
+// Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -62,8 +62,6 @@ public:
     virtual bool Reparent(wxWindowBase *newParent);
 
     virtual void WarpPointer(int x, int y);
-    virtual void CaptureMouse();
-    virtual void ReleaseMouse();
 
     virtual void Refresh(bool eraseBackground = TRUE,
                          const wxRect *rect = (const wxRect *) NULL);
@@ -102,6 +100,8 @@ public:
 #endif // WXWIN_COMPATIBILITY
 
     virtual WXWidget GetHandle() const { return m_wnd; }
+    
+    void SetMGLwindow_t(struct window_t *wnd);
 
     // implementation from now on
     // --------------------------
@@ -111,8 +111,8 @@ protected:
     struct window_t      *m_wnd;
     // whether there should be wxEraseEvent before wxPaintEvent or not
     // (see wxWindow::Refresh)
-    bool                  m_frozen;
-    bool                  m_refreshAfterThaw;
+    bool                  m_frozen:1;
+    bool                  m_refreshAfterThaw:1;
     int                   m_eraseBackground;
 
     // implement the base class pure virtuals
@@ -126,11 +126,16 @@ protected:
                            int sizeFlags = wxSIZE_AUTO);
     virtual void DoSetClientSize(int width, int height);
 
+    virtual void DoCaptureMouse();
+    virtual void DoReleaseMouse();
+
     // move the window to the specified location and resize it: this is called
     // from both DoSetSize() and DoSetClientSize() and would usually just call
     // ::MoveWindow() except for composite controls which will want to arrange
     // themselves inside the given rectangle
     virtual void DoMoveWindow(int x, int y, int width, int height);
+    
+    void OnIdle(wxIdleEvent& event);
 
 private:
     // common part of all ctors
@@ -141,8 +146,8 @@ private:
     MGLDevCtx *m_paintMGLDC;
     friend class wxPaintDC;
 
-    DECLARE_DYNAMIC_CLASS(wxWindowMGL);
-    DECLARE_NO_COPY_CLASS(wxWindowMGL);
+    DECLARE_DYNAMIC_CLASS(wxWindowMGL)
+    DECLARE_NO_COPY_CLASS(wxWindowMGL)
     DECLARE_EVENT_TABLE()
 
 public: