Commented out XSetInputFocus for now

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

diff --git a/include/wx/mgl/window.h b/include/wx/mgl/window.h
index 5bf12728de000e9bb2990bba37fb64ed6bd90382..2299608df76b60cd813e845e09198c613de5adbf 100644 (file)
--- a/include/wx/mgl/window.h
+++ b/include/wx/mgl/window.h
@@ -62,8 +62,6 @@ public:
     virtual bool Reparent(wxWindowBase *newParent);
 
     virtual void WarpPointer(int x, int y);
     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);
 
     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; }
 #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
     // --------------------------


@@ -126,11 +126,16 @@ protected:
                            int sizeFlags = wxSIZE_AUTO);
     virtual void DoSetClientSize(int width, int height);
 
                            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);
     // 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
 
 private:
     // common part of all ctors


@@ -141,8 +146,8 @@ private:
     MGLDevCtx *m_paintMGLDC;
     friend class wxPaintDC;
 
     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:
     DECLARE_EVENT_TABLE()
 
 public: