From 2917e9204382ec1ecc96de7fc98bd3068da2233c Mon Sep 17 00:00:00 2001 From: Brian Macy Date: Tue, 25 May 1999 23:51:10 +0000 Subject: [PATCH] Cleaned up some warnings git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2572 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/msw/dibutils.h | 7 ++++--- src/common/memory.cpp | 6 +++--- src/msw/dcmemory.cpp | 20 ++++++++++---------- src/msw/mdi.cpp | 8 ++++---- 4 files changed, 21 insertions(+), 20 deletions(-) diff --git a/include/wx/msw/dibutils.h b/include/wx/msw/dibutils.h index 746660d688..75970604f8 100644 --- 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 1826fb17c0..ac9c0b2143 100644 --- 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 dd76ffcd3a..573cfa02e0 100644 --- 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 eb34e34f23..950de37d67 100644 --- 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; -- 2.47.2