AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Cleaned up some warnings

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2572 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Brian Macy 1999-05-25 23:51:10 +00:00
parent dbe949828d
commit 2917e92043
4 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/wx/msw/dibutils.h
View File

@ -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))

6
src/common/memory.cpp
View File

@ -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(""));

20
src/msw/dcmemory.cpp
View File

@ -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;

8
src/msw/mdi.cpp
View File

@ -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;