X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/46ae103b9f08fc4e447d16a6a92b03cf55ee3189..77cc73a78e51832c71351a2758df508672b8c294:/include/wx/mgl/window.h diff --git a/include/wx/mgl/window.h b/include/wx/mgl/window.h index 074cc19b5b..f89bfe3bc5 100644 --- a/include/wx/mgl/window.h +++ b/include/wx/mgl/window.h @@ -23,7 +23,7 @@ class MGLDevCtx; // wxWindow declaration for MGL // --------------------------------------------------------------------------- -class WXDLLEXPORT wxWindowMGL : public wxWindowBase +class WXDLLIMPEXP_CORE wxWindowMGL : public wxWindowBase { public: wxWindowMGL() { Init(); } @@ -68,9 +68,6 @@ public: virtual void Refresh(bool eraseBackground = true, const wxRect *rect = (const wxRect *) NULL); virtual void Update(); - virtual void Clear(); - virtual void Freeze(); - virtual void Thaw(); virtual bool SetCursor(const wxCursor &cursor); virtual bool SetFont(const wxFont &font) { m_font = font; return true; } @@ -79,8 +76,8 @@ public: virtual int GetCharWidth() const; virtual void GetTextExtent(const wxString& string, int *x, int *y, - int *descent = (int *) NULL, - int *externalLeading = (int *) NULL, + int *descent = NULL, + int *externalLeading = NULL, const wxFont *theFont = (const wxFont *) NULL) const; @@ -101,11 +98,14 @@ public: void OnInternalIdle(); protected: + virtual void DoFreeze(); + virtual void DoThaw(); + + // the window handle struct window_t *m_wnd; // whether there should be wxEraseEvent before wxPaintEvent or not // (see wxWindow::Refresh) - bool m_frozen:1; bool m_refreshAfterThaw:1; int m_eraseBackground;