X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ccdc11bbaf0310a474ad7b9d41413b31c3544356..eea4d01c65f9b29baa1193db762b4c6b8144af24:/src/cocoa/stattext.mm

diff --git a/src/cocoa/stattext.mm b/src/cocoa/stattext.mm
index 4bba022c27..ba9028a6f3 100644
--- a/src/cocoa/stattext.mm
+++ b/src/cocoa/stattext.mm
@@ -6,7 +6,7 @@
 // Created:     2003/02/15
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
@@ -26,7 +26,6 @@
 #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)
@@ -44,12 +43,21 @@ 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(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];
@@ -70,25 +78,35 @@ wxStaticText::~wxStaticText()
 
 void wxStaticText::SetLabel(const wxString& label)
 {
-    [GetNSTextField() setStringValue:wxNSStringWithWxString(label)];
+    [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
+{
+    wxAutoNSAutoreleasePool pool;
+    return wxStringWithNSString([GetNSTextField() stringValue]);
 }
 
 void wxStaticText::Cocoa_didChangeText(void)