Cleaned up some warnings

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

diff --git a/include/wx/msw/dibutils.h b/include/wx/msw/dibutils.h
index 746660d6886a65a1c8b49c487d32a7b6997b5f01..75970604f8296c89967b8ba75f08f9f906c5cfbc 100644 (file)
--- a/include/wx/msw/dibutils.h
+++ b/include/wx/msw/dibutils.h
@@ -112,9 +112,10 @@ PDIB        DibReadBitmapInfo(HFILE fh);
 #define FixBitmapInfo(lpbi)     if ((lpbi)->biSizeImage == 0)                 \
                                                                                                (lpbi)->biSizeImage = DibSizeImage(lpbi); \
                                 if ((lpbi)->biClrUsed == 0)                   \
-                                    (lpbi)->biClrUsed = DibNumColors(lpbi);   \
-                                if ((lpbi)->biCompression == BI_BITFIELDS && (lpbi)->biClrUsed == 0) \
-                                    ; // (lpbi)->biClrUsed = 3;                    
+                                    (lpbi)->biClrUsed = DibNumColors(lpbi);
+
+//                                if ((lpbi)->biCompression == BI_BITFIELDS && (lpbi)->biClrUsed == 0)
+//                                    ; // (lpbi)->biClrUsed = 3;                    
 
 #define DibInfo(pDIB)     ((BITMAPINFO FAR *)(pDIB))
 

diff --git a/src/common/memory.cpp b/src/common/memory.cpp
index 1826fb17c06c8fb4ddacb4efae65e7e980ff5792..ac9c0b214361b2dbb8580502cb46e0114a50d434 100644 (file)
--- a/src/common/memory.cpp
+++ b/src/common/memory.cpp
@@ -664,7 +664,7 @@ bool wxDebugContext::Dump(void)
 //  if (!HasStream())
 //    return FALSE;
 
-  if (TRUE)
+//  if (TRUE)
   {
     wxChar* appName = _T("application");
     wxString appNameStr("");
@@ -721,7 +721,7 @@ bool wxDebugContext::PrintStatistics(bool detailed)
 //  if (!HasStream())
 //    return FALSE;
 
-  if (TRUE)
+//  if (TRUE)
   {
     wxChar* appName = _T("application");
     wxString appNameStr(_T(""));
@@ -820,7 +820,7 @@ bool wxDebugContext::PrintClasses(void)
 //  if (!HasStream())
 //    return FALSE;
 
-  if (TRUE)
+//  if (TRUE)
   {
     wxChar* appName = _T("application");
     wxString appNameStr(_T(""));

diff --git a/src/msw/dcmemory.cpp b/src/msw/dcmemory.cpp
index dd76ffcd3acbca5546bf0c4b2e6645f9704deee8..573cfa02e014d3d7411435b79e0327d46f2cfe57 100644 (file)
--- a/src/msw/dcmemory.cpp
+++ b/src/msw/dcmemory.cpp
@@ -90,17 +90,17 @@ void wxMemoryDC::SelectObject(const wxBitmap& bitmap)
   // JACS 11/12/98: disabling this since the Forty Thieves sample
   // shows this not working properly. In fact, if loading from a resource,
   // the depth should become the screen depth, so why was it being called?
-  if (0)
-  {
-      // Make a new bitmap that has the correct depth.
-      wxBitmap newBitmap = bitmap.GetBitmapForDC(* this);
-
-      m_selectedBitmap = newBitmap ;
-  }
-  else
-  {
+//  if (0)
+//  {
+//      // Make a new bitmap that has the correct depth.
+//      wxBitmap newBitmap = bitmap.GetBitmapForDC(* this);
+//
+//      m_selectedBitmap = newBitmap ;
+//  }
+//  else
+//  {
       m_selectedBitmap = bitmap;
-  }
+//  }
 
   if (!m_selectedBitmap.Ok())
     return;

diff --git a/src/msw/mdi.cpp b/src/msw/mdi.cpp
index eb34e34f23b705c4d02b32968de1de1f06d1e012..950de37d67984e033b426826f6664bf8c065fdb3 100644 (file)
--- a/src/msw/mdi.cpp
+++ b/src/msw/mdi.cpp
@@ -100,8 +100,8 @@ inline bool IsMdiCommandId(int id)
     return (id >= wxFIRST_MDI_CHILD) && (id <= wxLAST_MDI_CHILD);
 }
 
-static UnpackMDIActivate(WXWPARAM wParam, WXLPARAM lParam,
-                         WXWORD *activate, WXHWND *hwndAct, WXHWND *hwndDeact);
+static void UnpackMDIActivate(WXWPARAM wParam, WXLPARAM lParam,
+                              WXWORD *activate, WXHWND *hwndAct, WXHWND *hwndDeact);
 
 // ===========================================================================
 // implementation
@@ -1174,8 +1174,8 @@ static void InsertWindowMenu(wxWindow *win, WXHMENU menu, HMENU subMenu)
     MDISetMenu(win, hmenu, subMenu);
 }
 
-static UnpackMDIActivate(WXWPARAM wParam, WXLPARAM lParam,
-                         WXWORD *activate, WXHWND *hwndAct, WXHWND *hwndDeact)
+static void UnpackMDIActivate(WXWPARAM wParam, WXLPARAM lParam,
+                              WXWORD *activate, WXHWND *hwndAct, WXHWND *hwndDeact)
 {
 #ifdef __WIN32__
     *activate = TRUE;