fixed Carbon compilation; call HID keyboard dtor for Darwin

[wxWidgets.git] / src / generic / treectlg.cpp

diff --git a/src/generic/treectlg.cpp b/src/generic/treectlg.cpp
index 2065d971d1f9fc4e8cf0e4ce80e92001e48a5dcc..b733643760a81c3fcac5f3891b7a6a1063b02dfb 100644 (file)
--- a/src/generic/treectlg.cpp
+++ b/src/generic/treectlg.cpp
@@ -376,10 +376,11 @@ wxTreeTextCtrl::wxTreeTextCtrl(wxGenericTreeCtrl *owner,
     x += image_w;
     w -= image_w + 4;
 #ifdef __WXMAC__
+    wxSize bs = DoGetBestSize() ;
     // edit control height
-    if ( h > 22 - 8 )
+    if ( h > bs.y - 8 )
     {
-        int diff = h - ( 22 - 8 ) ;
+        int diff = h - ( bs.y - 8 ) ;
         h -= diff ;
         y += diff / 2 ;
     }