From 48c12cb1290224f44161d9af774170d5f0fae440 Mon Sep 17 00:00:00 2001
From: Patrick Albert <als@barjov.frmug.fr.net>
Date: Fri, 27 Aug 1999 11:46:55 +0000
Subject: [PATCH] Removing some level 3 warning Updating samples\makefile.vc
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3503 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
samples/makefile.dos | 12 +-
samples/makefile.vc | 241 +++++++++++++++++++++++----------
src/common/cmndata.cpp | 10 +-
src/common/file.cpp | 2 +-
src/common/image.cpp | 4 +
src/common/list.cpp | 2 +-
src/common/odbc.cpp | 2 +-
src/common/resource.cpp | 2 +-
src/generic/gridg.cpp | 12 +-
src/msw/bitmap.cpp | 4 +-
src/msw/curico.cpp | 4 +-
src/msw/dc.cpp | 4 +-
src/msw/dcprint.cpp | 2 +-
src/msw/dib.cpp | 4 +-
src/msw/dibutils.cpp | 2 +-
src/msw/makefile.vc | 12 +-
src/msw/mdi.cpp | 2 +-
src/msw/minifram.cpp | 2 +-
utils/tex2rtf/src/htmlutil.cpp | 2 +-
utils/tex2rtf/src/makefile.vc | 3 +-
20 files changed, 209 insertions(+), 119 deletions(-)
diff --git a/samples/makefile.dos b/samples/makefile.dos
index 8537373e54..74eb211d9c 100644
--- a/samples/makefile.dos
+++ b/samples/makefile.dos
@@ -23,10 +23,6 @@ THISDIR=$(WXDIR)\samples
NOMAKE=1
# No 16 bit version
ONLY32=1
-# PNG unresolved
-PNGSETUP=1
-# DND not set in setup.h
-DNDSETUP=1
# Misc. compilation errors
COMPIL=1
@@ -54,7 +50,7 @@ all:
nmake -f makefile.dos FINAL=$(FINAL)
cd $(WXDIR)\samples\dialogs
nmake -f makefile.dos FINAL=$(FINAL)
-!if "$(DNDSETUP)"==""
+!if "$(ONLY32)"==""
cd $(WXDIR)\samples\dnd
nmake -f makefile.dos FINAL=$(FINAL)
!endif
@@ -78,10 +74,8 @@ all:
cd $(WXDIR)\samples\html
nmake -f makefile.dos FINAL=$(FINAL)
!endif
-!if "$(PNGSETUP)"==""
cd $(WXDIR)\samples\image
nmake -f makefile.dos FINAL=$(FINAL)
-!endif
cd $(WXDIR)\samples\internat
nmake -f makefile.dos FINAL=$(FINAL)
cd $(WXDIR)\samples\joytest
@@ -136,10 +130,8 @@ all:
cd $(WXDIR)\samples\sashtest
nmake -f makefile.dos FINAL=$(FINAL)
!endif
-!if "$(PNGSETUP)"==""
cd $(WXDIR)\samples\scroll
nmake -f makefile.dos FINAL=$(FINAL)
-!endif
cd $(WXDIR)\samples\splitter
nmake -f makefile.dos FINAL=$(FINAL)
!if "$(COMPIL)"==""
@@ -156,10 +148,8 @@ all:
!endif
cd $(WXDIR)\samples\toolbar
nmake -f makefile.dos FINAL=$(FINAL)
-!if "$(PNGSETUP)"==""
cd $(WXDIR)\samples\treectrl
nmake -f makefile.dos FINAL=$(FINAL)
-!endif
!if "$(COMPIL)"==""
cd $(WXDIR)\samples\typetest
nmake -f makefile.dos FINAL=$(FINAL)
diff --git a/samples/makefile.vc b/samples/makefile.vc
index bd495eae05..d118850306 100644
--- a/samples/makefile.vc
+++ b/samples/makefile.vc
@@ -7,7 +7,7 @@
#
# "%W% %G%"
#
-# Makefile : Builds samples for Win95, MSVC++ 4.0
+# Makefile : Builds samples for Win95, MSVC++ 16-bit
# Use FINAL=1 argument to nmake to build final version with no debugging
# info
@@ -16,167 +16,258 @@ WXDIR = $(WXWIN)
THISDIR=$(WXDIR)\samples
-!include $(WXDIR)\src\makevc.env
+#
+# Indicates kind of pb with samples
+#
+# No makefile.vc file
+NOMAKE=1
+# No 16 bit version
+#ONLY32=1
+# Misc. compilation errors
+COMPIL=1
+# Need PNG
+PNGSETUP=1
-DEBUG_FLAGS="/Zi /FR"
-LINK_DEBUG_FLAGS="/RELEASE"
+!include $(WXDIR)\src\makemsc.env
+#
+# Please keep samples list up-to-date, in alphabetical order
+#
all:
- cd $(WXDIR)\samples\splitter
+ cd $(WXDIR)\samples\bombs
nmake -f makefile.vc FINAL=$(FINAL)
- cd $(WXDIR)\samples\resource
+ cd $(WXDIR)\samples\caret
+ nmake -f makefile.vc FINAL=$(FINAL)
+ cd $(WXDIR)\samples\checklst
+ nmake -f makefile.vc FINAL=$(FINAL)
+ cd $(WXDIR)\samples\config
nmake -f makefile.vc FINAL=$(FINAL)
cd $(WXDIR)\samples\controls
nmake -f makefile.vc FINAL=$(FINAL)
- cd $(WXDIR)\samples\listctrl
+!if "$(COMPIL)"==""
+ cd $(WXDIR)\samples\db
nmake -f makefile.vc FINAL=$(FINAL)
- cd $(WXDIR)\samples\treectrl
+!endif
+ cd $(WXDIR)\samples\dde
nmake -f makefile.vc FINAL=$(FINAL)
- cd $(WXDIR)\samples\validate
+ cd $(WXDIR)\samples\dialogs
nmake -f makefile.vc FINAL=$(FINAL)
- cd $(WXDIR)\samples\mdi
+ cd $(WXDIR)\samples\dnd
nmake -f makefile.vc FINAL=$(FINAL)
- cd $(WXDIR)\samples\minimal
+ cd $(WXDIR)\samples\docview
nmake -f makefile.vc FINAL=$(FINAL)
- cd $(WXDIR)\samples\layout
+ cd $(WXDIR)\samples\docvwmdi
nmake -f makefile.vc FINAL=$(FINAL)
- cd $(WXDIR)\samples\printing
+ cd $(WXDIR)\samples\drawing
nmake -f makefile.vc FINAL=$(FINAL)
- cd $(WXDIR)\samples\toolbar
+ cd $(WXDIR)\samples\dynamic
nmake -f makefile.vc FINAL=$(FINAL)
- cd $(WXDIR)\samples\dialogs
+ cd $(WXDIR)\samples\forty
nmake -f makefile.vc FINAL=$(FINAL)
- cd $(WXDIR)\samples\docview
+ cd $(WXDIR)\samples\fractal
nmake -f makefile.vc FINAL=$(FINAL)
- cd $(WXDIR)\samples\docvwmdi
+ cd $(WXDIR)\samples\grid
nmake -f makefile.vc FINAL=$(FINAL)
- cd $(WXDIR)\samples\controls
+!if "$(COMPIL)"==""
+ cd $(WXDIR)\samples\help
nmake -f makefile.vc FINAL=$(FINAL)
- cd $(WXDIR)\samples\nativdlg
+!endif
+!if "$(PNGSETUP)"==""
+ cd $(WXDIR)\samples\html
nmake -f makefile.vc FINAL=$(FINAL)
- cd $(WXDIR)\samples\grid
+!endif
+ cd $(WXDIR)\samples\image
nmake -f makefile.vc FINAL=$(FINAL)
cd $(WXDIR)\samples\internat
nmake -f makefile.vc FINAL=$(FINAL)
- cd $(WXDIR)\samples\dnd
- nmake -f makefile.vc FINAL=$(FINAL)
cd $(WXDIR)\samples\joytest
nmake -f makefile.vc FINAL=$(FINAL)
- cd $(WXDIR)\samples\taskbar
+ cd $(WXDIR)\samples\layout
nmake -f makefile.vc FINAL=$(FINAL)
- cd $(WXDIR)\samples\sashtest
+ cd $(WXDIR)\samples\listctrl
nmake -f makefile.vc FINAL=$(FINAL)
- cd $(WXDIR)\samples\config
+ cd $(WXDIR)\samples\mdi
nmake -f makefile.vc FINAL=$(FINAL)
!if "$(FINAL)" == "0"
cd $(WXDIR)\samples\memcheck
+ nmake -f makefile.vc FINAL=$(FINAL)
!endif
+!if "$(COMPIL)"==""
+ cd $(WXDIR)\samples\mfc
nmake -f makefile.vc FINAL=$(FINAL)
- cd $(WXDIR)\samples\ownerdrw
+!endif
+ cd $(WXDIR)\samples\minifram
nmake -f makefile.vc FINAL=$(FINAL)
- cd $(WXDIR)\samples\checklst
+ cd $(WXDIR)\samples\minimal
nmake -f makefile.vc FINAL=$(FINAL)
- cd $(WXDIR)\samples\minifram
+ cd $(WXDIR)\samples\nativdlg
nmake -f makefile.vc FINAL=$(FINAL)
- cd $(WXDIR)\samples\bombs
+ cd $(WXDIR)\samples\notebook
nmake -f makefile.vc FINAL=$(FINAL)
- cd $(WXDIR)\samples\fractal
+ cd $(WXDIR)\samples\oleauto
nmake -f makefile.vc FINAL=$(FINAL)
- cd $(WXDIR)\samples\wxpoem
+ cd $(WXDIR)\samples\ownerdrw
nmake -f makefile.vc FINAL=$(FINAL)
- cd $(WXDIR)\samples\typetest
+ cd $(WXDIR)\samples\png
+ nmake -f makefile.vc FINAL=$(FINAL)
+ cd $(WXDIR)\samples\printing
nmake -f makefile.vc FINAL=$(FINAL)
cd $(WXDIR)\samples\proplist
nmake -f makefile.vc FINAL=$(FINAL)
- cd $(WXDIR)\samples\image
+!if "$(COMPIL)"==""
+ cd $(WXDIR)\samples\regtest
nmake -f makefile.vc FINAL=$(FINAL)
- cd $(WXDIR)\samples\dde
- nmake -f client.vc FINAL=$(FINAL)
- nmake -f server.vc FINAL=$(FINAL)
- cd $(WXDIR)\samples\caret
+!endif
+ cd $(WXDIR)\samples\resource
nmake -f makefile.vc FINAL=$(FINAL)
- cd $(WXDIR)\samples\drawing
+!if "$(COMPIL)"==""
+ cd $(WXDIR)\samples\richedit
+ nmake -f makefile.vc FINAL=$(FINAL)
+!endif
+ cd $(WXDIR)\samples\sashtest
nmake -f makefile.vc FINAL=$(FINAL)
cd $(WXDIR)\samples\scroll
nmake -f makefile.vc FINAL=$(FINAL)
-# cd $(WXDIR)\samples\regtest
-# nmake -f makefile.vc FINAL=$(FINAL)
+ cd $(WXDIR)\samples\splitter
+ nmake -f makefile.vc FINAL=$(FINAL)
+!if "$(COMPIL)"==""
+ cd $(WXDIR)\samples\tab
+ nmake -f makefile.vc FINAL=$(FINAL)
+ cd $(WXDIR)\samples\taskbar
+ nmake -f makefile.vc FINAL=$(FINAL)
+!endif
+ cd $(WXDIR)\samples\text
+ nmake -f makefile.vc FINAL=$(FINAL)
+ cd $(WXDIR)\samples\thread
+ nmake -f makefile.vc FINAL=$(FINAL)
+ cd $(WXDIR)\samples\toolbar
+ nmake -f makefile.vc FINAL=$(FINAL)
+ cd $(WXDIR)\samples\treectrl
+ nmake -f makefile.vc FINAL=$(FINAL)
+!if "$(COMPIL)"==""
+ cd $(WXDIR)\samples\typetest
+ nmake -f makefile.vc FINAL=$(FINAL)
+!endif
+ cd $(WXDIR)\samples\validate
+ nmake -f makefile.vc FINAL=$(FINAL)
+!if "$(NOMAKE)"==""
+ cd $(WXDIR)\samples\wizard
+ nmake -f makefile.vc FINAL=$(FINAL)
+!endif
+ cd $(WXDIR)\samples\wxpoem
+ nmake -f makefile.vc FINAL=$(FINAL)
+!if "$(COMPIL)"==""
+ cd $(WXDIR)\samples\wxsocket
+ nmake -f makefile.vc FINAL=$(FINAL)
+!endif
clean:
- cd $(WXDIR)\samples\splitter
- nmake -f makefile.vc clean
- cd $(WXDIR)\samples\mdi
- nmake -f makefile.vc clean
- cd $(WXDIR)\samples\minimal
+ cd $(WXDIR)\samples\bombs
nmake -f makefile.vc clean
- cd $(WXDIR)\samples\layout
+ cd $(WXDIR)\samples\caret
nmake -f makefile.vc clean
- cd $(WXDIR)\samples\printing
+ cd $(WXDIR)\samples\checklst
nmake -f makefile.vc clean
- cd $(WXDIR)\samples\toolbar
+ cd $(WXDIR)\samples\config
nmake -f makefile.vc clean
- cd $(WXDIR)\samples\dialogs
+ cd $(WXDIR)\samples\controls
nmake -f makefile.vc clean
- cd $(WXDIR)\samples\resource
+ cd $(WXDIR)\samples\db
nmake -f makefile.vc clean
- cd $(WXDIR)\samples\listctrl
+ cd $(WXDIR)\samples\dde
nmake -f makefile.vc clean
- cd $(WXDIR)\samples\treectrl
+ cd $(WXDIR)\samples\dialogs
nmake -f makefile.vc clean
- cd $(WXDIR)\samples\validate
+ cd $(WXDIR)\samples\dnd
nmake -f makefile.vc clean
cd $(WXDIR)\samples\docview
nmake -f makefile.vc clean
cd $(WXDIR)\samples\docvwmdi
nmake -f makefile.vc clean
- cd $(WXDIR)\samples\controls
+ cd $(WXDIR)\samples\drawing
nmake -f makefile.vc clean
- cd $(WXDIR)\samples\nativdlg
+ cd $(WXDIR)\samples\dynamic
+ nmake -f makefile.vc clean
+ cd $(WXDIR)\samples\forty
+ nmake -f makefile.vc clean
+ cd $(WXDIR)\samples\fractal
nmake -f makefile.vc clean
cd $(WXDIR)\samples\grid
nmake -f makefile.vc clean
- cd $(WXDIR)\samples\internat
+ cd $(WXDIR)\samples\help
nmake -f makefile.vc clean
- cd $(WXDIR)\samples\checklst
+ cd $(WXDIR)\samples\html
nmake -f makefile.vc clean
- cd $(WXDIR)\samples\ownerdrw
+ cd $(WXDIR)\samples\image
nmake -f makefile.vc clean
- cd $(WXDIR)\samples\dnd
+ cd $(WXDIR)\samples\internat
nmake -f makefile.vc clean
cd $(WXDIR)\samples\joytest
nmake -f makefile.vc clean
- cd $(WXDIR)\samples\regtest
- nmake -f makefile.vc clean
- cd $(WXDIR)\samples\taskbar
+ cd $(WXDIR)\samples\layout
nmake -f makefile.vc clean
- cd $(WXDIR)\samples\sashtest
+ cd $(WXDIR)\samples\listctrl
nmake -f makefile.vc clean
- cd $(WXDIR)\samples\config
+ cd $(WXDIR)\samples\mdi
nmake -f makefile.vc clean
+!if "$(FINAL)" == "0"
cd $(WXDIR)\samples\memcheck
nmake -f makefile.vc clean
+!endif
+ cd $(WXDIR)\samples\mfc
+ nmake -f makefile.vc clean
cd $(WXDIR)\samples\minifram
nmake -f makefile.vc clean
- cd $(WXDIR)\samples\bombs
+ cd $(WXDIR)\samples\minimal
nmake -f makefile.vc clean
- cd $(WXDIR)\samples\fractal
+ cd $(WXDIR)\samples\nativdlg
nmake -f makefile.vc clean
- cd $(WXDIR)\samples\wxpoem
+ cd $(WXDIR)\samples\notebook
nmake -f makefile.vc clean
- cd $(WXDIR)\samples\typetest
+ cd $(WXDIR)\samples\oleauto
+ nmake -f makefile.vc clean
+ cd $(WXDIR)\samples\ownerdrw
+ nmake -f makefile.vc clean
+ cd $(WXDIR)\samples\png
+ nmake -f makefile.vc clean
+ cd $(WXDIR)\samples\printing
nmake -f makefile.vc clean
cd $(WXDIR)\samples\proplist
nmake -f makefile.vc clean
- cd $(WXDIR)\samples\image
+ cd $(WXDIR)\samples\regtest
nmake -f makefile.vc clean
- cd $(WXDIR)\samples\dde
- nmake -f client.vc clean
- nmake -f server.vc clean
- cd $(WXDIR)\samples\caret
+ cd $(WXDIR)\samples\resource
nmake -f makefile.vc clean
- cd $(WXDIR)\samples\drawing
+ cd $(WXDIR)\samples\richedit
+ nmake -f makefile.vc clean
+ cd $(WXDIR)\samples\sashtest
nmake -f makefile.vc clean
cd $(WXDIR)\samples\scroll
nmake -f makefile.vc clean
- cd $(WXDIR)\samples
+ cd $(WXDIR)\samples\splitter
+ nmake -f makefile.vc clean
+ cd $(WXDIR)\samples\tab
+ nmake -f makefile.vc clean
+ cd $(WXDIR)\samples\taskbar
+ nmake -f makefile.vc clean
+ cd $(WXDIR)\samples\text
+ nmake -f makefile.vc clean
+ cd $(WXDIR)\samples\thread
+ nmake -f makefile.vc clean
+ cd $(WXDIR)\samples\toolbar
+ nmake -f makefile.vc clean
+ cd $(WXDIR)\samples\treectrl
+ nmake -f makefile.vc clean
+ cd $(WXDIR)\samples\typetest
+ nmake -f makefile.vc clean
+ cd $(WXDIR)\samples\validate
+ nmake -f makefile.vc clean
+!if "$(NOMAKE)"==""
+ cd $(WXDIR)\samples\wizard
+ nmake -f makefile.vc clean
+!endif
+ cd $(WXDIR)\samples\wxpoem
+ nmake -f makefile.vc clean
+ cd $(WXDIR)\samples\wxsocket
+ nmake -f makefile.vc clean
diff --git a/src/common/cmndata.cpp b/src/common/cmndata.cpp
index b9c2c8fc0b..1d00b53bf7 100644
--- a/src/common/cmndata.cpp
+++ b/src/common/cmndata.cpp
@@ -219,7 +219,7 @@ wxPrintData::wxPrintData(const wxPrintData& printData)
wxPrintData::~wxPrintData()
{
#ifdef __WXMSW__
- HGLOBAL hDevMode = (HGLOBAL) m_devMode;
+ HGLOBAL hDevMode = (HGLOBAL)(DWORD) m_devMode;
if (hDevMode )
GlobalFree(hDevMode);
#endif
@@ -264,7 +264,7 @@ static wxString wxGetPrintDlgError()
void wxPrintData::ConvertToNative()
{
- HGLOBAL hDevMode = (HGLOBAL) m_devMode;
+ HGLOBAL hDevMode = (HGLOBAL)(DWORD) m_devMode;
if (!hDevMode)
{
// Use PRINTDLG as a way of creating a DEVMODE object
@@ -435,7 +435,7 @@ void wxPrintData::ConvertToNative()
void wxPrintData::ConvertFromNative()
{
- HGLOBAL hDevMode = (HGLOBAL) m_devMode;
+ HGLOBAL hDevMode = (HGLOBAL)(DWORD) m_devMode;
if (!hDevMode)
return;
@@ -755,7 +755,7 @@ void wxPrintDialogData::ConvertToNative()
GlobalFree(pd->hDevMode);
}
- pd->hDevMode = (HGLOBAL) m_printData.GetNativeData();
+ pd->hDevMode = (HGLOBAL)(DWORD) m_printData.GetNativeData();
m_printData.SetNativeData((void*) NULL);
@@ -817,7 +817,7 @@ void wxPrintDialogData::ConvertFromNative()
if (m_printData.GetNativeData())
{
// Make sure we don't leak memory
- GlobalFree((HGLOBAL) m_printData.GetNativeData());
+ GlobalFree((HGLOBAL)(DWORD) m_printData.GetNativeData());
}
m_printData.SetNativeData((void*) pd->hDevMode);
pd->hDevMode = NULL;
diff --git a/src/common/file.cpp b/src/common/file.cpp
index 6b65c35e82..459e3d3709 100644
--- a/src/common/file.cpp
+++ b/src/common/file.cpp
@@ -500,7 +500,7 @@ bool wxTempFile::Open(const wxString& strName)
if ( !GetTempFileName(strPath, _T("wx_"),0, m_strTemp.GetWriteBuf(MAX_PATH)) )
#else
// Not sure why MSVC++ 1.5 header defines first param as BYTE - bug?
- if ( !GetTempFileName((BYTE) (const wxChar*) strPath, _T("wx_"),0, m_strTemp.GetWriteBuf(MAX_PATH)) )
+ if ( !GetTempFileName((BYTE) (DWORD)(const wxChar*) strPath, _T("wx_"),0, m_strTemp.GetWriteBuf(MAX_PATH)) )
#endif
wxLogLastError(_T("GetTempFileName"));
m_strTemp.UngetWriteBuf();
diff --git a/src/common/image.cpp b/src/common/image.cpp
index ac9acecf15..ab36e52be6 100644
--- a/src/common/image.cpp
+++ b/src/common/image.cpp
@@ -682,7 +682,11 @@ wxBitmap wxImage::ConvertToBitmap() const
return wxNullBitmap;
// sizeLimit is the MS upper limit for the DIB size
+#ifdef WIN32
int sizeLimit = 1024*768*3;
+#else
+ int sizeLimit = 0x7fff ;
+#endif
// width and height of the device-dependent bitmap
int width = GetWidth();
diff --git a/src/common/list.cpp b/src/common/list.cpp
index 8196c3eb26..48a91d0d9e 100644
--- a/src/common/list.cpp
+++ b/src/common/list.cpp
@@ -563,7 +563,7 @@ wxStringList::wxStringList (const wxChar *first, ...)
s = va_arg(ap, const wxChar *);
// if (s == NULL)
#ifdef __WXMSW__
- if ((int) s == 0)
+ if ((int)(long) s == 0)
#else
if ((long) s == 0)
#endif
diff --git a/src/common/odbc.cpp b/src/common/odbc.cpp
index f82a986409..224738bda4 100644
--- a/src/common/odbc.cpp
+++ b/src/common/odbc.cpp
@@ -443,7 +443,7 @@ float wxDatabase::GetODBCVersionFloat(bool implementation)
if (retcode == SQL_ERROR)
return 0.0;
else
- return atof(buf);
+ return (float)atof(buf);
}
/*
diff --git a/src/common/resource.cpp b/src/common/resource.cpp
index 5e4842f6b3..47f9a2afba 100644
--- a/src/common/resource.cpp
+++ b/src/common/resource.cpp
@@ -2504,7 +2504,7 @@ int wxResourceGetIdentifier(const wxString& name, wxResourceTable *table)
if (!table)
table = wxDefaultResourceTable;
- return (int)table->identifiers.Get(name);
+ return (int)(long)table->identifiers.Get(name);
}
/*
diff --git a/src/generic/gridg.cpp b/src/generic/gridg.cpp
index b8ccc24fc7..cb590108cb 100644
--- a/src/generic/gridg.cpp
+++ b/src/generic/gridg.cpp
@@ -1786,21 +1786,21 @@ void wxGenericGrid::DrawTextRect(wxDC *dc, const wxString& text, wxRect *rect, i
{
case wxRIGHT:
{
- x = (rect->x + rect->width - textWidth - 1.0);
- y = (rect->y + (rect->height - textHeight)/2.0);
+ x = (rect->x + rect->width - textWidth - (float)1.0);
+ y = (rect->y + (rect->height - textHeight)/(float)2.0);
break;
}
case wxCENTRE:
{
- x = (rect->x + (rect->width - textWidth)/2.0);
- y = (rect->y + (rect->height - textHeight)/2.0);
+ x = (rect->x + (rect->width - textWidth)/(float)2.0);
+ y = (rect->y + (rect->height - textHeight)/(float)2.0);
break;
}
case wxLEFT:
default:
{
- x = (rect->x + 1.0);
- y = (rect->y + (rect->height - textHeight)/2.0);
+ x = (rect->x + (float)1.0);
+ y = (rect->y + (rect->height - textHeight)/(float)2.0);
break;
}
}
diff --git a/src/msw/bitmap.cpp b/src/msw/bitmap.cpp
index 29926d61d2..40b199abce 100644
--- a/src/msw/bitmap.cpp
+++ b/src/msw/bitmap.cpp
@@ -80,7 +80,7 @@ wxBitmapRefData::~wxBitmapRefData()
if (m_selectedInto)
{
wxChar buf[200];
- wxSprintf(buf, _T("Bitmap was deleted without selecting out of wxMemoryDC %X."), (unsigned int) m_selectedInto);
+ wxSprintf(buf, _T("Bitmap was deleted without selecting out of wxMemoryDC %lX."), (unsigned long) m_selectedInto);
wxFatalError(buf);
}
if (m_hBitmap)
@@ -146,7 +146,7 @@ bool wxBitmap::FreeResource(bool WXUNUSED(force))
if (M_BITMAPDATA->m_selectedInto)
{
wxChar buf[200];
- wxSprintf(buf, _T("Bitmap %X was deleted without selecting out of wxMemoryDC %X."), (unsigned int) this, (unsigned int) M_BITMAPDATA->m_selectedInto);
+ wxSprintf(buf, _T("Bitmap %lX was deleted without selecting out of wxMemoryDC %lX."), (unsigned long) this, (unsigned long) M_BITMAPDATA->m_selectedInto);
wxFatalError(buf);
}
if (M_BITMAPDATA->m_hBitmap)
diff --git a/src/msw/curico.cpp b/src/msw/curico.cpp
index 5bd16e67a0..518563ba23 100644
--- a/src/msw/curico.cpp
+++ b/src/msw/curico.cpp
@@ -113,7 +113,7 @@ HANDLE ReadIcon( wxChar *szFileName, int *W, int *H)
return (HANDLE) NULL;
// inserted by P.S.
- while( (nDirEntries < iconFileHead.wResourceCount) &&
+ while( ((unsigned)nDirEntries < iconFileHead.wResourceCount) &&
((iconFileRes.bWidth != nWidth) || (iconFileRes.bHeight != nHeight)))
{
cbRes = _lread( hFile, (LPSTR )&iconFileRes, sizeof( ICONFILERES));
@@ -361,7 +361,7 @@ HANDLE ReadCur( wxChar *szFileName, LPPOINT lpptHotSpot, int *W, int *H)
return (HANDLE) NULL;
// following added by P.S.
- while( (nDirEntries < curFileHead.wResourceCount) &&
+ while( ((unsigned)nDirEntries < curFileHead.wResourceCount) &&
((curFileRes.bWidth != nWidth) || (curFileRes.bHeight != nHeight)))
{
cbRes = _lread( hFile, (LPSTR )&curFileRes, sizeof( CURFILERES));
diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp
index f424405768..fa195426e2 100644
--- a/src/msw/dc.cpp
+++ b/src/msw/dc.cpp
@@ -377,8 +377,8 @@ void wxDC::DoDrawArc(long x1,long y1,long x2,long y2, long xc, long yc)
Arc(GetHdc(),xxx1,yyy1,xxx2,yyy2,
xx1,yy1,xx2,yy2);
- CalcBoundingBox((xc-radius), (yc-radius));
- CalcBoundingBox((xc+radius), (yc+radius));
+ CalcBoundingBox((long)(xc-radius), (long)(yc-radius));
+ CalcBoundingBox((long)(xc+radius), (long)(yc+radius));
}
void wxDC::DoDrawPoint(long x, long y)
diff --git a/src/msw/dcprint.cpp b/src/msw/dcprint.cpp
index bd7399b58c..fbd402eec5 100644
--- a/src/msw/dcprint.cpp
+++ b/src/msw/dcprint.cpp
@@ -361,7 +361,7 @@ WXHDC WXDLLEXPORT wxGetPrinterDC(const wxPrintData& printDataConst)
LPDEVMODE lpDevMode = (LPDEVMODE) NULL;
- HGLOBAL hDevMode = (HGLOBAL) printData.GetNativeData();
+ HGLOBAL hDevMode = (HGLOBAL)(DWORD) printData.GetNativeData();
if ( hDevMode )
lpDevMode = (DEVMODE*) GlobalLock(hDevMode);
diff --git a/src/msw/dib.cpp b/src/msw/dib.cpp
index e4f8360ad6..c488c6e19e 100644
--- a/src/msw/dib.cpp
+++ b/src/msw/dib.cpp
@@ -647,7 +647,7 @@ HPALETTE MakeDIBPalette(LPBITMAPINFOHEADER lpInfo)
#ifdef __WXWINE__
return (FALSE);
#else
- NPLOGPALETTE npPal;
+ LPLOGPALETTE npPal;
RGBQUAD far *lpRGB;
HPALETTE hLogPal;
WORD i;
@@ -661,7 +661,7 @@ HPALETTE MakeDIBPalette(LPBITMAPINFOHEADER lpInfo)
npPal = (NPLOGPALETTE)LocalAlloc(LMEM_FIXED, sizeof(LOGPALETTE) +
(WORD)lpInfo->biClrUsed * sizeof(PALETTEENTRY));
*/
- npPal = (NPLOGPALETTE)malloc(sizeof(LOGPALETTE) +
+ npPal = (LPLOGPALETTE)malloc(sizeof(LOGPALETTE) +
(WORD)lpInfo->biClrUsed * sizeof(PALETTEENTRY));
if (!npPal)
return(FALSE);
diff --git a/src/msw/dibutils.cpp b/src/msw/dibutils.cpp
index 31bcfb7e29..923135a2a4 100644
--- a/src/msw/dibutils.cpp
+++ b/src/msw/dibutils.cpp
@@ -716,7 +716,7 @@ HPALETTE MakePalette(const BITMAPINFO FAR* Info, UINT flags)
logPal->palVersion = 0x300; // Windows 3.0 version
logPal->palNumEntries = nColors;
- for (short n = 0; n < nColors; n++) {
+ for (WORD n = 0; n < nColors; n++) {
logPal->palPalEntry[n].peRed = rgb[n].rgbRed;
logPal->palPalEntry[n].peGreen = rgb[n].rgbGreen;
logPal->palPalEntry[n].peBlue = rgb[n].rgbBlue;
diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index 1f826d00fb..13a878eeb2 100644
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -674,25 +674,29 @@ $(DOCDIR)/latex/techref/techref.rtf: $(DOCDIR)/latex/techref/techref.tex
$(DOCDIR)/pdf/wx.rtf: $(DOCDIR)/latex/wx/classes.tex $(DOCDIR)/latex/wx/body.tex $(DOCDIR)/latex/wx/topics.tex $(DOCDIR)/latex/wx/manual.tex
cd $(DOCDIR)\latex\wx
- -copy *.bmp *.wmf $(DOCDIR)\pdf
+ -copy *.wmf $(DOCDIR)\pdf
+ -copy *.bmp $(DOCDIR)\pdf
-start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/wx/manual.tex $(DOCDIR)/pdf/wx.rtf -twice -rtf
cd $(THISDIR)
$(DOCDIR)/pdf/porting.rtf: $(DOCDIR)/latex/porting/porting.tex
cd $(DOCDIR)\latex\porting
- -copy *.bmp *.wmf $(DOCDIR)\pdf
+ -copy *.wmf $(DOCDIR)\pdf
+ -copy *.bmp $(DOCDIR)\pdf
-start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/porting/porting.tex $(DOCDIR)/pdf/porting.rtf -twice -rtf
cd $(THISDIR)
$(DOCDIR)/pdf/prop.rtf: $(DOCDIR)/latex/proplist/prop.tex $(DOCDIR)/latex/proplist/body.tex $(DOCDIR)/latex/proplist/classes.tex $(DOCDIR)/latex/proplist/changes.tex
cd $(DOCDIR)\latex\proplist
- -copy *.bmp *.wmf $(DOCDIR)\pdf
+ -copy *.bmp $(DOCDIR)\pdf
+ -copy *.wmf $(DOCDIR)\pdf
-start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/proplist/prop.tex $(DOCDIR)/pdf/prop.rtf -twice -rtf
cd $(THISDIR)
$(DOCDIR)/pdf/techref.rtf: $(DOCDIR)/latex/techref/techref.tex
cd $(DOCDIR)\latex\techref
- -copy *.bmp *.wmf $(DOCDIR)\pdf
+ -copy *.wmf $(DOCDIR)\pdf
+ -copy *.bmp $(DOCDIR)\pdf
-start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/techref/techref.tex $(DOCDIR)/pdf/techref.rtf -twice -rtf
cd $(THISDIR)
diff --git a/src/msw/mdi.cpp b/src/msw/mdi.cpp
index 499c4f4972..cfd5d647ce 100644
--- a/src/msw/mdi.cpp
+++ b/src/msw/mdi.cpp
@@ -482,7 +482,7 @@ bool wxMDIParentFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND hwnd)
if ( child->GetHWND() )
{
long childId = wxGetWindowId(child->GetHWND());
- if (childId == id)
+ if (childId == (long)id)
{
::SendMessage( GetWinHwnd(GetClientWindow()),
WM_MDIACTIVATE,
diff --git a/src/msw/minifram.cpp b/src/msw/minifram.cpp
index 819e0b01d3..aee0054b64 100644
--- a/src/msw/minifram.cpp
+++ b/src/msw/minifram.cpp
@@ -983,7 +983,7 @@ BOOL PASCAL DrawCaption( HDC hDC, HWND hWnd, LPRECT lprc,
SetBkMode( hDC, nBkMode ) ;
#ifdef __WIN16__
- GlobalFreePtr( (unsigned int) lpsz ) ;
+ GlobalFreePtr( (unsigned int)(DWORD) lpsz ) ;
#else
GlobalFreePtr( lpsz ) ;
#endif
diff --git a/utils/tex2rtf/src/htmlutil.cpp b/utils/tex2rtf/src/htmlutil.cpp
index d29e17b7f3..487fb97a62 100644
--- a/utils/tex2rtf/src/htmlutil.cpp
+++ b/utils/tex2rtf/src/htmlutil.cpp
@@ -2021,7 +2021,7 @@ bool HTMLOnArgument(int macroId, int arg_no, bool start)
if (imageFile)
delete[] imageFile;
imageFile = NULL;
- if (f)
+ if (!f.IsEmpty())
{
imageFile = copystring(f);
}
diff --git a/utils/tex2rtf/src/makefile.vc b/utils/tex2rtf/src/makefile.vc
index fb16a0e098..bf9327aca7 100644
--- a/utils/tex2rtf/src/makefile.vc
+++ b/utils/tex2rtf/src/makefile.vc
@@ -110,7 +110,8 @@ $(LOCALDOCDIR)\tex2rtf.rtf: $(DOCSOURCES)
$(DOCDIR)\pdf\tex2rtf.rtf: $(DOCSOURCES)
cd $(LOCALDOCDIR)
- -copy *.bmp *.wmf $(DOCDIR)\pdf
+ -copy *.wmf $(DOCDIR)\pdf
+ -copy *.bmp $(DOCDIR)\pdf
-start /w tex2rtf $(LOCALDOCDIR)\tex2rtf.tex $(DOCDIR)\pdf\tex2rtf.rtf -twice -rtf
cd $(THISDIR)
--
2.47.2