X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a467ac36a568c8ed1c43604fd7f1f2b2d3b6efc2..376e1129f716901418d40b4cf2959e888a13a2c5:/include/wx/mgl/window.h diff --git a/include/wx/mgl/window.h b/include/wx/mgl/window.h index d507ca3689..053f038c70 100644 --- 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 void CaptureMouse(); - virtual void ReleaseMouse(); virtual void Refresh(bool eraseBackground = TRUE, const wxRect *rect = (const wxRect *) NULL); @@ -102,22 +100,20 @@ public: #endif // WXWIN_COMPATIBILITY virtual WXWidget GetHandle() const { return m_wnd; } - - virtual void SetTitle(const wxString& title) { m_title = title; } - virtual wxString GetTitle() const { return m_title; } + + void SetMGLwindow_t(struct window_t *wnd); // implementation from now on // -------------------------- protected: - wxString m_title; // the window handle 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; @@ -130,6 +126,9 @@ 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 @@ -145,16 +144,14 @@ 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_DYNAMIC_CLASS(wxWindowMGL) + DECLARE_NO_COPY_CLASS(wxWindowMGL) DECLARE_EVENT_TABLE() public: void HandlePaint(MGLDevCtx *dc); // needed by wxWindowPainter + MGLDevCtx *GetPaintMGLDC() const { return m_paintMGLDC; } };