Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implement a reasonable DoGetBestSize (NSProgressIndicator is not an NSControl)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26689 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Elliott
2004-04-10 03:23:41 +00:00
parent 9a165f54b9
commit 15bc1a64a8
2 changed files with 39 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/cocoa/gauge.h
View File

@@ -14,6 +14,8 @@
// #include "wx/cocoa/NSProgressIndicator.h" // #include "wx/cocoa/NSProgressIndicator.h"
DECLARE_WXCOCOA_OBJC_CLASS(NSProgressIndicator);
// ======================================================================== // ========================================================================
// wxGauge // wxGauge
// ======================================================================== // ========================================================================
@@ -48,6 +50,8 @@ public:
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
// Cocoa callbacks // Cocoa callbacks
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
public:
inline WX_NSProgressIndicator GetNSProgressIndicator() const { return (WX_NSProgressIndicator)m_cocoaNSView; }
protected: protected:
// NSProgressIndicator cannot be enabled/disabled // NSProgressIndicator cannot be enabled/disabled
virtual void CocoaSetEnabled(bool enable) { } virtual void CocoaSetEnabled(bool enable) { }
@@ -62,6 +66,8 @@ public:
// retrieve/change the range // retrieve/change the range
virtual void SetRange(int maxValue); virtual void SetRange(int maxValue);
int GetRange(void) const; int GetRange(void) const;
protected:
virtual wxSize DoGetBestSize() const;
}; };
#endif // __WX_COCOA_GAUGE_H__ #endif // __WX_COCOA_GAUGE_H__

33
src/cocoa/gauge.mm
View File

@@ -15,9 +15,15 @@
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/app.h" #include "wx/app.h"
#include "wx/gauge.h" #include "wx/gauge.h"
#include "wx/log.h"
#endif //WX_PRECOMP #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) IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl)
BEGIN_EVENT_TABLE(wxGauge, wxGaugeBase) BEGIN_EVENT_TABLE(wxGauge, wxGaugeBase)
@@ -68,4 +74,31 @@ void wxGauge::SetRange(int maxValue)
[(NSProgressIndicator*)m_cocoaNSView setMaxValue: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 #endif // wxUSE_GAUGE