Applied [ 1235509 ] wxCocoa unicode wxT("fixes")

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35471 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/cocoa/gauge.mm b/src/cocoa/gauge.mm
index 73e1dff6bf759b29882f24b9e6a86ce8ff1360d6..7feb27ef6d7ad99dac8e7497c2a0896f7b3fb894 100644 (file)
--- a/src/cocoa/gauge.mm
+++ b/src/cocoa/gauge.mm
@@ -44,7 +44,7 @@ bool wxGauge::Create(wxWindow *parent, wxWindowID winid, int range,
     // this actually makes the widgets sample work so it's better than nothing.
     if(style & wxGA_VERTICAL)
     {
     // this actually makes the widgets sample work so it's better than nothing.
     if(style & wxGA_VERTICAL)
     {

-        wxLogDebug("wxGA_VERTICAL may not work correctly.  See src/cocoa/gauge.mm");
+        wxLogDebug(wxT("wxGA_VERTICAL may not work correctly.  See src/cocoa/gauge.mm"));

         [m_cocoaNSView setBoundsRotation:-90.0];
     }
 
         [m_cocoaNSView setBoundsRotation:-90.0];
     }
 

diff --git a/src/cocoa/stattext.mm b/src/cocoa/stattext.mm
index f0fbc1f05935bebfb578afea5251f0f795e6e2af..f45eab54e1ab9835f6956f039e34f3b0a7567000 100644 (file)
--- a/src/cocoa/stattext.mm
+++ b/src/cocoa/stattext.mm
@@ -71,7 +71,7 @@ void wxStaticText::SetLabel(const wxString& label)
     [GetNSTextField() setStringValue:wxNSStringWithWxString(label)];
     NSRect oldFrameRect = [GetNSTextField() frame];
     NSView *superview = [GetNSTextField() superview];
     [GetNSTextField() setStringValue:wxNSStringWithWxString(label)];
     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,7 +83,7 @@ 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];