From b0cb01589f81b1794e07b82ff3d23f9757fb33d2 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 8 Jul 2003 22:55:59 +0000 Subject: [PATCH] warnings fixes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21785 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/msw/window.h | 24 ++++++++++++++++++------ src/common/fs_inet.cpp | 2 +- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/include/wx/msw/window.h b/include/wx/msw/window.h index 615e9f03f9..eaf3ff370f 100644 --- a/include/wx/msw/window.h +++ b/include/wx/msw/window.h @@ -135,6 +135,12 @@ public: // Accept files for dragging virtual void DragAcceptFiles(bool accept); +#if WXWIN_COMPATIBILITY_2_4 + wxDEPRECATED( bool GetUseCtl3D() const ); + wxDEPRECATED( bool GetTransparentBackground() const ); + wxDEPRECATED( void SetTransparent(bool t = TRUE) ); +#endif // WXWIN_COMPATIBILITY_2_4 + #if WXWIN_COMPATIBILITY // Set/get scroll attributes virtual void SetScrollRange(int orient, int range, bool refresh = TRUE); @@ -181,10 +187,6 @@ public: void SetHWND(WXHWND hWnd) { m_hWnd = hWnd; } virtual WXWidget GetHandle() const { return GetHWND(); } - bool GetUseCtl3D() const { return m_useCtl3D; } - bool GetTransparentBackground() const { return m_backgroundTransparent; } - void SetTransparent(bool t = TRUE) { m_backgroundTransparent = t; } - // event handlers // -------------- @@ -421,8 +423,6 @@ protected: WXFARPROC m_oldWndProc; // additional (MSW specific) flags - bool m_useCtl3D:1; // Using CTL3D for this control - bool m_backgroundTransparent:1; bool m_mouseInWindow:1; bool m_lastKeydownProcessed:1; @@ -494,6 +494,18 @@ private: DECLARE_EVENT_TABLE() }; +// ---------------------------------------------------------------------------- +// inline functions +// ---------------------------------------------------------------------------- + +#if WXWIN_COMPATIBILITY_2_4 + +inline bool wxWindowMSW::GetUseCtl3D() const { return false; } +inline bool wxWindowMSW::GetTransparentBackground() const { return false; } +inline void wxWindowMSW::SetTransparent(bool WXUNUSED(t)) { } + +#endif // WXWIN_COMPATIBILITY_2_4 + // --------------------------------------------------------------------------- // global functions // --------------------------------------------------------------------------- diff --git a/src/common/fs_inet.cpp b/src/common/fs_inet.cpp index 1e3d353a7c..217d7bd72c 100644 --- a/src/common/fs_inet.cpp +++ b/src/common/fs_inet.cpp @@ -160,7 +160,7 @@ wxInternetFSHandler::~wxInternetFSHandler() wxInetCacheNode *n2; m_Cache.BeginFind(); - while ((n = m_Cache.Next())) + while ((n = m_Cache.Next()) != 0) { n2 = (wxInetCacheNode*) n->GetData(); wxRemoveFile(n2->GetTemp()); -- 2.47.2