X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1c54c79268ff605780cad4f13a6af9643ef0559a..c77a67962c2f50a872491869fcf1a6c082fdc6c6:/src/cocoa/stattext.mm

diff --git a/src/cocoa/stattext.mm b/src/cocoa/stattext.mm
index ff30c7cb2f..f45eab54e1 100644
--- a/src/cocoa/stattext.mm
+++ b/src/cocoa/stattext.mm
@@ -6,13 +6,19 @@
 // Created:     2003/02/15
 // RCS-ID:      $Id: 
 // Copyright:   (c) 2003 David Elliott
-// Licence:   	wxWindows license
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
-#include "wx/app.h"
-#include "wx/stattext.h"
+#include "wx/wxprec.h"
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #include "wx/stattext.h"
+    #include "wx/log.h"
+#endif //WX_PRECOMP
 
 #include "wx/cocoa/autorelease.h"
+#include "wx/cocoa/string.h"
+#include "wx/cocoa/log.h"
 
 #import <Foundation/NSString.h>
 #import <AppKit/NSTextField.h>
@@ -34,9 +40,9 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID winid,
     if(!CreateControl(parent,winid,pos,size,style,wxDefaultValidator,name))
         return false;
     m_cocoaNSView = NULL;
-    SetNSTextField([[NSTextField alloc] initWithFrame:NSMakeRect(0,0,30,30)]);
+    SetNSTextField([[NSTextField alloc] initWithFrame:MakeDefaultNSRect(size)]);
     [m_cocoaNSView release];
-    [GetNSTextField() setStringValue:[NSString stringWithCString:label.c_str()]];
+    [GetNSTextField() setStringValue:wxNSStringWithWxString(label)];
 //    [GetNSTextField() setBordered: NO];
     [GetNSTextField() setBezeled: NO];
     [GetNSTextField() setEditable: NO];
@@ -50,17 +56,37 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID winid,
 
     if(m_parent)
         m_parent->CocoaAddChild(this);
+    SetInitialFrameRect(pos,size);
+
     return true;
 }
 
 wxStaticText::~wxStaticText()
 {
-    DisassociateNSTextField(m_cocoaNSView);
+    DisassociateNSTextField(GetNSTextField());
 }
 
 void wxStaticText::SetLabel(const wxString& label)
 {
-    // TODO
+    [GetNSTextField() setStringValue:wxNSStringWithWxString(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])
+    {
+        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);
+
+    [[GetNSTextField() superview] setNeedsDisplayInRect:oldFrameRect];
+    [[GetNSTextField() superview] setNeedsDisplayInRect:newFrameRect];
 }
 
 void wxStaticText::Cocoa_didChangeText(void)