Keep the stock cursors in an array so that constructing a cursor with a stock

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

diff --git a/src/cocoa/control.mm b/src/cocoa/control.mm
index 0e498cb52999f9906973b1b270f0fe69872ed882..9fabb68103e9ccdd44d1480461453423a408a2be 100644 (file)
--- a/src/cocoa/control.mm
+++ b/src/cocoa/control.mm
@@ -18,6 +18,7 @@
 #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/trackingrectmanager.h"
 #include "wx/cocoa/objc/objc_uniquifying.h"
 


@@ -218,11 +219,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];


@@ -232,16 +230,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];


@@ -262,3 +254,9 @@ void wxControl::CocoaSetEnabled(bool enable)
 {
     [GetNSControl() setEnabled: enable];
 }
 {
     [GetNSControl() setEnabled: enable];
 }

+
+/*static*/ void wxControl::CocoaSetLabelForObject(const wxString& label, struct objc_object *aView)
+{
+    [aView setTitle:wxNSStringWithWxString(GetLabelText(label))];
+}
+