From abf912c5a1ad04f186de5f3992339b882ef6b0cb Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 7 Mar 2005 19:26:51 +0000 Subject: [PATCH] harmless warning fixes for WinCE (mostly unused parameters) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32639 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/filefn.cpp | 10 +++++++++- src/msw/ole/droptgt.cpp | 2 ++ src/msw/statbox.cpp | 4 ++-- src/msw/tbar95.cpp | 2 ++ 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp index 9f34f44509..39539d65fd 100644 --- a/src/common/filefn.cpp +++ b/src/common/filefn.cpp @@ -214,7 +214,9 @@ void wxPathList::AddEnvList (const wxString& envVariable) delete [] s; } -#endif +#else // __WXWINCE__ + wxUnusedVar(envVariable); +#endif // !__WXWINCE__/__WXWINCE__ } // Given a full filename (with path), ensure that that file can @@ -681,6 +683,8 @@ wxContractPath (const wxString& filename, const wxString& envname, const wxStrin wxStrcat (tcp, wxT("}")); wxStrcat (tcp, wxFileFunctionsBuffer); } +#else + wxUnusedVar(envname); #endif // Handle User's home (ignore root homes!) @@ -1330,6 +1334,9 @@ wxChar *wxGetWorkingDirectory(wxChar *buf, int sz) // TODO ? return NULL; #elif defined(__WXWINCE__) + // TODO + wxUnusedVar(buf); + wxUnusedVar(sz); return NULL; #else if ( !buf ) @@ -1471,6 +1478,7 @@ bool wxSetWorkingDirectory(const wxString& d) #ifdef __WIN32__ #ifdef __WXWINCE__ // No equivalent in WinCE + wxUnusedVar(d); return false; #else return (bool)(SetCurrentDirectory(d) != 0); diff --git a/src/msw/ole/droptgt.cpp b/src/msw/ole/droptgt.cpp index f24c08b0e5..2aee28affe 100644 --- a/src/msw/ole/droptgt.cpp +++ b/src/msw/ole/droptgt.cpp @@ -335,6 +335,7 @@ bool wxDropTarget::Register(WXHWND hwnd) // Or maybe we can dynamically load them from ceshell.dll // or similar. #if defined(__WXWINCE__) && _WIN32_WCE >= 400 + wxUnusedVar(hwnd); return false; #else HRESULT hr; @@ -369,6 +370,7 @@ void wxDropTarget::Revoke(WXHWND hwnd) { #if defined(__WXWINCE__) && _WIN32_WCE >= 400 // Not available, see note above + wxUnusedVar(hwnd); #else HRESULT hr = ::RevokeDragDrop((HWND) hwnd); diff --git a/src/msw/statbox.cpp b/src/msw/statbox.cpp index d7881bc2ff..5ceea43341 100644 --- a/src/msw/statbox.cpp +++ b/src/msw/statbox.cpp @@ -154,9 +154,9 @@ wxSize wxStaticBox::DoGetBestSize() const WXLRESULT wxStaticBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) { +#ifndef __WXWINCE__ switch ( nMsg ) { -#ifndef __WXWINCE__ case WM_NCHITTEST: { // This code breaks some other processing such as enter/leave tracking @@ -179,8 +179,8 @@ WXLRESULT wxStaticBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lPar } } break; -#endif } +#endif // !__WXWINCE__ return wxControl::MSWWindowProc(nMsg, wParam, lParam); } diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp index f03cfbd04b..6636f4cebd 100644 --- a/src/msw/tbar95.cpp +++ b/src/msw/tbar95.cpp @@ -1012,6 +1012,8 @@ bool wxToolBar::MSWOnNotify(int WXUNUSED(idCtrl), return HandleTooltipNotify(code, lParam, tool->GetShortHelp()); #else + wxUnusedVar(lParam); + return false; #endif }