From: Vadim Zeitlin Date: Sun, 25 Dec 2005 12:52:53 +0000 (+0000) Subject: Start/EndDrawingOnTop are still used under Motif, don't deprecate them X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/f81dc6e93170cb73c6d614b77e26be49baa724d2 Start/EndDrawingOnTop are still used under Motif, don't deprecate them git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36565 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/msw/dcscreen.h b/include/wx/msw/dcscreen.h index 85da593a3b..f48275e41b 100644 --- a/include/wx/msw/dcscreen.h +++ b/include/wx/msw/dcscreen.h @@ -20,12 +20,11 @@ public: // Create a DC representing the whole screen wxScreenDC(); - // these functions are obsolete and shouldn't be used - - // Compatibility with X's requirements for drawing on top of all windows - wxDEPRECATED( static bool StartDrawingOnTop(wxWindow* window) ); - wxDEPRECATED( static bool StartDrawingOnTop(wxRect* rect = NULL) ); - wxDEPRECATED( static bool EndDrawingOnTop() ); + // Compatibility with X's requirements for drawing on top of all windows: + // they don't do anything under MSW + static bool StartDrawingOnTop(wxWindow* WXUNUSED(window)) { return true; } + static bool StartDrawingOnTop(wxRect* WXUNUSED(rect) = NULL) { return true; } + static bool EndDrawingOnTop() { return true; } protected: virtual void DoGetSize(int *w, int *h) const diff --git a/src/msw/dcscreen.cpp b/src/msw/dcscreen.cpp index eb843c9bff..0dc06f194c 100644 --- a/src/msw/dcscreen.cpp +++ b/src/msw/dcscreen.cpp @@ -37,18 +37,3 @@ wxScreenDC::wxScreenDC() ::SetBkMode( GetHdc(), TRANSPARENT ); } -// deprecated functions -bool wxScreenDC::StartDrawingOnTop(wxWindow* WXUNUSED(window)) -{ - return true; -} - -bool wxScreenDC::StartDrawingOnTop(wxRect* WXUNUSED(rect)) -{ - return true; -} - -bool wxScreenDC::EndDrawingOnTop() -{ - return true; -}