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

diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index 9f34f4450908089e03fdbb542b31484c06675832..39539d65fd19720b0328d9bafb05c3e1b962bbca 100644 (file)
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -214,7 +214,9 @@ void wxPathList::AddEnvList (const wxString& envVariable)
 
         delete [] s;
     }
 
         delete [] s;
     }

-#endif
+#else // __WXWINCE__
+    wxUnusedVar(envVariable);
+#endif // !__WXWINCE__/__WXWINCE__

 }
 
 // Given a full filename (with path), ensure that that file can
 }
 
 // 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);
     }
         wxStrcat (tcp, wxT("}"));
         wxStrcat (tcp, wxFileFunctionsBuffer);
     }

+#else
+  wxUnusedVar(envname);

 #endif
 
   // Handle User's home (ignore root homes!)
 #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 ?
     return NULL;
 #elif defined(__WXWINCE__)

+    // TODO
+    wxUnusedVar(buf);
+    wxUnusedVar(sz);

     return NULL;
 #else
     if ( !buf )
     return NULL;
 #else
     if ( !buf )


@@ -1471,6 +1478,7 @@ bool wxSetWorkingDirectory(const wxString& d)
 #ifdef __WIN32__
 #ifdef __WXWINCE__
     // No equivalent in WinCE
 #ifdef __WIN32__
 #ifdef __WXWINCE__
     // No equivalent in WinCE

+    wxUnusedVar(d);

     return false;
 #else
     return (bool)(SetCurrentDirectory(d) != 0);
     return false;
 #else
     return (bool)(SetCurrentDirectory(d) != 0);

diff --git a/src/msw/ole/droptgt.cpp b/src/msw/ole/droptgt.cpp
index f24c08b0e5f19bb045e45321ab675a2d1eef32e8..2aee28affe3a5f6002020b6b88b3281a9b461cc3 100644 (file)
--- 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
     // 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;
     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
 {
 #if defined(__WXWINCE__) && _WIN32_WCE >= 400
     // Not available, see note above

+    wxUnusedVar(hwnd);

 #else
     HRESULT hr = ::RevokeDragDrop((HWND) hwnd);
 
 #else
     HRESULT hr = ::RevokeDragDrop((HWND) hwnd);
 

diff --git a/src/msw/statbox.cpp b/src/msw/statbox.cpp
index d7881bc2ff4717d69554151af0ccf3835f31a3dc..5ceea4334188176231fcbf6379a19701b871b1d0 100644 (file)
--- 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)
 {
 
 WXLRESULT wxStaticBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
 {

+#ifndef __WXWINCE__

     switch ( nMsg )
     {
     switch ( nMsg )
     {

-#ifndef __WXWINCE__

         case WM_NCHITTEST:
             {
                 // This code breaks some other processing such as enter/leave tracking
         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;
                 }
             }
             break;

-#endif

     }
     }

+#endif // !__WXWINCE__

 
     return wxControl::MSWWindowProc(nMsg, wParam, lParam);
 }
 
     return wxControl::MSWWindowProc(nMsg, wParam, lParam);
 }

diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp
index f03cfbd04bc5ffaf0a79bd1e08330eb0fbddeeff..6636f4cebd5ff6e219337f03a714eb7ae670f691 100644 (file)
--- 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
 
     return HandleTooltipNotify(code, lParam, tool->GetShortHelp());
 #else

+    wxUnusedVar(lParam);
+

     return false;
 #endif
 }
     return false;
 #endif
 }