X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8e33de15b5d050e5c3a781e6f1ec059405f72c9b..43ff861df48f0837dac98005dd397c5f127ca136:/include/wx/cocoa/window.h diff --git a/include/wx/cocoa/window.h b/include/wx/cocoa/window.h index 91e6fd0082..a7ef55ac17 100644 --- a/include/wx/cocoa/window.h +++ b/include/wx/cocoa/window.h @@ -43,10 +43,10 @@ class wxCocoaTrackingRectManager; // ======================================================================== // wxWindowCocoa // ======================================================================== -class WXDLLEXPORT wxWindowCocoa: public wxWindowBase, protected wxCocoaNSView +class WXDLLIMPEXP_CORE wxWindowCocoa: public wxWindowBase, protected wxCocoaNSView { DECLARE_DYNAMIC_CLASS(wxWindowCocoa) - DECLARE_NO_COPY_CLASS(wxWindowCocoa) + wxDECLARE_NO_COPY_CLASS(wxWindowCocoa); DECLARE_EVENT_TABLE() friend wxWindow *wxWindowBase::GetCapture(); friend class wxWindowCocoaScrollView; @@ -173,7 +173,7 @@ public: // Get character size virtual int GetCharHeight() const; virtual int GetCharWidth() const; - virtual void GetTextExtent(const wxString& string, int *x, int *y, + virtual void DoGetTextExtent(const wxString& string, int *x, int *y, int *descent = NULL, int *externalLeading = NULL, const wxFont *theFont = NULL) const;