add wx/univ/tglbtn.h to wxUniv headers

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

diff --git a/src/cocoa/stattext.mm b/src/cocoa/stattext.mm
index f0fbc1f05935bebfb578afea5251f0f795e6e2af..4c948ba801967ebf8487b4377399d534d35288c0 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
 // Purpose:     wxStaticText
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/02/15

-// RCS-ID:      $Id: 
+// RCS-ID:      $Id$

 // Copyright:   (c) 2003 David Elliott
 // Copyright:   (c) 2003 David Elliott

-// Licence:    wxWidgets licence
+// Licence:     wxWidgets licence

 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"

+
+#include "wx/stattext.h"
+

 #ifndef WX_PRECOMP
     #include "wx/app.h"
 #ifndef WX_PRECOMP
     #include "wx/app.h"

-    #include "wx/stattext.h"

     #include "wx/log.h"
 #endif //WX_PRECOMP
 
     #include "wx/log.h"
 #endif //WX_PRECOMP
 


@@ -42,7 +44,7 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID winid,
     m_cocoaNSView = NULL;
     SetNSTextField([[NSTextField alloc] initWithFrame:MakeDefaultNSRect(size)]);
     [m_cocoaNSView release];
     m_cocoaNSView = NULL;
     SetNSTextField([[NSTextField alloc] initWithFrame:MakeDefaultNSRect(size)]);
     [m_cocoaNSView release];

-    [GetNSTextField() setStringValue:wxNSStringWithWxString(label)];
+    [GetNSTextField() setStringValue:wxNSStringWithWxString(wxStripMenuCodes(label, wxStrip_Mnemonics))];

 //    [GetNSTextField() setBordered: NO];
     [GetNSTextField() setBezeled: NO];
     [GetNSTextField() setEditable: NO];
 //    [GetNSTextField() setBordered: NO];
     [GetNSTextField() setBezeled: NO];
     [GetNSTextField() setEditable: NO];


@@ -68,10 +70,10 @@ wxStaticText::~wxStaticText()
 
 void wxStaticText::SetLabel(const wxString& label)
 {
 
 void wxStaticText::SetLabel(const wxString& label)
 {

-    [GetNSTextField() setStringValue:wxNSStringWithWxString(label)];
+    [GetNSTextField() setStringValue:wxNSStringWithWxString(wxStripMenuCodes(label, wxStrip_Mnemonics))];

     NSRect oldFrameRect = [GetNSTextField() frame];
     NSView *superview = [GetNSTextField() superview];
     NSRect oldFrameRect = [GetNSTextField() frame];
     NSView *superview = [GetNSTextField() superview];

-    wxLogTrace(wxTRACE_COCOA_Window_Size, "wxStaticText::SetLabel Old Position: (%d,%d)", GetPosition().x, GetPosition().y);
+    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
     [GetNSTextField() sizeToFit];
     NSRect newFrameRect = [GetNSTextField() frame];
     // Ensure new size is an integer so GetSize returns valid data


@@ -83,13 +85,18 @@ void wxStaticText::SetLabel(const wxString& label)
     }
     [GetNSTextField() setFrame:newFrameRect];
     // New origin (wx coords) should always match old origin
     }
     [GetNSTextField() setFrame:newFrameRect];
     // New origin (wx coords) should always match old origin

-    wxLogTrace(wxTRACE_COCOA_Window_Size, "wxStaticText::SetLabel New Position: (%d,%d)", GetPosition().x, GetPosition().y);
+    wxLogTrace(wxTRACE_COCOA_Window_Size, wxT("wxStaticText::SetLabel New Position: (%d,%d)"), GetPosition().x, GetPosition().y);

 
     [[GetNSTextField() superview] setNeedsDisplayInRect:oldFrameRect];
     [[GetNSTextField() superview] setNeedsDisplayInRect:newFrameRect];
 }
 
 
     [[GetNSTextField() superview] setNeedsDisplayInRect:oldFrameRect];
     [[GetNSTextField() superview] setNeedsDisplayInRect:newFrameRect];
 }
 

-void wxStaticText::Cocoa_didChangeText(void)
+wxString wxStaticText::GetLabel() const

 {
 {

+    wxAutoNSAutoreleasePool pool;
+    return wxStringWithNSString([GetNSTextField() stringValue]);

 }
 
 }
 

+void wxStaticText::Cocoa_didChangeText(void)
+{
+}