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

Implement the wxST_NO_AUTORESIZE style for wxStaticText.

Browse Source 
Copyright 2007 Software 2000 Ltd.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47957 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Elliott
2007-08-08 04:34:15 +00:00
parent c59112bba5
commit e2b497f7a6
1 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/cocoa/stattext.mm
View File

@@ -82,22 +82,26 @@ void wxStaticText::SetLabel(const wxString& label)
[GetNSTextField() setStringValue:wxNSStringWithWxString(GetLabelText(label))]; [GetNSTextField() setStringValue:wxNSStringWithWxString(GetLabelText(label))];
NSRect oldFrameRect = [GetNSTextField() frame]; NSRect oldFrameRect = [GetNSTextField() frame];
NSView *superview = [GetNSTextField() superview]; NSView *superview = [GetNSTextField() superview];
wxLogTrace(wxTRACE_COCOA_Window_Size, wxT("wxStaticText::SetLabel Old Position: (%d,%d)"), GetPosition().x, GetPosition().y);
[GetNSTextField() sizeToFit];
NSRect newFrameRect = [GetNSTextField() frame];
// Ensure new size is an integer so GetSize returns valid data
newFrameRect.size.height = ceil(newFrameRect.size.height);
newFrameRect.size.width = ceil(newFrameRect.size.width);
if(![superview isFlipped])
{
newFrameRect.origin.y = oldFrameRect.origin.y + oldFrameRect.size.height - newFrameRect.size.height;
}
[GetNSTextField() setFrame:newFrameRect];
// New origin (wx coords) should always match old origin
wxLogTrace(wxTRACE_COCOA_Window_Size, wxT("wxStaticText::SetLabel New Position: (%d,%d)"), GetPosition().x, GetPosition().y);
[[GetNSTextField() superview] setNeedsDisplayInRect:oldFrameRect]; if(!(GetWindowStyle() & wxST_NO_AUTORESIZE))
[[GetNSTextField() superview] setNeedsDisplayInRect:newFrameRect]; {
wxLogTrace(wxTRACE_COCOA_Window_Size, wxT("wxStaticText::SetLabel Old Position: (%d,%d)"), GetPosition().x, GetPosition().y);
[GetNSTextField() sizeToFit];
NSRect newFrameRect = [GetNSTextField() frame];
// Ensure new size is an integer so GetSize returns valid data
newFrameRect.size.height = ceil(newFrameRect.size.height);
newFrameRect.size.width = ceil(newFrameRect.size.width);
if(![superview isFlipped])
{
newFrameRect.origin.y = oldFrameRect.origin.y + oldFrameRect.size.height - newFrameRect.size.height;
}
[GetNSTextField() setFrame:newFrameRect];
// New origin (wx coords) should always match old origin
wxLogTrace(wxTRACE_COCOA_Window_Size, wxT("wxStaticText::SetLabel New Position: (%d,%d)"), GetPosition().x, GetPosition().y);
[superview setNeedsDisplayInRect:newFrameRect];
}
[superview setNeedsDisplayInRect:oldFrameRect];
} }
wxString wxStaticText::GetLabel() const wxString wxStaticText::GetLabel() const