X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/911e17c6cf31c0e9e7ab4cdb8e03d66203ebbab8..94f0292941b6520afbabc999da698ef5fe576a46:/src/cocoa/stattext.mm?ds=sidebyside diff --git a/src/cocoa/stattext.mm b/src/cocoa/stattext.mm index 20ccf8ce47..d9b5dc5075 100644 --- a/src/cocoa/stattext.mm +++ b/src/cocoa/stattext.mm @@ -1,21 +1,26 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: cocoa/stattext.mm +// Name: src/cocoa/stattext.mm // Purpose: wxStaticText // Author: David Elliott // Modified by: // Created: 2003/02/15 -// RCS-ID: $Id: +// RCS-ID: $Id$ // Copyright: (c) 2003 David Elliott -// Licence: wxWindows license +// Licence: wxWidgets licence ///////////////////////////////////////////////////////////////////////////// #include "wx/wxprec.h" + +#include "wx/stattext.h" + #ifndef WX_PRECOMP #include "wx/app.h" - #include "wx/stattext.h" + #include "wx/log.h" #endif //WX_PRECOMP #include "wx/cocoa/autorelease.h" +#include "wx/cocoa/string.h" +#include "wx/cocoa/log.h" #import #import @@ -39,12 +44,21 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID winid, m_cocoaNSView = NULL; SetNSTextField([[NSTextField alloc] initWithFrame:MakeDefaultNSRect(size)]); [m_cocoaNSView release]; - [GetNSTextField() setStringValue:[NSString stringWithCString:label.c_str()]]; + [GetNSTextField() setStringValue:wxNSStringWithWxString(GetLabelText(label))]; // [GetNSTextField() setBordered: NO]; [GetNSTextField() setBezeled: NO]; [GetNSTextField() setEditable: NO]; [GetNSTextField() setDrawsBackground: NO]; + NSTextAlignment alignStyle; + if (style & wxALIGN_RIGHT) + alignStyle = NSRightTextAlignment; + else if (style & wxALIGN_CENTRE) + alignStyle = NSCenterTextAlignment; + else // default to wxALIGN_LEFT because it is 0 and can't be tested + alignStyle = NSLeftTextAlignment; + [GetNSControl() setAlignment:(NSTextAlignment)alignStyle]; + [GetNSControl() sizeToFit]; // Round-up to next integer size NSRect nsrect = [m_cocoaNSView frame]; @@ -65,10 +79,37 @@ wxStaticText::~wxStaticText() void wxStaticText::SetLabel(const wxString& label) { - // TODO + [GetNSTextField() setStringValue:wxNSStringWithWxString(GetLabelText(label))]; + NSRect oldFrameRect = [GetNSTextField() frame]; + NSView *superview = [GetNSTextField() superview]; + + if(!(GetWindowStyle() & wxST_NO_AUTORESIZE)) + { + 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 +{ + wxAutoNSAutoreleasePool pool; + return wxStringWithNSString([GetNSTextField() stringValue]); } void wxStaticText::Cocoa_didChangeText(void) { } -