X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/17808a759627b03c2acbe7333dd2386557e1b804..2d14a14c573db4b8f8959b1460a269cf23defbcf:/include/wx/mgl/window.h?ds=sidebyside diff --git a/include/wx/mgl/window.h b/include/wx/mgl/window.h index 738bc927fb..409197a61e 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(); } @@ -76,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; @@ -139,7 +139,7 @@ private: friend class wxPaintDC; DECLARE_DYNAMIC_CLASS(wxWindowMGL) - DECLARE_NO_COPY_CLASS(wxWindowMGL) + wxDECLARE_NO_COPY_CLASS(wxWindowMGL); DECLARE_EVENT_TABLE() public: