Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

warnings fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21785 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-07-08 22:55:59 +00:00
parent 3e49e57746
commit b0cb01589f
2 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
include/wx/msw/window.h
View File

@@ -135,6 +135,12 @@ public:
// Accept files for dragging // Accept files for dragging
virtual void DragAcceptFiles(bool accept); 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 #if WXWIN_COMPATIBILITY
// Set/get scroll attributes // Set/get scroll attributes
virtual void SetScrollRange(int orient, int range, bool refresh = TRUE); virtual void SetScrollRange(int orient, int range, bool refresh = TRUE);
@@ -181,10 +187,6 @@ public:
void SetHWND(WXHWND hWnd) { m_hWnd = hWnd; } void SetHWND(WXHWND hWnd) { m_hWnd = hWnd; }
virtual WXWidget GetHandle() const { return GetHWND(); } 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 // event handlers
// -------------- // --------------
@@ -421,8 +423,6 @@ protected:
WXFARPROC m_oldWndProc; WXFARPROC m_oldWndProc;
// additional (MSW specific) flags // additional (MSW specific) flags
bool m_useCtl3D:1; // Using CTL3D for this control
bool m_backgroundTransparent:1;
bool m_mouseInWindow:1; bool m_mouseInWindow:1;
bool m_lastKeydownProcessed:1; bool m_lastKeydownProcessed:1;
@@ -494,6 +494,18 @@ private:
DECLARE_EVENT_TABLE() 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 // global functions
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------

2
src/common/fs_inet.cpp
View File

@@ -160,7 +160,7 @@ wxInternetFSHandler::~wxInternetFSHandler()
wxInetCacheNode *n2; wxInetCacheNode *n2;
m_Cache.BeginFind(); m_Cache.BeginFind();
while ((n = m_Cache.Next())) while ((n = m_Cache.Next()) != 0)
{ {
n2 = (wxInetCacheNode*) n->GetData(); n2 = (wxInetCacheNode*) n->GetData();
wxRemoveFile(n2->GetTemp()); wxRemoveFile(n2->GetTemp());