Minor code tweeks to stop BCC compiler warnings

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9824 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/datetime.cpp b/src/common/datetime.cpp
index 5198a3773d93c9df3f50502c203c6df646601186..f648ca26f4a33198a3f0485976f3c62c765b6eea 100644 (file)
--- a/src/common/datetime.cpp
+++ b/src/common/datetime.cpp
@@ -3119,7 +3119,7 @@ const wxChar *wxDateTime::ParseDate(const wxChar *date)
                     : 31;
 
                 // can it be day?
-                if ( (val == 0) || (val > maxDays) )
+                if ( (val == 0) || (val > (unsigned long)maxDays) )  // cast to shut up compiler warning in BCC
                 {
                     isYear = TRUE;
                 }

diff --git a/src/common/dynlib.cpp b/src/common/dynlib.cpp
index 0b479642b6548e4e766bd25760b0164d8573bf17..2c82172f8fffa9b8d0ed46a34868eca6bc4daa71 100644 (file)
--- a/src/common/dynlib.cpp
+++ b/src/common/dynlib.cpp
@@ -363,7 +363,8 @@ wxLibrary *wxLibraries::LoadLibrary(const wxString& name)
     if (node != NULL)
         return ((wxLibrary *)node->Data());
 #else // !OS/2
-    if ( (node = m_loaded.Find(name.GetData())) )
+       node = m_loaded.Find(name.GetData());
+    if ( node )
         return ((wxLibrary *)node->Data());
 #endif
     // If DLL shares data, this is necessary.

diff --git a/src/common/filename.cpp b/src/common/filename.cpp
index 041e24a1f45c0b24afe6f02f6a6f71a689208fab..c84ded0f6e4f586dda74653b6e421a6e160d0a6c 100644 (file)
--- a/src/common/filename.cpp
+++ b/src/common/filename.cpp
@@ -607,7 +607,8 @@ wxString wxFileName::GetLongPath() const
         s_triedToLoad = TRUE;
 
         wxDllType dllKernel = wxDllLoader::LoadLibrary(_T("kernel32"));
-        if ( 0 ) // dllKernel )
+               short avoidCompilerWarning = 0;
+        if ( avoidCompilerWarning ) // dllKernel )
         {
             // may succeed or fail depending on the Windows version
 #ifdef _UNICODE

diff --git a/src/common/resource.cpp b/src/common/resource.cpp
index e2aae813d77dfa782733a158e4ea98eb0e587a99..ff8d62e2c972fb05bc7c9bb4f6cdf58a13b74737 100644 (file)
--- a/src/common/resource.cpp
+++ b/src/common/resource.cpp
@@ -1055,7 +1055,8 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, wxExpr *expr)
     {
         wxExpr *valueList = (wxExpr *) NULL;
         
-        if ((valueList = expr->Nth(count)) && (valueList->Type() == PrologList))
+               valueList = expr->Nth(count);
+        if (valueList && (valueList->Type() == PrologList))
         {
             wxStringList stringList;
             wxExpr *stringExpr = valueList->GetFirst();
@@ -1072,7 +1073,8 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, wxExpr *expr)
             /*
             controlItem->SetValue1(wxLB_SINGLE);
             */
-            if ((mult = expr->Nth(count)) && ((mult->Type() == PrologString)||(mult->Type() == PrologWord)))
+                       mult = expr->Nth(count);
+            if (mult && ((mult->Type() == PrologString)||(mult->Type() == PrologWord)))
             {
             /*
             wxString m(mult->StringValue());
@@ -1097,7 +1099,8 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, wxExpr *expr)
     {
         wxExpr *valueList = (wxExpr *) NULL;
         // Check for default value list
-        if ((valueList = expr->Nth(count)) && (valueList->Type() == PrologList))
+               valueList = expr->Nth(count);
+        if (valueList && (valueList->Type() == PrologList))
         {
             wxStringList stringList;
             wxExpr *stringExpr = valueList->GetFirst();
@@ -1132,7 +1135,8 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, wxExpr *expr)
             
             wxExpr *valueList = (wxExpr *) NULL;
             // Check for default value list
-            if ((valueList = expr->Nth(count)) && (valueList->Type() == PrologList))
+                       valueList = expr->Nth(count);
+            if (valueList && (valueList->Type() == PrologList))
             {
                 wxStringList stringList;
                 wxExpr *stringExpr = valueList->GetFirst();
@@ -1161,7 +1165,8 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, wxExpr *expr)
     {
         wxExpr *valueList = (wxExpr *) NULL;
         // Check for default value list
-        if ((valueList = expr->Nth(count)) && (valueList->Type() == PrologList))
+               valueList = expr->Nth(count);
+        if (valueList && (valueList->Type() == PrologList))
         {
             wxStringList stringList;
             wxExpr *stringExpr = valueList->GetFirst();
@@ -2646,10 +2651,10 @@ wxIcon wxResourceCreateIcon(const wxString& resource, wxResourceTable *table)
             {
 #ifdef __WXGTK__
                 wxLogWarning(_("Icon resource specification %s not found."), (const wxChar*) resource);
+                break;
 #else
                 return wxIcon(name, bitmapType);
 #endif
-                break;
             }
         }
         return wxNullIcon;

diff --git a/src/msw/clipbrd.cpp b/src/msw/clipbrd.cpp
index 9a2d7b327cfc75eff43843e18c41720fd4a250c2..ea427f7e8b84ece8ff7e77c3531e7f0f53b5b879 100644 (file)
--- a/src/msw/clipbrd.cpp
+++ b/src/msw/clipbrd.cpp
@@ -815,11 +815,11 @@ bool wxClipboard::GetData( wxDataObject& data )
         }
 #endif // wxUSE_METAFILE
     }
+    return FALSE;
 #else // !wxUSE_DATAOBJ
     wxFAIL_MSG( wxT("no clipboard implementation") );
-#endif // wxUSE_OLE_CLIPBOARD/wxUSE_DATAOBJ
-
     return FALSE;
+#endif // wxUSE_OLE_CLIPBOARD/wxUSE_DATAOBJ
 }
 
 #else

diff --git a/src/msw/curico.cpp b/src/msw/curico.cpp
index c8df51825e49b4a3001d2cd9967ee8c8a8f9d965..4e8f97154d9d12c9bad658a957887bff99accc8d 100644 (file)
--- a/src/msw/curico.cpp
+++ b/src/msw/curico.cpp
@@ -111,7 +111,7 @@ HANDLE ReadIcon( wxChar *szFileName, int *W, int *H)
     return (HANDLE) NULL;
 
   // inserted by P.S.
-  while( ((unsigned)nDirEntries < iconFileHead.wResourceCount) &&
+  while( (nDirEntries < iconFileHead.wResourceCount) &&
          ((iconFileRes.bWidth != nWidth) || (iconFileRes.bHeight != nHeight)))
   {
     cbRes = _lread( hFile, (LPSTR )&iconFileRes, sizeof( ICONFILERES));
@@ -359,7 +359,7 @@ HANDLE ReadCur( wxChar *szFileName, LPPOINT lpptHotSpot, int *W, int *H)
     return (HANDLE) NULL;
 
   // following added by P.S.
-  while( ((unsigned)nDirEntries < curFileHead.wResourceCount) &&
+  while( (nDirEntries < curFileHead.wResourceCount) &&
          ((curFileRes.bWidth != nWidth) || (curFileRes.bHeight != nHeight)))
   {
     cbRes = _lread( hFile, (LPSTR )&curFileRes, sizeof( CURFILERES));

diff --git a/src/msw/dib.cpp b/src/msw/dib.cpp
index f2e396eb85a643a87f9f7d788a685239f34841ca..40531079da9c34eb20dc7a9b78ed98aada51aab6 100644 (file)
--- a/src/msw/dib.cpp
+++ b/src/msw/dib.cpp
@@ -364,7 +364,7 @@ static DWORD PASCAL lread(int fh, void far *pv, DWORD ul)
                 ul -= MAXREAD;
                 hp += MAXREAD;
                 }
-        if (_lread(fh, (LPSTR) hp, (WORD) ul) != (WORD) ul)
+        if (_lread(fh, (LPSTR) hp, (WXUINT) ul) != (WXUINT) ul)
                 return 0;
         return ulT;
 }
@@ -394,7 +394,7 @@ static DWORD PASCAL lwrite(int fh, VOID FAR *pv, DWORD ul)
                 ul -= MAXREAD;
                 hp += MAXREAD;
                 }
-        if (_lwrite(fh, (LPSTR) hp, (WORD) ul) != (WORD) ul)
+        if (_lwrite(fh, (LPSTR) hp, (WXUINT) ul) != (WXUINT) ul)
                 return 0;
         return ulT;
 }
@@ -668,7 +668,7 @@ HPALETTE wxMakeDIBPalette(LPBITMAPINFOHEADER lpInfo)
         lpRGB = (RGBQUAD FAR *)((LPSTR)lpInfo + lpInfo->biSize);
 
         /* copy colors from the color table to the LogPalette structure */
-        for (i = 0; i < lpInfo->biClrUsed; i++, lpRGB++)
+        for (i = 0; (DWORD)i < lpInfo->biClrUsed; i++, lpRGB++)
         {
             npPal->palPalEntry[i].peRed = lpRGB->rgbRed;
             npPal->palPalEntry[i].peGreen = lpRGB->rgbGreen;

diff --git a/src/msw/listctrl.cpp b/src/msw/listctrl.cpp
index d8d0f17a593071f584bbc491276c6122fc01b129..2d363b6ac3f973a706833d538f694a7d6fe24bd5 100644 (file)
--- a/src/msw/listctrl.cpp
+++ b/src/msw/listctrl.cpp
@@ -1667,7 +1667,7 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                         return TRUE;
                 }
             }
-            break;
+//            break; // can never be reached
 #endif // _WIN32_IE >= 0x300
 
         default:

diff --git a/src/msw/settings.cpp b/src/msw/settings.cpp
index 5e05b92cdf488b0fe600a9b7c7c4cfb406cc740d..bfdb3d75061331660a7af9e0c09c5eb10ee8473f 100644 (file)
--- a/src/msw/settings.cpp
+++ b/src/msw/settings.cpp
@@ -45,13 +45,11 @@ wxColour wxSystemSettings::GetSystemColour(int index)
     {
         case wxSYS_COLOUR_LISTBOX:
             return *wxWHITE;
-            break;
     
         default:
             COLORREF ref = ::GetSysColor(index);
             wxColour col(GetRValue(ref), GetGValue(ref), GetBValue(ref));
             return col;
-                       break;
     }
 }
 

diff --git a/src/msw/treectrl.cpp b/src/msw/treectrl.cpp
index c8973fd6b2b34a6140b99dd73ad629c2893dd2bd..2489c62e3bfcb163c1c1268c635dca7d84fa1cdc 100644 (file)
--- a/src/msw/treectrl.cpp
+++ b/src/msw/treectrl.cpp
@@ -2224,7 +2224,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                         return TRUE;
                 }
             }
-            break;
+//            break;  // can never be reached
 #endif // _WIN32_IE >= 0x300
 
         case NM_DBLCLK:

diff --git a/src/msw/utils.cpp b/src/msw/utils.cpp
index b7a6ae1a48c71419bedb470556dda19ef0c0b446..e035e05457edc5fd0ba6712e59988239ab6cf2df 100644 (file)
--- a/src/msw/utils.cpp
+++ b/src/msw/utils.cpp
@@ -437,7 +437,7 @@ bool wxDirExists(const wxString& dir)
 {
 #if defined(__WIN32__)
     DWORD attribs = GetFileAttributes(dir);
-    return ((attribs != -1) && (attribs & FILE_ATTRIBUTE_DIRECTORY));
+    return ((attribs != (DWORD)-1) && (attribs & FILE_ATTRIBUTE_DIRECTORY));
 #else // Win16
     #ifdef __BORLANDC__
         struct ffblk fileInfo;