1. more drag and drop and clipboard changes:
a) OLE clipboard works fine b) wxBitmapDataObject now accepts DIBs (but doesn't give them back :-( ) c) bugs in sample corrected 2. wxFatalExit() replaced with wxFAIL_MSG() in bitmap.cpp and dcmemory.cpp 3. wxFrame::ClientToScreen and ScreenToClient() replaced with DoXXX() - like this, they don't hide the base class versions git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4039 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -705,9 +705,9 @@ wxPoint wxFrame::GetClientAreaOrigin() const
|
||||
return pt;
|
||||
}
|
||||
|
||||
void wxFrame::ScreenToClient(int *x, int *y) const
|
||||
void wxFrame::DoScreenToClient(int *x, int *y) const
|
||||
{
|
||||
wxWindow::ScreenToClient(x, y);
|
||||
wxWindow::DoScreenToClient(x, y);
|
||||
|
||||
// We may be faking the client origin.
|
||||
// So a window that's really at (0, 30) may appear
|
||||
@@ -717,7 +717,7 @@ void wxFrame::ScreenToClient(int *x, int *y) const
|
||||
*y -= pt.y;
|
||||
}
|
||||
|
||||
void wxFrame::ClientToScreen(int *x, int *y) const
|
||||
void wxFrame::DoClientToScreen(int *x, int *y) const
|
||||
{
|
||||
// We may be faking the client origin.
|
||||
// So a window that's really at (0, 30) may appear
|
||||
@@ -726,7 +726,7 @@ void wxFrame::ClientToScreen(int *x, int *y) const
|
||||
*x += pt1.x;
|
||||
*y += pt1.y;
|
||||
|
||||
wxWindow::ClientToScreen(x, y);
|
||||
wxWindow::DoClientToScreen(x, y);
|
||||
}
|
||||
|
||||
#if wxUSE_TOOLBAR
|
||||
|
Reference in New Issue
Block a user