Fix wxPropertyGrid::GetPropertyRect when the last item is collapsed.

[wxWidgets.git] / include / wx / cocoa / window.h

diff --git a/include/wx/cocoa/window.h b/include/wx/cocoa/window.h
index 91e6fd0082c34215bf65ca432ed42d0a34f10d74..a060f378929a4eea790cc586fc3a3dad571fad42 100644 (file)
--- a/include/wx/cocoa/window.h
+++ b/include/wx/cocoa/window.h
@@ -4,7 +4,6 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2002/12/26
-// RCS-ID:      $Id$
 // Copyright:   (c) 2002 David Elliott
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -43,10 +42,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 +172,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;