This should make the GTK statictext control wrap

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

diff --git a/src/cocoa/gauge.mm b/src/cocoa/gauge.mm
index 977de167adb76c63d295e66c3fe4c58355bfedb4..1769e1062fdb8c553c02c6cf82c0ddd355ec1e34 100644 (file)
--- a/src/cocoa/gauge.mm
+++ b/src/cocoa/gauge.mm
@@ -6,7 +6,7 @@
 // Created:     2003/07/15
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
-// Licence:    wxWindows licence
+// Licence:    wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
@@ -15,9 +15,15 @@
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/gauge.h"
+    #include "wx/log.h"
 #endif //WX_PRECOMP
 
+#include "wx/cocoa/autorelease.h"
+
 #import <AppKit/NSProgressIndicator.h>
+#import <Foundation/NSException.h>
+
+#include <math.h>
 
 IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl)
 BEGIN_EVENT_TABLE(wxGauge, wxGaugeBase)
@@ -49,7 +55,7 @@ wxGauge::~wxGauge()
 
 int wxGauge::GetValue() const
 {
-    return [(NSProgressIndicator*)m_cocoaNSView doubleValue];
+    return (int)[(NSProgressIndicator*)m_cocoaNSView doubleValue];
 }
 
 void wxGauge::SetValue(int value)
@@ -59,7 +65,7 @@ void wxGauge::SetValue(int value)
 
 int wxGauge::GetRange() const
 {
-    return [(NSProgressIndicator*)m_cocoaNSView maxValue];
+    return (int)[(NSProgressIndicator*)m_cocoaNSView maxValue];
 }
 
 void wxGauge::SetRange(int maxValue)
@@ -68,4 +74,31 @@ void wxGauge::SetRange(int maxValue)
     [(NSProgressIndicator*)m_cocoaNSView setMaxValue:maxValue];
 }
 
+// NSProgressIndicator is not an NSControl but does respond to
+// sizeToFit on OS X >= 10.2
+wxSize wxGauge::DoGetBestSize() const
+{
+    wxAutoNSAutoreleasePool pool;
+    wxASSERT(GetNSProgressIndicator());
+    NSRect storedRect = [m_cocoaNSView frame];
+    bool didFit = false;
+NS_DURING
+    [GetNSProgressIndicator() sizeToFit];
+    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)ceilf(cocoaRect.size.width),(int)ceilf(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 /*wxConstCast(this, wxControl)->m_bestSize =*/ size;
+    }
+    // Cocoa can't tell us the size
+    float height = NSProgressIndicatorPreferredAquaThickness;
+    return wxSize((int)(height*2),(int)height);
+}
+
 #endif // wxUSE_GAUGE