Merged 47955 from trunk:
Translate the wxALIGN flags to the Cocoa alignment type in wxStaticText::Create Copyright 2007 Software 2000 Ltd. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@47956 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -50,6 +50,15 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID winid,
|
|||||||
[GetNSTextField() setEditable: NO];
|
[GetNSTextField() setEditable: NO];
|
||||||
[GetNSTextField() setDrawsBackground: 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];
|
[GetNSControl() sizeToFit];
|
||||||
// Round-up to next integer size
|
// Round-up to next integer size
|
||||||
NSRect nsrect = [m_cocoaNSView frame];
|
NSRect nsrect = [m_cocoaNSView frame];
|
||||||
|
Reference in New Issue
Block a user