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

1. Faster DoGetBestSize for single-cell controls.

Browse Source 
2. Properly handle exceptions so controls which aren't NSControl don't crash.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26687 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Elliott
2004-04-10 03:18:05 +00:00
parent 79e1f224d1
commit 058d7af6e9
1 changed files with 38 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/cocoa/control.mm
View File

@@ -19,6 +19,10 @@
#include "wx/cocoa/autorelease.h" #include "wx/cocoa/autorelease.h"
#import <AppKit/NSControl.h> #import <AppKit/NSControl.h>
#import <AppKit/NSCell.h>
#import <Foundation/NSException.h>
#include <math.h>
@interface wxNonControlNSControl : NSControl @interface wxNonControlNSControl : NSControl
{ {
@@ -72,14 +76,42 @@ wxControl::~wxControl()
wxSize wxControl::DoGetBestSize() const wxSize wxControl::DoGetBestSize() const
{ {
wxAutoNSAutoreleasePool pool; wxAutoNSAutoreleasePool pool;
wxASSERT(m_cocoaNSView); 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(cell)
{
NSSize cellSize = [cell cellSize];
wxSize size((int)ceilf(cellSize.width),(int)ceilf(cellSize.height));
wxLogTrace(wxTRACE_COCOA_Window_Size,wxT("wxControl=%p::DoGetBestSize()==(%d,%d) from NSCell"),this,size.x,size.y);
return size;
}
/* multi-celled control? size to fit, get the size, then set it back */
NSRect storedRect = [m_cocoaNSView frame]; NSRect storedRect = [m_cocoaNSView frame];
bool didFit = false;
NS_DURING
[GetNSControl() sizeToFit]; [GetNSControl() sizeToFit];
NSRect cocoaRect = [m_cocoaNSView frame]; didFit = true;
wxSize size((int)cocoaRect.size.width+10,(int)cocoaRect.size.height); NS_HANDLER
[m_cocoaNSView setFrame: storedRect]; // TODO: if anything other than method not implemented, re-raise
wxLogTrace(wxTRACE_COCOA_Window_Size,wxT("wxControl=%p::DoGetBestSize()==(%d,%d)"),this,size.x,size.y); NS_ENDHANDLER
return size; 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 size;
}
// Cocoa can't tell us the size, probably not an NSControl.
wxLogDebug(wxT("Class %s (or superclass still below wxControl) should implement DoGetBestSize()"),GetClassInfo()->GetClassName());
return wxControlBase::DoGetBestSize();
} }
bool wxControl::ProcessCommand(wxCommandEvent& event) bool wxControl::ProcessCommand(wxCommandEvent& event)