X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/53a2db124c633f80bdb16336084262037d879a2c..8e77fd8bca165aab9709649d79a7cbc6a172d4e1:/include/wx/cocoa/window.h diff --git a/include/wx/cocoa/window.h b/include/wx/cocoa/window.h index c0ae13a74d..a7ef55ac17 100644 --- a/include/wx/cocoa/window.h +++ b/include/wx/cocoa/window.h @@ -46,7 +46,7 @@ class wxCocoaTrackingRectManager; 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;