X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c5172ed1bf56c880c4ae928eae4da21c402a2ba3..c0b0635cf69537ca32377bad5650b39402cb21b6:/src/cocoa/control.mm

diff --git a/src/cocoa/control.mm b/src/cocoa/control.mm
index fac6d2831d..b474911ec2 100644
--- a/src/cocoa/control.mm
+++ b/src/cocoa/control.mm
@@ -6,7 +6,7 @@
 // Created:     2003/02/15
 // RCS-ID:      $Id: 
 // Copyright:   (c) 2003 David Elliott
-// Licence:   	wxWindows license
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
@@ -19,6 +19,26 @@
 #include "wx/cocoa/autorelease.h"
 
 #import <AppKit/NSControl.h>
+#import <AppKit/NSCell.h>
+#import <Foundation/NSException.h>
+
+#include <math.h>
+
+@interface wxNonControlNSControl : NSControl
+{
+}
+
+- (void)drawRect: (NSRect)rect;
+@end // wxNonControlNSControl
+
+@implementation wxNonControlNSControl : NSControl
+- (void)drawRect: (NSRect)rect
+{
+    wxCocoaNSView *win = wxCocoaNSView::GetFromCocoa(self);
+    if( !win || !win->Cocoa_drawRect(rect) )
+        [super drawRect:rect];
+}
+@end // wxNonControlNSControl
 
 IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)
 BEGIN_EVENT_TABLE(wxControl, wxControlBase)
@@ -29,12 +49,12 @@ bool wxControl::Create(wxWindow *parent, wxWindowID winid,
             const wxPoint& pos, const wxSize& size, long style,
             const wxValidator& validator, const wxString& name)
 {
-    wxLogDebug("Creating control with id=%d",winid);
+    wxLogTrace(wxTRACE_COCOA,wxT("Creating control with id=%d"),winid);
     if(!CreateControl(parent,winid,pos,size,style,validator,name))
         return false;
-    wxLogDebug("Created control with id=%d",GetId());
+    wxLogTrace(wxTRACE_COCOA,wxT("Created control with id=%d"),GetId());
     m_cocoaNSView = NULL;
-    SetNSControl([[NSControl alloc] initWithFrame: MakeDefaultNSRect(size)]);
+    SetNSControl([[wxNonControlNSControl alloc] initWithFrame: MakeDefaultNSRect(size)]);
     // NOTE: YES we want to release this (to match the alloc).
     // DoAddChild(this) will retain us again since addSubView doesn't.
     [m_cocoaNSView release];
@@ -50,20 +70,48 @@ bool wxControl::Create(wxWindow *parent, wxWindowID winid,
 
 wxControl::~wxControl()
 {
-    DisassociateNSControl(m_cocoaNSView);
+    DisassociateNSControl(GetNSControl());
 }
 
 wxSize wxControl::DoGetBestSize() const
 {
     wxAutoNSAutoreleasePool pool;
-    wxASSERT(m_cocoaNSView);
+    wxASSERT(GetNSControl());
+    /* We can ask single-celled controls for their cell and get its size */
+    NSCell *cell = nil;
+NS_DURING
+    cell = [GetNSControl() cell];
+NS_HANDLER
+    // TODO: if anything other than method not implemented, re-raise
+NS_ENDHANDLER
+    if(cell)
+    {
+        NSSize cellSize = [cell cellSize];
+        wxSize size((int)ceilf(cellSize.width),(int)ceilf(cellSize.height));
+        wxLogTrace(wxTRACE_COCOA_Window_Size,wxT("wxControl=%p::DoGetBestSize()==(%d,%d) from NSCell"),this,size.x,size.y);
+        return size;
+    }
+
+    /* multi-celled control? size to fit, get the size, then set it back */
     NSRect storedRect = [m_cocoaNSView frame];
+    bool didFit = false;
+NS_DURING
     [GetNSControl() sizeToFit];
-    NSRect cocoaRect = [m_cocoaNSView frame];
-    wxSize size((int)cocoaRect.size.width+10,(int)cocoaRect.size.height);
-    [m_cocoaNSView setFrame: storedRect];
-    wxLogDebug("wxControl=%p::DoGetBestSize()==(%d,%d)",this,size.x,size.y);
-    return size;
+    didFit = true;
+NS_HANDLER
+    // TODO: if anything other than method not implemented, re-raise
+NS_ENDHANDLER
+    if(didFit)
+    {
+        NSRect cocoaRect = [m_cocoaNSView frame];
+        wxSize size((int)ceilf(cocoaRect.size.width),(int)ceilf(cocoaRect.size.height));
+        [m_cocoaNSView setFrame: storedRect];
+        wxLogTrace(wxTRACE_COCOA_Window_Size,wxT("wxControl=%p::DoGetBestSize()==(%d,%d) from sizeToFit"),this,size.x,size.y);
+        return size;
+    }
+    // Cocoa can't tell us the size, probably not an NSControl.
+    wxLogDebug(wxT("Class %s (or superclass still below wxControl) should implement DoGetBestSize()"),GetClassInfo()->GetClassName());
+    return wxControlBase::DoGetBestSize();
 }
 
 bool wxControl::ProcessCommand(wxCommandEvent& event)