harmless warning fixes for WinCE (mostly unused parameters)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32640 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -8,8 +8,8 @@
|
|||||||
*****************************************************************************/
|
*****************************************************************************/
|
||||||
|
|
||||||
|
|
||||||
#if defined(_WIN32_WCE) && (_WIN32_WCE < 400)
|
#if defined(_WIN32_WCE)
|
||||||
// eVC3 cause warnings in its own headers: stdlib.h and winnt.h
|
// eVC cause warnings in its own headers: stdlib.h and winnt.h
|
||||||
#pragma warning (disable:4115)
|
#pragma warning (disable:4115)
|
||||||
#pragma warning (disable:4214)
|
#pragma warning (disable:4214)
|
||||||
#endif
|
#endif
|
||||||
@@ -21,7 +21,7 @@
|
|||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include "wx/defs.h"
|
#include "wx/defs.h"
|
||||||
|
|
||||||
#if defined(_WIN32_WCE) && (_WIN32_WCE < 400)
|
#if defined(_WIN32_WCE)
|
||||||
#pragma warning (default:4115)
|
#pragma warning (default:4115)
|
||||||
#pragma warning (default:4214)
|
#pragma warning (default:4214)
|
||||||
#endif
|
#endif
|
||||||
|
@@ -118,6 +118,9 @@ static const wxChar eUSERNAME[] = wxT("UserName");
|
|||||||
bool wxGetHostName(wxChar *buf, int maxSize)
|
bool wxGetHostName(wxChar *buf, int maxSize)
|
||||||
{
|
{
|
||||||
#if defined(__WXWINCE__)
|
#if defined(__WXWINCE__)
|
||||||
|
// TODO-CE
|
||||||
|
wxUnusedVar(buf);
|
||||||
|
wxUnusedVar(maxSize);
|
||||||
return false;
|
return false;
|
||||||
#elif defined(__WIN32__) && !defined(__WXMICROWIN__)
|
#elif defined(__WIN32__) && !defined(__WXMICROWIN__)
|
||||||
DWORD nSize = maxSize;
|
DWORD nSize = maxSize;
|
||||||
@@ -230,6 +233,9 @@ bool wxGetFullHostName(wxChar *buf, int maxSize)
|
|||||||
bool wxGetUserId(wxChar *buf, int maxSize)
|
bool wxGetUserId(wxChar *buf, int maxSize)
|
||||||
{
|
{
|
||||||
#if defined(__WXWINCE__)
|
#if defined(__WXWINCE__)
|
||||||
|
// TODO-CE
|
||||||
|
wxUnusedVar(buf);
|
||||||
|
wxUnusedVar(maxSize);
|
||||||
return false;
|
return false;
|
||||||
#elif defined(__WIN32__) && !defined(__WXMICROWIN__)
|
#elif defined(__WIN32__) && !defined(__WXMICROWIN__)
|
||||||
DWORD nSize = maxSize;
|
DWORD nSize = maxSize;
|
||||||
@@ -270,6 +276,9 @@ bool wxGetUserId(wxChar *buf, int maxSize)
|
|||||||
bool wxGetUserName(wxChar *buf, int maxSize)
|
bool wxGetUserName(wxChar *buf, int maxSize)
|
||||||
{
|
{
|
||||||
#if defined(__WXWINCE__)
|
#if defined(__WXWINCE__)
|
||||||
|
// TODO-CE
|
||||||
|
wxUnusedVar(buf);
|
||||||
|
wxUnusedVar(maxSize);
|
||||||
return false;
|
return false;
|
||||||
#elif defined(USE_NET_API)
|
#elif defined(USE_NET_API)
|
||||||
CHAR szUserName[256];
|
CHAR szUserName[256];
|
||||||
@@ -350,9 +359,9 @@ error:
|
|||||||
{
|
{
|
||||||
wxStrncpy(buf, wxT("Unknown User"), maxSize);
|
wxStrncpy(buf, wxT("Unknown User"), maxSize);
|
||||||
}
|
}
|
||||||
#endif // Win32/16
|
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
|
#endif // Win32/16
|
||||||
}
|
}
|
||||||
|
|
||||||
const wxChar* wxGetHomeDir(wxString *pstr)
|
const wxChar* wxGetHomeDir(wxString *pstr)
|
||||||
@@ -464,6 +473,10 @@ bool wxDirExists(const wxString& dir)
|
|||||||
bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
|
bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
|
||||||
{
|
{
|
||||||
#ifdef __WXWINCE__
|
#ifdef __WXWINCE__
|
||||||
|
// TODO-CE
|
||||||
|
wxUnusedVar(path);
|
||||||
|
wxUnusedVar(pTotal);
|
||||||
|
wxUnusedVar(pFree);
|
||||||
return false;
|
return false;
|
||||||
#else
|
#else
|
||||||
if ( path.empty() )
|
if ( path.empty() )
|
||||||
@@ -576,6 +589,9 @@ bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
|
|||||||
bool wxGetEnv(const wxString& var, wxString *value)
|
bool wxGetEnv(const wxString& var, wxString *value)
|
||||||
{
|
{
|
||||||
#ifdef __WXWINCE__
|
#ifdef __WXWINCE__
|
||||||
|
// no environment variables under CE
|
||||||
|
wxUnusedVar(var);
|
||||||
|
wxUnusedVar(value);
|
||||||
return false;
|
return false;
|
||||||
#else // Win32
|
#else // Win32
|
||||||
// first get the size of the buffer
|
// first get the size of the buffer
|
||||||
@@ -610,6 +626,9 @@ bool wxSetEnv(const wxString& var, const wxChar *value)
|
|||||||
|
|
||||||
return true;
|
return true;
|
||||||
#else // no way to set env vars
|
#else // no way to set env vars
|
||||||
|
// no environment variables under CE
|
||||||
|
wxUnusedVar(var);
|
||||||
|
wxUnusedVar(value);
|
||||||
return false;
|
return false;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
@@ -951,6 +970,8 @@ bool wxShell(const wxString& command)
|
|||||||
bool wxShutdown(wxShutdownFlags wFlags)
|
bool wxShutdown(wxShutdownFlags wFlags)
|
||||||
{
|
{
|
||||||
#ifdef __WXWINCE__
|
#ifdef __WXWINCE__
|
||||||
|
// TODO-CE
|
||||||
|
wxUnusedVar(wFlags);
|
||||||
return false;
|
return false;
|
||||||
#elif defined(__WIN32__)
|
#elif defined(__WIN32__)
|
||||||
bool bOK = true;
|
bool bOK = true;
|
||||||
|
@@ -1052,6 +1052,8 @@ bool wxCheckWindowWndProc(WXHWND hWnd, WXFARPROC wndProc)
|
|||||||
// On WinCE (at least), the wndproc comparison doesn't work,
|
// On WinCE (at least), the wndproc comparison doesn't work,
|
||||||
// so have to use something like this.
|
// so have to use something like this.
|
||||||
#ifdef __WXWINCE__
|
#ifdef __WXWINCE__
|
||||||
|
wxUnusedVar(wndProc);
|
||||||
|
|
||||||
extern wxChar *wxCanvasClassName;
|
extern wxChar *wxCanvasClassName;
|
||||||
extern wxChar *wxCanvasClassNameNR;
|
extern wxChar *wxCanvasClassNameNR;
|
||||||
extern const wxChar *wxMDIFrameClassName;
|
extern const wxChar *wxMDIFrameClassName;
|
||||||
@@ -3228,7 +3230,7 @@ bool wxWindowMSW::MSWOnNotify(int WXUNUSED(idCtrl),
|
|||||||
|
|
||||||
bool wxWindowMSW::HandleQueryEndSession(long logOff, bool *mayEnd)
|
bool wxWindowMSW::HandleQueryEndSession(long logOff, bool *mayEnd)
|
||||||
{
|
{
|
||||||
#ifndef __WXWINCE__
|
#ifdef ENDSESSION_LOGOFF
|
||||||
wxCloseEvent event(wxEVT_QUERY_END_SESSION, wxID_ANY);
|
wxCloseEvent event(wxEVT_QUERY_END_SESSION, wxID_ANY);
|
||||||
event.SetEventObject(wxTheApp);
|
event.SetEventObject(wxTheApp);
|
||||||
event.SetCanVeto(true);
|
event.SetCanVeto(true);
|
||||||
@@ -3245,13 +3247,15 @@ bool wxWindowMSW::HandleQueryEndSession(long logOff, bool *mayEnd)
|
|||||||
|
|
||||||
return rc;
|
return rc;
|
||||||
#else
|
#else
|
||||||
|
wxUnusedVar(logOff);
|
||||||
|
wxUnusedVar(mayEnd);
|
||||||
return false;
|
return false;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
bool wxWindowMSW::HandleEndSession(bool endSession, long logOff)
|
bool wxWindowMSW::HandleEndSession(bool endSession, long logOff)
|
||||||
{
|
{
|
||||||
#ifndef __WXWINCE__
|
#ifdef ENDSESSION_LOGOFF
|
||||||
// do nothing if the session isn't ending
|
// do nothing if the session isn't ending
|
||||||
if ( !endSession )
|
if ( !endSession )
|
||||||
return false;
|
return false;
|
||||||
@@ -3267,6 +3271,8 @@ bool wxWindowMSW::HandleEndSession(bool endSession, long logOff)
|
|||||||
|
|
||||||
return wxTheApp->ProcessEvent(event);
|
return wxTheApp->ProcessEvent(event);
|
||||||
#else
|
#else
|
||||||
|
wxUnusedVar(endSession);
|
||||||
|
wxUnusedVar(logOff);
|
||||||
return false;
|
return false;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user