Commented out most the the wxLogDebug
Basic implementation of Refresh() does not take into account eraseBack or Rect git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19997 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
c29e274378
commit
ddf7346ac0
@ -172,7 +172,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)
|
||||||
{
|
{
|
||||||
wxLogDebug("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":".");
|
// wxLogDebug("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);
|
||||||
@ -212,7 +212,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)
|
||||||
{
|
{
|
||||||
wxLogDebug("wxWindow=%p::DoMoveWindow(%d,%d,%d,%d)",this,x,y,width,height);
|
// wxLogDebug("wxWindow=%p::DoMoveWindow(%d,%d,%d,%d)",this,x,y,width,height);
|
||||||
|
|
||||||
NSView *nsview = m_dummyNSView?m_dummyNSView:m_cocoaNSView;
|
NSView *nsview = m_dummyNSView?m_dummyNSView:m_cocoaNSView;
|
||||||
NSView *superview = [nsview superview];
|
NSView *superview = [nsview superview];
|
||||||
@ -234,7 +234,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;
|
||||||
wxLogDebug("wxWindow=%p::DoGetSize = (%d,%d)",this,(int)cocoaRect.size.width,(int)cocoaRect.size.height);
|
// wxLogDebug("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
|
||||||
@ -249,7 +249,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));
|
||||||
wxLogDebug("wxWindow=%p::DoGetPosition = (%d,%d)",this,(int)cocoaRect.origin.x,(int)cocoaRect.origin.y);
|
// wxLogDebug("wxWindow=%p::DoGetPosition = (%d,%d)",this,(int)cocoaRect.origin.x,(int)cocoaRect.origin.y);
|
||||||
}
|
}
|
||||||
|
|
||||||
WXWidget wxWindow::GetHandle() const
|
WXWidget wxWindow::GetHandle() const
|
||||||
@ -257,6 +257,11 @@ WXWidget wxWindow::GetHandle() const
|
|||||||
return m_cocoaNSView;
|
return m_cocoaNSView;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void wxWindow::Refresh(bool eraseBack, const wxRect *rect)
|
||||||
|
{
|
||||||
|
[m_cocoaNSView setNeedsDisplay:YES];
|
||||||
|
}
|
||||||
|
|
||||||
void wxWindow::SetFocus()
|
void wxWindow::SetFocus()
|
||||||
{
|
{
|
||||||
// TODO
|
// TODO
|
||||||
@ -314,11 +319,6 @@ void wxWindow::GetTextExtent(const wxString& string, int *x, int *y,
|
|||||||
// TODO
|
// TODO
|
||||||
}
|
}
|
||||||
|
|
||||||
void wxWindow::Refresh(bool eraseBack, const wxRect *rect)
|
|
||||||
{
|
|
||||||
// TODO
|
|
||||||
}
|
|
||||||
|
|
||||||
// Coordinates relative to the window
|
// Coordinates relative to the window
|
||||||
void wxWindow::WarpPointer (int x_pos, int y_pos)
|
void wxWindow::WarpPointer (int x_pos, int y_pos)
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user