No real changes, just replace -1 with wxNOT_FOUND in wxBookCtrl code.

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

diff --git a/src/cocoa/control.mm b/src/cocoa/control.mm
index c8215a75f50cbfcabf55ff9cc189b23bcd49a12c..0843809c89649ca5c086397d141257e76aa7ec68 100644 (file)
--- a/src/cocoa/control.mm
+++ b/src/cocoa/control.mm
@@ -1,40 +1,33 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// 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:     wxWindows 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"
     #include "wx/log.h"
 #endif
 
 #include "wx/cocoa/autorelease.h"

+#include "wx/cocoa/string.h"
+#include "wx/cocoa/trackingrectmanager.h"
+#include "wx/cocoa/objc/objc_uniquifying.h"
+#include "wx/cocoa/objc/NSView.h"

 
 #import <AppKit/NSControl.h>
 
 #import <AppKit/NSControl.h>

+#import <AppKit/NSCell.h>
+#import <Foundation/NSException.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
+#include <math.h>

 
 IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)
 BEGIN_EVENT_TABLE(wxControl, wxControlBase)
 
 IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)
 BEGIN_EVENT_TABLE(wxControl, wxControlBase)


@@ -45,22 +38,23 @@ 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(wxT("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(wxT("Created control with id=%d"),GetId());
+    wxLogTrace(wxTRACE_COCOA,wxT("Created control with id=%d"),GetId());

     m_cocoaNSView = NULL;
     m_cocoaNSView = NULL;

-    SetNSControl([[wxNonControlNSControl alloc] initWithFrame: MakeDefaultNSRect(size)]);
+    SetNSControl([[WX_GET_OBJC_CLASS(WXNSView) 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];
 
     // NOTE: YES we want to release this (to match the alloc).
     // DoAddChild(this) will retain us again since addSubView doesn't.
     [m_cocoaNSView release];
 

-    [GetNSControl() sizeToFit];
-

     if(m_parent)
         m_parent->CocoaAddChild(this);
     SetInitialFrameRect(pos,size);
 
     if(m_parent)
         m_parent->CocoaAddChild(this);
     SetInitialFrameRect(pos,size);
 

+    // Controls should have a viewable-area tracking rect by default
+    m_visibleTrackingRectManager = new wxCocoaTrackingRectManager(this);
+

     return true;
 }
 
     return true;
 }
 


@@ -72,23 +66,48 @@ wxControl::~wxControl()
 wxSize wxControl::DoGetBestSize() const
 {
     wxAutoNSAutoreleasePool pool;
 wxSize wxControl::DoGetBestSize() const
 {
     wxAutoNSAutoreleasePool pool;

-    wxASSERT(m_cocoaNSView);
-    NSRect storedRect = [m_cocoaNSView frame];
-    [GetNSControl() sizeToFit];
-    NSRect cocoaRect = [m_cocoaNSView frame];
-    wxSize size((int)cocoaRect.size.width+10,(int)cocoaRect.size.height);
-    [m_cocoaNSView setFrame: storedRect];
-    wxLogDebug(wxT("wxControl=%p::DoGetBestSize()==(%d,%d)"),this,size.x,size.y);
-    return size;
+    wxASSERT(GetNSControl());
+    /* We can ask single-celled controls for their cell and get its size */
+    NSCell *cell = nil;
+    if([GetNSControl() respondsToSelector:@selector(cell)])
+        cell = [GetNSControl() cell];
+    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 */
+    if([GetNSControl() respondsToSelector:@selector(sizeToFit)])
+    {
+        NSRect storedRect = [m_cocoaNSView frame];
+        [GetNSControl() sizeToFit];
+        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)
 {

-    return GetEventHandler()->ProcessEvent(event);
+    return HandleWindowEvent(event);

 }
 
 void wxControl::CocoaSetEnabled(bool enable)
 {
 }
 
 void wxControl::CocoaSetEnabled(bool enable)
 {

-    [GetNSControl() setEnabled: enable];
+    if([GetNSControl() respondsToSelector:@selector(setEnabled:)])
+        [GetNSControl() setEnabled: enable];
+}
+
+/*static*/ void wxControl::CocoaSetLabelForObject(const wxString& label, struct objc_object *aView)
+{
+    [aView setTitle:wxNSStringWithWxString(GetLabelText(label))];

 }
 
 }