X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b0c0a393c4027a46b83187ea1328949ca75971d0..35c63208f04930176aa34ec1fcabc4f3c19804b9:/src/cocoa/stattext.mm?ds=sidebyside diff --git a/src/cocoa/stattext.mm b/src/cocoa/stattext.mm index ff04f5899a..4c948ba801 100644 --- a/src/cocoa/stattext.mm +++ b/src/cocoa/stattext.mm @@ -1,22 +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 @@ -40,7 +44,7 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID winid, m_cocoaNSView = NULL; SetNSTextField([[NSTextField alloc] initWithFrame:MakeDefaultNSRect(size)]); [m_cocoaNSView release]; - [GetNSTextField() setStringValue:wxNSStringWithWxString(label)]; + [GetNSTextField() setStringValue:wxNSStringWithWxString(wxStripMenuCodes(label, wxStrip_Mnemonics))]; // [GetNSTextField() setBordered: NO]; [GetNSTextField() setBezeled: NO]; [GetNSTextField() setEditable: NO]; @@ -66,10 +70,33 @@ wxStaticText::~wxStaticText() void wxStaticText::SetLabel(const wxString& label) { - // TODO + [GetNSTextField() setStringValue:wxNSStringWithWxString(wxStripMenuCodes(label, wxStrip_Mnemonics))]; + NSRect oldFrameRect = [GetNSTextField() frame]; + 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]; + [[GetNSTextField() superview] setNeedsDisplayInRect:newFrameRect]; } -void wxStaticText::Cocoa_didChangeText(void) +wxString wxStaticText::GetLabel() const { + wxAutoNSAutoreleasePool pool; + return wxStringWithNSString([GetNSTextField() stringValue]); } +void wxStaticText::Cocoa_didChangeText(void) +{ +}