Added missing wxT()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26691 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -345,7 +345,7 @@ void wxTopLevelWindowCocoa::CocoaSetWxWindowSize(int width, int height)
|
|||||||
|
|
||||||
void wxTopLevelWindowCocoa::DoMoveWindow(int x, int y, int width, int height)
|
void wxTopLevelWindowCocoa::DoMoveWindow(int x, int y, int width, int height)
|
||||||
{
|
{
|
||||||
wxLogTrace(wxTRACE_COCOA_TopLevelWindow_Size,"wxTopLevelWindow=%p::DoMoveWindow(%d,%d,%d,%d)",this,x,y,width,height);
|
wxLogTrace(wxTRACE_COCOA_TopLevelWindow_Size,wxT("wxTopLevelWindow=%p::DoMoveWindow(%d,%d,%d,%d)"),this,x,y,width,height);
|
||||||
|
|
||||||
NSRect cocoaRect = NSMakeRect(x,y,width,height);
|
NSRect cocoaRect = NSMakeRect(x,y,width,height);
|
||||||
[m_cocoaNSWindow setFrame: cocoaRect display:NO];
|
[m_cocoaNSWindow setFrame: cocoaRect display:NO];
|
||||||
@@ -358,7 +358,7 @@ void wxTopLevelWindowCocoa::DoGetSize(int *w, int *h) const
|
|||||||
*w=(int)cocoaRect.size.width;
|
*w=(int)cocoaRect.size.width;
|
||||||
if(h)
|
if(h)
|
||||||
*h=(int)cocoaRect.size.height;
|
*h=(int)cocoaRect.size.height;
|
||||||
wxLogTrace(wxTRACE_COCOA_TopLevelWindow_Size,"wxTopLevelWindow=%p::DoGetSize = (%d,%d)",this,(int)cocoaRect.size.width,(int)cocoaRect.size.height);
|
wxLogTrace(wxTRACE_COCOA_TopLevelWindow_Size,wxT("wxTopLevelWindow=%p::DoGetSize = (%d,%d)"),this,(int)cocoaRect.size.width,(int)cocoaRect.size.height);
|
||||||
}
|
}
|
||||||
|
|
||||||
void wxTopLevelWindowCocoa::DoGetPosition(int *x, int *y) const
|
void wxTopLevelWindowCocoa::DoGetPosition(int *x, int *y) const
|
||||||
@@ -368,6 +368,6 @@ void wxTopLevelWindowCocoa::DoGetPosition(int *x, int *y) const
|
|||||||
*x=(int)cocoaRect.origin.x;
|
*x=(int)cocoaRect.origin.x;
|
||||||
if(y)
|
if(y)
|
||||||
*y=(int)cocoaRect.origin.y;
|
*y=(int)cocoaRect.origin.y;
|
||||||
wxLogTrace(wxTRACE_COCOA_TopLevelWindow_Size,"wxTopLevelWindow=%p::DoGetPosition = (%d,%d)",this,(int)cocoaRect.origin.x,(int)cocoaRect.origin.y);
|
wxLogTrace(wxTRACE_COCOA_TopLevelWindow_Size,wxT("wxTopLevelWindow=%p::DoGetPosition = (%d,%d)"),this,(int)cocoaRect.origin.x,(int)cocoaRect.origin.y);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -545,7 +545,7 @@ bool wxWindow::Show(bool show)
|
|||||||
|
|
||||||
void wxWindowCocoa::DoSetSize(int x, int y, int width, int height, int sizeFlags)
|
void wxWindowCocoa::DoSetSize(int x, int y, int width, int height, int sizeFlags)
|
||||||
{
|
{
|
||||||
wxLogTrace(wxTRACE_COCOA_Window_Size,"wxWindow=%p::DoSetSizeWindow(%d,%d,%d,%d,Auto: %s%s)",this,x,y,width,height,(sizeFlags&wxSIZE_AUTO_WIDTH)?"W":".",sizeFlags&wxSIZE_AUTO_HEIGHT?"H":".");
|
wxLogTrace(wxTRACE_COCOA_Window_Size,wxT("wxWindow=%p::DoSetSizeWindow(%d,%d,%d,%d,Auto: %s%s)"),this,x,y,width,height,(sizeFlags&wxSIZE_AUTO_WIDTH)?"W":".",sizeFlags&wxSIZE_AUTO_HEIGHT?"H":".");
|
||||||
int currentX, currentY;
|
int currentX, currentY;
|
||||||
int currentW, currentH;
|
int currentW, currentH;
|
||||||
DoGetPosition(¤tX, ¤tY);
|
DoGetPosition(¤tX, ¤tY);
|
||||||
@@ -586,7 +586,7 @@ void wxWindowCocoa::DoSetSize(int x, int y, int width, int height, int sizeFlags
|
|||||||
void wxWindowCocoa::DoMoveWindow(int x, int y, int width, int height)
|
void wxWindowCocoa::DoMoveWindow(int x, int y, int width, int height)
|
||||||
{
|
{
|
||||||
wxAutoNSAutoreleasePool pool;
|
wxAutoNSAutoreleasePool pool;
|
||||||
wxLogTrace(wxTRACE_COCOA_Window_Size,"wxWindow=%p::DoMoveWindow(%d,%d,%d,%d)",this,x,y,width,height);
|
wxLogTrace(wxTRACE_COCOA_Window_Size,wxT("wxWindow=%p::DoMoveWindow(%d,%d,%d,%d)"),this,x,y,width,height);
|
||||||
|
|
||||||
NSView *nsview = GetNSViewForSuperview();
|
NSView *nsview = GetNSViewForSuperview();
|
||||||
NSView *superview = [nsview superview];
|
NSView *superview = [nsview superview];
|
||||||
@@ -631,7 +631,7 @@ void wxWindow::DoGetSize(int *w, int *h) const
|
|||||||
*w=(int)cocoaRect.size.width;
|
*w=(int)cocoaRect.size.width;
|
||||||
if(h)
|
if(h)
|
||||||
*h=(int)cocoaRect.size.height;
|
*h=(int)cocoaRect.size.height;
|
||||||
wxLogTrace(wxTRACE_COCOA_Window_Size,"wxWindow=%p::DoGetSize = (%d,%d)",this,(int)cocoaRect.size.width,(int)cocoaRect.size.height);
|
wxLogTrace(wxTRACE_COCOA_Window_Size,wxT("wxWindow=%p::DoGetSize = (%d,%d)"),this,(int)cocoaRect.size.width,(int)cocoaRect.size.height);
|
||||||
}
|
}
|
||||||
|
|
||||||
void wxWindow::DoGetPosition(int *x, int *y) const
|
void wxWindow::DoGetPosition(int *x, int *y) const
|
||||||
@@ -646,7 +646,7 @@ void wxWindow::DoGetPosition(int *x, int *y) const
|
|||||||
*x=(int)cocoaRect.origin.x;
|
*x=(int)cocoaRect.origin.x;
|
||||||
if(y)
|
if(y)
|
||||||
*y=(int)(parentRect.size.height-(cocoaRect.origin.y+cocoaRect.size.height));
|
*y=(int)(parentRect.size.height-(cocoaRect.origin.y+cocoaRect.size.height));
|
||||||
wxLogTrace(wxTRACE_COCOA_Window_Size,"wxWindow=%p::DoGetPosition = (%d,%d)",this,(int)cocoaRect.origin.x,(int)cocoaRect.origin.y);
|
wxLogTrace(wxTRACE_COCOA_Window_Size,wxT("wxWindow=%p::DoGetPosition = (%d,%d)"),this,(int)cocoaRect.origin.x,(int)cocoaRect.origin.y);
|
||||||
}
|
}
|
||||||
|
|
||||||
WXWidget wxWindow::GetHandle() const
|
WXWidget wxWindow::GetHandle() const
|
||||||
|
Reference in New Issue
Block a user