libpng vulnerability CAN-2004-0421

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

diff --git a/src/cocoa/gauge.mm b/src/cocoa/gauge.mm
index aafc5b6b76a717d373b79f18f5c24bb19d89aa5f..92978f94bd142775e37f43f2d273d2c181de16e4 100644 (file)
--- a/src/cocoa/gauge.mm
+++ b/src/cocoa/gauge.mm
@@ -9,13 +9,21 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#include "wx/setup.h"
+#include "wx/wxprec.h"

 #if wxUSE_GAUGE
 
 #if wxUSE_GAUGE
 

-#include "wx/app.h"
-#include "wx/gauge.h"
+#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 <AppKit/NSProgressIndicator.h>

+#import <Foundation/NSException.h>
+
+#include <math.h>

 
 IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl)
 BEGIN_EVENT_TABLE(wxGauge, wxGaugeBase)
 
 IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl)
 BEGIN_EVENT_TABLE(wxGauge, wxGaugeBase)


@@ -30,6 +38,10 @@ bool wxGauge::Create(wxWindow *parent, wxWindowID winid, int range,
         return false;
     SetNSView([[NSProgressIndicator alloc] initWithFrame: MakeDefaultNSRect(size)]);
     [m_cocoaNSView release];
         return false;
     SetNSView([[NSProgressIndicator alloc] initWithFrame: MakeDefaultNSRect(size)]);
     [m_cocoaNSView release];

+
+    [(NSProgressIndicator*)m_cocoaNSView setMaxValue:range];
+    [(NSProgressIndicator*)m_cocoaNSView setIndeterminate:NO];
+

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


@@ -41,4 +53,52 @@ wxGauge::~wxGauge()
 {
 }
 
 {
 }
 

+int wxGauge::GetValue() const
+{
+    return (int)[(NSProgressIndicator*)m_cocoaNSView doubleValue];
+}
+
+void wxGauge::SetValue(int value)
+{
+    [(NSProgressIndicator*)m_cocoaNSView setDoubleValue:value];
+}
+
+int wxGauge::GetRange() const
+{
+    return (int)[(NSProgressIndicator*)m_cocoaNSView maxValue];
+}
+
+void wxGauge::SetRange(int maxValue)
+{
+    [(NSProgressIndicator*)m_cocoaNSView setMinValue:0.0];
+    [(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
 #endif // wxUSE_GAUGE