From 63a3cd7a8c737eb4571f27e5f2af37eda0f1c5cc Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Wed, 1 Feb 2006 13:52:08 +0000 Subject: [PATCH] wxOS2 warning fixes after daily build log. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37253 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/os2/gdiimage.cpp | 14 +++++++------- src/os2/settings.cpp | 6 ++++-- src/os2/utils.cpp | 29 ++++++++++++++++------------- src/os2/utilsexc.cpp | 26 ++------------------------ 4 files changed, 29 insertions(+), 46 deletions(-) diff --git a/src/os2/gdiimage.cpp b/src/os2/gdiimage.cpp index 69d6210bf8..80d1cdebef 100644 --- a/src/os2/gdiimage.cpp +++ b/src/os2/gdiimage.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: msw/gdiimage.cpp +// Name: src/os2/gdiimage.cpp // Purpose: wxGDIImage implementation // Author: Vadim Zeitlin // Modified by: @@ -120,7 +120,7 @@ public: ,int WXUNUSED(nDepth) = 1 ) { - return(FALSE); + return false; } virtual bool Save( wxGDIImage* WXUNUSED(pImage) @@ -128,7 +128,7 @@ public: ,int WXUNUSED(nType) ) { - return(FALSE); + return false; } virtual bool Load( wxGDIImage* pImage ,const wxString& rName @@ -139,7 +139,7 @@ public: ) { wxIcon* pIcon = wxDynamicCast(pImage, wxIcon); - wxCHECK_MSG(pIcon, FALSE, _T("wxIconHandler only works with icons")); + wxCHECK_MSG(pIcon, false, _T("wxIconHandler only works with icons")); return LoadIcon( pIcon ,rName @@ -395,7 +395,7 @@ bool wxBMPFileHandler::LoadFile( wxBitmap* pBitmap, int WXUNUSED(nDesiredWidth), int WXUNUSED(nDesiredHeight) ) { -#if wxUSE_IMAGE_LOADING_IN_OS2 +#if defined(wxUSE_IMAGE_LOADING_IN_OS2) && wxUSE_IMAGE_LOADING_IN_OS2 wxPalette* pPalette = NULL; bool bSuccess = false; /* wxLoadIntoBitmap( WXSTRINGCAST rName @@ -422,7 +422,7 @@ bool wxBMPFileHandler::SaveFile( wxBitmap* pBitmap, int WXUNUSED(nType), const wxPalette* pPal ) { -#if wxUSE_IMAGE_LOADING_IN_OS2 +#if defined(wxUSE_IMAGE_LOADING_IN_OS2) && wxUSE_IMAGE_LOADING_IN_OS2 wxPalette* pActualPalette = (wxPalette *)pPal; if (!pActualPalette) @@ -450,7 +450,7 @@ bool wxICOFileHandler::LoadIcon( wxIcon* pIcon, int WXUNUSED(nDesiredWidth), int WXUNUSED(nDesiredHeight) ) { -#if wxUSE_RESOURCE_LOADING_IN_OS2 +#if defined(wxUSE_RESOURCE_LOADING_IN_OS2) && wxUSE_RESOURCE_LOADING_IN_OS2 pIcon->UnRef(); return false; diff --git a/src/os2/settings.cpp b/src/os2/settings.cpp index 6d29e973e8..2f42f126e1 100644 --- a/src/os2/settings.cpp +++ b/src/os2/settings.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: settings.cpp +// Name: src/os2/settings.cpp // Purpose: wxSettings // Author: David Webster // Modified by: @@ -62,7 +62,7 @@ wxArrayString wxSystemSettingsModule::sm_optionValues; bool wxSystemSettingsModule::OnInit() { - return TRUE; + return true; } void wxSystemSettingsModule::OnExit() @@ -287,6 +287,8 @@ int wxSystemSettingsNative::GetMetric( wxSystemMetric index, // TODO case wxSYS_PENWINDOWS_PRESENT: // TODO case wxSYS_SHOW_SOUNDS: // TODO case wxSYS_SWAP_BUTTONS: + + default: } return -1; // unsupported metric } diff --git a/src/os2/utils.cpp b/src/os2/utils.cpp index 8cfca8e49c..091c160fec 100644 --- a/src/os2/utils.cpp +++ b/src/os2/utils.cpp @@ -58,18 +58,17 @@ static const wxChar eHOSTNAME[] = _T("HostName"); // functions beyond those provided by WinSock // Get full hostname (eg. DoDo.BSn-Germany.crg.de) -bool wxGetHostName( - wxChar* zBuf -, int nMaxSize -) +bool wxGetHostName( wxChar* zBuf, int nMaxSize ) { -#if wxUSE_NET_API - char zServer[256]; - char zComputer[256]; - unsigned long ulLevel = 0; - unsigned char* zBuffer = NULL; - unsigned long ulBuffer = 256; - unsigned long* pulTotalAvail = NULL; + if (!zBuf) return false; + +#if defined(wxUSE_NET_API) && wxUSE_NET_API + char zServer[256]; + char zComputer[256]; + unsigned long ulLevel = 0; + unsigned char* zBuffer = NULL; + unsigned long ulBuffer = 256; + unsigned long* pulTotalAvail = NULL; NetBios32GetInfo( (const unsigned char*)zServer ,(const unsigned char*)zComputer @@ -80,8 +79,8 @@ bool wxGetHostName( ); strcpy(zBuf, zServer); #else - wxChar* zSysname; - const wxChar* zDefaultHost = _T("noname"); + wxChar* zSysname; + const wxChar* zDefaultHost = _T("noname"); if ((zSysname = wxGetenv(_T("SYSTEM_NAME"))) == NULL) { @@ -94,9 +93,13 @@ bool wxGetHostName( ); } else + { wxStrncpy(zBuf, zSysname, nMaxSize - 1); + } + zBuf[nMaxSize] = _T('\0'); #endif + return *zBuf ? true : false; } diff --git a/src/os2/utilsexc.cpp b/src/os2/utilsexc.cpp index 21b50548e2..909da35a3a 100644 --- a/src/os2/utilsexc.cpp +++ b/src/os2/utilsexc.cpp @@ -238,29 +238,7 @@ long wxExecute( ); } -bool wxGetFullHostName( wxChar* zBuf, - int nMaxSize) +bool wxGetFullHostName( wxChar* zBuf, int nMaxSize) { -#if wxUSE_NET_API - char zServer[256]; - char zComputer[256]; - unsigned long ulLevel = 0; - unsigned char* zBuffer = NULL; - unsigned long ulBuffer = 256; - unsigned long* pulTotalAvail = NULL; - - NetBios32GetInfo( (const unsigned char*)zServer - ,(const unsigned char*)zComputer - ,ulLevel - ,zBuffer - ,ulBuffer - ,pulTotalAvail - ); - strncpy(zBuf, zComputer, nMaxSize); - zBuf[nMaxSize] = _T('\0'); -#else - wxUnusedVar(nMaxSize); - strcpy((char*)zBuf, "noname"); -#endif - return *zBuf ? true : false; + return wxGetHostName( zBuf, nMaxSize ); } -- 2.47.2