fix the definition of many static functions marked as 'const' or functions which...

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

diff --git a/src/cocoa/control.mm b/src/cocoa/control.mm
index 3bb9b1b29fd4e14cddc9d43a6d12aff349cb7363..afceba12cb097e4bc8be284f664ab7f8c7dd1664 100644 (file)
--- a/src/cocoa/control.mm
+++ b/src/cocoa/control.mm
@@ -18,6 +18,10 @@
 #endif
 
 #include "wx/cocoa/autorelease.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>
 
 #import <AppKit/NSControl.h>
 #import <AppKit/NSCell.h>


@@ -25,22 +29,6 @@
 
 #include <math.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)
 END_EVENT_TABLE()
 IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)
 BEGIN_EVENT_TABLE(wxControl, wxControlBase)
 END_EVENT_TABLE()


@@ -55,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;
         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];
 
     // 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;
 }
 


@@ -80,11 +69,8 @@ wxSize wxControl::DoGetBestSize() const
     wxASSERT(GetNSControl());
     /* We can ask single-celled controls for their cell and get its size */
     NSCell *cell = nil;
     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];
     if(cell)
     {
         NSSize cellSize = [cell cellSize];


@@ -94,16 +80,10 @@ NS_ENDHANDLER
     }
 
     /* multi-celled control? size to fit, get the size, then set it back */
     }
 
     /* 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)ceil(cocoaRect.size.width),(int)ceil(cocoaRect.size.height));
         [m_cocoaNSView setFrame: storedRect];
         NSRect cocoaRect = [m_cocoaNSView frame];
         wxSize size((int)ceil(cocoaRect.size.width),(int)ceil(cocoaRect.size.height));
         [m_cocoaNSView setFrame: storedRect];


@@ -117,10 +97,17 @@ NS_ENDHANDLER
 
 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))];

 }
 }

+