X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e9247fdad93984e7fe5b12dea148f143d608e2f1..dc4689ef73c1046e49978fcd0a929f3dd975fbb9:/src/cocoa/stattext.mm diff --git a/src/cocoa/stattext.mm b/src/cocoa/stattext.mm index f0fbc1f059..4bba022c27 100644 --- a/src/cocoa/stattext.mm +++ b/src/cocoa/stattext.mm @@ -1,18 +1,20 @@ ///////////////////////////////////////////////////////////////////////////// -// 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: wxWidgets licence +// 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 @@ -71,7 +73,7 @@ void wxStaticText::SetLabel(const wxString& label) [GetNSTextField() setStringValue:wxNSStringWithWxString(label)]; NSRect oldFrameRect = [GetNSTextField() frame]; NSView *superview = [GetNSTextField() superview]; - wxLogTrace(wxTRACE_COCOA_Window_Size, "wxStaticText::SetLabel Old Position: (%d,%d)", GetPosition().x, GetPosition().y); + 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 @@ -83,7 +85,7 @@ void wxStaticText::SetLabel(const wxString& label) } [GetNSTextField() setFrame:newFrameRect]; // New origin (wx coords) should always match old origin - wxLogTrace(wxTRACE_COCOA_Window_Size, "wxStaticText::SetLabel New Position: (%d,%d)", GetPosition().x, GetPosition().y); + wxLogTrace(wxTRACE_COCOA_Window_Size, wxT("wxStaticText::SetLabel New Position: (%d,%d)"), GetPosition().x, GetPosition().y); [[GetNSTextField() superview] setNeedsDisplayInRect:oldFrameRect]; [[GetNSTextField() superview] setNeedsDisplayInRect:newFrameRect]; @@ -92,4 +94,3 @@ void wxStaticText::SetLabel(const wxString& label) void wxStaticText::Cocoa_didChangeText(void) { } -