// Created: 2003/02/15
// RCS-ID: $Id$
// Copyright: (c) 2003 David Elliott
-// Licence: wxWidgets licence
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#include "wx/wxprec.h"
#import <AppKit/NSTextField.h>
#include <math.h>
-IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl)
BEGIN_EVENT_TABLE(wxStaticText, wxControl)
END_EVENT_TABLE()
WX_IMPLEMENT_COCOA_OWNER(wxStaticText,NSTextField,NSControl,NSView)
[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];
[GetNSTextField() setStringValue:wxNSStringWithWxString(GetLabelText(label))];
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])
+
+ if(!(GetWindowStyle() & wxST_NO_AUTORESIZE))
{
- newFrameRect.origin.y = oldFrameRect.origin.y + oldFrameRect.size.height - newFrameRect.size.height;
+ 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];
}
- [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];
+ [superview setNeedsDisplayInRect:oldFrameRect];
}
wxString wxStaticText::GetLabel() const