Removed all outdated makefile.dos and their *.msc include.

[wxWidgets.git] / src / cocoa / control.mm

diff --git a/src/cocoa/control.mm b/src/cocoa/control.mm
index c83fa93dab34f435b4612e6c60bf11013e1aa129..3bb9b1b29fd4e14cddc9d43a6d12aff349cb7363 100644 (file)
--- a/src/cocoa/control.mm
+++ b/src/cocoa/control.mm
@@ -1,24 +1,29 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        cocoa/control.mm
+// Name:        src/cocoa/control.mm

 // Purpose:     wxControl class
 // Author:      David Elliiott
 // Modified by:
 // Created:     2003/02/15
 // Purpose:     wxControl class
 // Author:      David Elliiott
 // Modified by:
 // Created:     2003/02/15

-// RCS-ID:      $Id: 
+// RCS-ID:      $Id$

 // Copyright:   (c) 2003 David Elliott
 // Copyright:   (c) 2003 David Elliott

-// Licence:    wxWindows license
+// Licence:     wxWidgets licence

 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"

+
+#include "wx/control.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-    #include "wx/defs.h"
-    #include "wx/control.h"

     #include "wx/log.h"
 #endif
 
 #include "wx/cocoa/autorelease.h"
 
 #import <AppKit/NSControl.h>
     #include "wx/log.h"
 #endif
 
 #include "wx/cocoa/autorelease.h"
 
 #import <AppKit/NSControl.h>

+#import <AppKit/NSCell.h>
+#import <Foundation/NSException.h>
+
+#include <math.h>

 
 @interface wxNonControlNSControl : NSControl
 {
 
 @interface wxNonControlNSControl : NSControl
 {


@@ -45,10 +50,10 @@ bool wxControl::Create(wxWindow *parent, wxWindowID winid,
             const wxPoint& pos, const wxSize& size, long style,
             const wxValidator& validator, const wxString& name)
 {
             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;
     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([[wxNonControlNSControl alloc] initWithFrame: MakeDefaultNSRect(size)]);
     // NOTE: YES we want to release this (to match the alloc).
     m_cocoaNSView = NULL;
     SetNSControl([[wxNonControlNSControl alloc] initWithFrame: MakeDefaultNSRect(size)]);
     // NOTE: YES we want to release this (to match the alloc).


@@ -72,14 +77,42 @@ wxControl::~wxControl()
 wxSize wxControl::DoGetBestSize() const
 {
     wxAutoNSAutoreleasePool pool;
 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)ceil(cellSize.width),(int)ceil(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];
     NSRect storedRect = [m_cocoaNSView frame];

+    bool didFit = false;
+NS_DURING

     [GetNSControl() sizeToFit];
     [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)ceil(cocoaRect.size.width),(int)ceil(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)
 }
 
 bool wxControl::ProcessCommand(wxCommandEvent& event)


@@ -91,4 +124,3 @@ void wxControl::CocoaSetEnabled(bool enable)
 {
     [GetNSControl() setEnabled: enable];
 }
 {
     [GetNSControl() setEnabled: enable];
 }

-