Correct signature of HitTest()

[wxWidgets.git] / src / cocoa / stattext.mm

diff --git a/src/cocoa/stattext.mm b/src/cocoa/stattext.mm
index d77446dcc27727561a11c496a711fbf90f14cfbe..d9b5dc5075322e483358ce16d7b98124b35860dd 100644 (file)
--- 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
 
@@ -42,12 +44,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];
@@ -68,24 +79,37 @@ 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, "wxStaticText::SetLabel Old Position: (%d,%d)", GetPosition().x, GetPosition().y);
-    [GetNSTextField() sizeToFit];
-    NSRect newFrameRect = [GetNSTextField() frame];
-    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];
     }
-    wxLogTrace(wxTRACE_COCOA_Window_Size, "wxStaticText::SetLabel New Position: (%d,%d)", GetPosition().x, GetPosition().y);
 
-    [[GetNSTextField() superview] setNeedsDisplayInRect:oldFrameRect];
-    [[GetNSTextField() superview] setNeedsDisplayInRect:newFrameRect];
+    [superview setNeedsDisplayInRect:oldFrameRect];
 }
 
-void wxStaticText::Cocoa_didChangeText(void)
+wxString wxStaticText::GetLabel() const
 {
+    wxAutoNSAutoreleasePool pool;
+    return wxStringWithNSString([GetNSTextField() stringValue]);
 }
 
+void wxStaticText::Cocoa_didChangeText(void)
+{
+}