X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/058d7af6e9b471dc9b2a60bedd60ee9c8f682936..41d0b41d6873cb50b7b025beb0cf9476d680004c:/src/cocoa/control.mm

diff --git a/src/cocoa/control.mm b/src/cocoa/control.mm
index fe1ccaa7b5..afceba12cb 100644
--- a/src/cocoa/control.mm
+++ b/src/cocoa/control.mm
@@ -1,22 +1,27 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        cocoa/control.mm
+// Name:        src/cocoa/control.mm
 // Purpose:     wxControl class
 // Author:      David Elliiott
 // Modified by:
 // Created:     2003/02/15
-// RCS-ID:      $Id: 
+// RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
-// Licence:   	wxWindows license
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
+
+#include "wx/control.h"
+
 #ifndef WX_PRECOMP
-    #include "wx/defs.h"
-    #include "wx/control.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/NSCell.h>
@@ -24,22 +29,6 @@
 
 #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)
 END_EVENT_TABLE()
@@ -54,17 +43,18 @@ bool wxControl::Create(wxWindow *parent, wxWindowID winid,
         return false;
     wxLogTrace(wxTRACE_COCOA,wxT("Created control with id=%d"),GetId());
     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];
 
-    [GetNSControl() sizeToFit];
-
     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;
 }
 
@@ -79,32 +69,23 @@ wxSize wxControl::DoGetBestSize() const
     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([GetNSControl() respondsToSelector:@selector(cell)])
+        cell = [GetNSControl() cell];
     if(cell)
     {
         NSSize cellSize = [cell cellSize];
-        wxSize size((int)ceilf(cellSize.width),(int)ceilf(cellSize.height));
+        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];
-    bool didFit = false;
-NS_DURING
-    [GetNSControl() sizeToFit];
-    didFit = true;
-NS_HANDLER
-    // TODO: if anything other than method not implemented, re-raise
-NS_ENDHANDLER
-    if(didFit)
+    if([GetNSControl() respondsToSelector:@selector(sizeToFit)])
     {
+        NSRect storedRect = [m_cocoaNSView frame];
+        [GetNSControl() sizeToFit];
         NSRect cocoaRect = [m_cocoaNSView frame];
-        wxSize size((int)ceilf(cocoaRect.size.width),(int)ceilf(cocoaRect.size.height));
+        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;
@@ -116,11 +97,17 @@ NS_ENDHANDLER
 
 bool wxControl::ProcessCommand(wxCommandEvent& event)
 {
-    return GetEventHandler()->ProcessEvent(event);
+    return HandleWindowEvent(event);
 }
 
 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))];
 }