Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35471 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2005-09-11 18:34:58 +00:00
parent 9d86099269
commit 2e11bb424c
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/cocoa/gauge.mm
View File

@@ -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. // this actually makes the widgets sample work so it's better than nothing.
if(style & wxGA_VERTICAL) 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];
} }

4
src/cocoa/stattext.mm
View File

@@ -71,7 +71,7 @@ void wxStaticText::SetLabel(const wxString& label)
[GetNSTextField() setStringValue:wxNSStringWithWxString(label)]; [GetNSTextField() setStringValue:wxNSStringWithWxString(label)];
NSRect oldFrameRect = [GetNSTextField() frame]; NSRect oldFrameRect = [GetNSTextField() frame];
NSView *superview = [GetNSTextField() superview]; 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]; [GetNSTextField() sizeToFit];
NSRect newFrameRect = [GetNSTextField() frame]; NSRect newFrameRect = [GetNSTextField() frame];
// Ensure new size is an integer so GetSize returns valid data // Ensure new size is an integer so GetSize returns valid data
@@ -83,7 +83,7 @@ void wxStaticText::SetLabel(const wxString& label)
} }
[GetNSTextField() setFrame:newFrameRect]; [GetNSTextField() setFrame:newFrameRect];
// New origin (wx coords) should always match old origin // 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:oldFrameRect];
[[GetNSTextField() superview] setNeedsDisplayInRect:newFrameRect]; [[GetNSTextField() superview] setNeedsDisplayInRect:newFrameRect];