Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removing some level 3 warning

Browse Source 
Updating samples\makefile.vc


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3503 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Patrick Albert
1999-08-27 11:46:55 +00:00
parent cbd4be25b2
commit 48c12cb129
20 changed files with 228 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
samples/makefile.dos
View File

@@ -23,10 +23,6 @@ THISDIR=$(WXDIR)\samples
NOMAKE=1 NOMAKE=1
# No 16 bit version # No 16 bit version
ONLY32=1 ONLY32=1
# PNG unresolved
PNGSETUP=1
# DND not set in setup.h
DNDSETUP=1
# Misc. compilation errors # Misc. compilation errors
COMPIL=1 COMPIL=1
@@ -54,7 +50,7 @@ all:
nmake -f makefile.dos FINAL=$(FINAL) nmake -f makefile.dos FINAL=$(FINAL)
cd $(WXDIR)\samples\dialogs cd $(WXDIR)\samples\dialogs
nmake -f makefile.dos FINAL=$(FINAL) nmake -f makefile.dos FINAL=$(FINAL)
!if "$(DNDSETUP)"=="" !if "$(ONLY32)"==""
cd $(WXDIR)\samples\dnd cd $(WXDIR)\samples\dnd
nmake -f makefile.dos FINAL=$(FINAL) nmake -f makefile.dos FINAL=$(FINAL)
!endif !endif
@@ -78,10 +74,8 @@ all:
cd $(WXDIR)\samples\html cd $(WXDIR)\samples\html
nmake -f makefile.dos FINAL=$(FINAL) nmake -f makefile.dos FINAL=$(FINAL)
!endif !endif
!if "$(PNGSETUP)"==""
cd $(WXDIR)\samples\image cd $(WXDIR)\samples\image
nmake -f makefile.dos FINAL=$(FINAL) nmake -f makefile.dos FINAL=$(FINAL)
!endif
cd $(WXDIR)\samples\internat cd $(WXDIR)\samples\internat
nmake -f makefile.dos FINAL=$(FINAL) nmake -f makefile.dos FINAL=$(FINAL)
cd $(WXDIR)\samples\joytest cd $(WXDIR)\samples\joytest
@@ -136,10 +130,8 @@ all:
cd $(WXDIR)\samples\sashtest cd $(WXDIR)\samples\sashtest
nmake -f makefile.dos FINAL=$(FINAL) nmake -f makefile.dos FINAL=$(FINAL)
!endif !endif
!if "$(PNGSETUP)"==""
cd $(WXDIR)\samples\scroll cd $(WXDIR)\samples\scroll
nmake -f makefile.dos FINAL=$(FINAL) nmake -f makefile.dos FINAL=$(FINAL)
!endif
cd $(WXDIR)\samples\splitter cd $(WXDIR)\samples\splitter
nmake -f makefile.dos FINAL=$(FINAL) nmake -f makefile.dos FINAL=$(FINAL)
!if "$(COMPIL)"=="" !if "$(COMPIL)"==""
@@ -156,10 +148,8 @@ all:
!endif !endif
cd $(WXDIR)\samples\toolbar cd $(WXDIR)\samples\toolbar
nmake -f makefile.dos FINAL=$(FINAL) nmake -f makefile.dos FINAL=$(FINAL)
!if "$(PNGSETUP)"==""
cd $(WXDIR)\samples\treectrl cd $(WXDIR)\samples\treectrl
nmake -f makefile.dos FINAL=$(FINAL) nmake -f makefile.dos FINAL=$(FINAL)
!endif
!if "$(COMPIL)"=="" !if "$(COMPIL)"==""
cd $(WXDIR)\samples\typetest cd $(WXDIR)\samples\typetest
nmake -f makefile.dos FINAL=$(FINAL) nmake -f makefile.dos FINAL=$(FINAL)

279
samples/makefile.vc
View File

@@ -7,7 +7,7 @@
# #
# "%W% %G%" # "%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 # Use FINAL=1 argument to nmake to build final version with no debugging
# info # info
@@ -16,167 +16,258 @@ WXDIR = $(WXWIN)
THISDIR=$(WXDIR)\samples 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" !include $(WXDIR)\src\makemsc.env
LINK_DEBUG_FLAGS="/RELEASE"
#
# Please keep samples list up-to-date, in alphabetical order
#
all: all:
cd $(WXDIR)\samples\splitter cd $(WXDIR)\samples\bombs
nmake -f makefile.vc FINAL=$(FINAL) 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) nmake -f makefile.vc FINAL=$(FINAL)
cd $(WXDIR)\samples\controls cd $(WXDIR)\samples\controls
nmake -f makefile.vc FINAL=$(FINAL) nmake -f makefile.vc FINAL=$(FINAL)
cd $(WXDIR)\samples\listctrl !if "$(COMPIL)"==""
cd $(WXDIR)\samples\db
nmake -f makefile.vc FINAL=$(FINAL) nmake -f makefile.vc FINAL=$(FINAL)
cd $(WXDIR)\samples\treectrl !endif
nmake -f makefile.vc FINAL=$(FINAL) cd $(WXDIR)\samples\dde
cd $(WXDIR)\samples\validate
nmake -f makefile.vc FINAL=$(FINAL)
cd $(WXDIR)\samples\mdi
nmake -f makefile.vc FINAL=$(FINAL)
cd $(WXDIR)\samples\minimal
nmake -f makefile.vc FINAL=$(FINAL)
cd $(WXDIR)\samples\layout
nmake -f makefile.vc FINAL=$(FINAL)
cd $(WXDIR)\samples\printing
nmake -f makefile.vc FINAL=$(FINAL)
cd $(WXDIR)\samples\toolbar
nmake -f makefile.vc FINAL=$(FINAL) nmake -f makefile.vc FINAL=$(FINAL)
cd $(WXDIR)\samples\dialogs cd $(WXDIR)\samples\dialogs
nmake -f makefile.vc FINAL=$(FINAL) nmake -f makefile.vc FINAL=$(FINAL)
cd $(WXDIR)\samples\dnd
nmake -f makefile.vc FINAL=$(FINAL)
cd $(WXDIR)\samples\docview cd $(WXDIR)\samples\docview
nmake -f makefile.vc FINAL=$(FINAL) nmake -f makefile.vc FINAL=$(FINAL)
cd $(WXDIR)\samples\docvwmdi cd $(WXDIR)\samples\docvwmdi
nmake -f makefile.vc FINAL=$(FINAL) nmake -f makefile.vc FINAL=$(FINAL)
cd $(WXDIR)\samples\controls cd $(WXDIR)\samples\drawing
nmake -f makefile.vc FINAL=$(FINAL) nmake -f makefile.vc FINAL=$(FINAL)
cd $(WXDIR)\samples\nativdlg cd $(WXDIR)\samples\dynamic
nmake -f makefile.vc FINAL=$(FINAL)
cd $(WXDIR)\samples\forty
nmake -f makefile.vc FINAL=$(FINAL)
cd $(WXDIR)\samples\fractal
nmake -f makefile.vc FINAL=$(FINAL) nmake -f makefile.vc FINAL=$(FINAL)
cd $(WXDIR)\samples\grid cd $(WXDIR)\samples\grid
nmake -f makefile.vc FINAL=$(FINAL) nmake -f makefile.vc FINAL=$(FINAL)
cd $(WXDIR)\samples\internat !if "$(COMPIL)"==""
cd $(WXDIR)\samples\help
nmake -f makefile.vc FINAL=$(FINAL) nmake -f makefile.vc FINAL=$(FINAL)
cd $(WXDIR)\samples\dnd !endif
!if "$(PNGSETUP)"==""
cd $(WXDIR)\samples\html
nmake -f makefile.vc FINAL=$(FINAL)
!endif
cd $(WXDIR)\samples\image
nmake -f makefile.vc FINAL=$(FINAL)
cd $(WXDIR)\samples\internat
nmake -f makefile.vc FINAL=$(FINAL) nmake -f makefile.vc FINAL=$(FINAL)
cd $(WXDIR)\samples\joytest cd $(WXDIR)\samples\joytest
nmake -f makefile.vc FINAL=$(FINAL) nmake -f makefile.vc FINAL=$(FINAL)
cd $(WXDIR)\samples\taskbar cd $(WXDIR)\samples\layout
nmake -f makefile.vc FINAL=$(FINAL) nmake -f makefile.vc FINAL=$(FINAL)
cd $(WXDIR)\samples\sashtest cd $(WXDIR)\samples\listctrl
nmake -f makefile.vc FINAL=$(FINAL) nmake -f makefile.vc FINAL=$(FINAL)
cd $(WXDIR)\samples\config cd $(WXDIR)\samples\mdi
nmake -f makefile.vc FINAL=$(FINAL) nmake -f makefile.vc FINAL=$(FINAL)
!if "$(FINAL)" == "0" !if "$(FINAL)" == "0"
cd $(WXDIR)\samples\memcheck cd $(WXDIR)\samples\memcheck
nmake -f makefile.vc FINAL=$(FINAL)
!endif !endif
!if "$(COMPIL)"==""
cd $(WXDIR)\samples\mfc
nmake -f makefile.vc FINAL=$(FINAL)
!endif
cd $(WXDIR)\samples\minifram
nmake -f makefile.vc FINAL=$(FINAL)
cd $(WXDIR)\samples\minimal
nmake -f makefile.vc FINAL=$(FINAL)
cd $(WXDIR)\samples\nativdlg
nmake -f makefile.vc FINAL=$(FINAL)
cd $(WXDIR)\samples\notebook
nmake -f makefile.vc FINAL=$(FINAL)
cd $(WXDIR)\samples\oleauto
nmake -f makefile.vc FINAL=$(FINAL) nmake -f makefile.vc FINAL=$(FINAL)
cd $(WXDIR)\samples\ownerdrw cd $(WXDIR)\samples\ownerdrw
nmake -f makefile.vc FINAL=$(FINAL) nmake -f makefile.vc FINAL=$(FINAL)
cd $(WXDIR)\samples\checklst cd $(WXDIR)\samples\png
nmake -f makefile.vc FINAL=$(FINAL) nmake -f makefile.vc FINAL=$(FINAL)
cd $(WXDIR)\samples\minifram cd $(WXDIR)\samples\printing
nmake -f makefile.vc FINAL=$(FINAL)
cd $(WXDIR)\samples\bombs
nmake -f makefile.vc FINAL=$(FINAL)
cd $(WXDIR)\samples\fractal
nmake -f makefile.vc FINAL=$(FINAL)
cd $(WXDIR)\samples\wxpoem
nmake -f makefile.vc FINAL=$(FINAL)
cd $(WXDIR)\samples\typetest
nmake -f makefile.vc FINAL=$(FINAL) nmake -f makefile.vc FINAL=$(FINAL)
cd $(WXDIR)\samples\proplist cd $(WXDIR)\samples\proplist
nmake -f makefile.vc FINAL=$(FINAL) nmake -f makefile.vc FINAL=$(FINAL)
cd $(WXDIR)\samples\image !if "$(COMPIL)"==""
cd $(WXDIR)\samples\regtest
nmake -f makefile.vc FINAL=$(FINAL) nmake -f makefile.vc FINAL=$(FINAL)
cd $(WXDIR)\samples\dde !endif
nmake -f client.vc FINAL=$(FINAL) cd $(WXDIR)\samples\resource
nmake -f server.vc FINAL=$(FINAL)
cd $(WXDIR)\samples\caret
nmake -f makefile.vc FINAL=$(FINAL) 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) nmake -f makefile.vc FINAL=$(FINAL)
cd $(WXDIR)\samples\scroll cd $(WXDIR)\samples\scroll
nmake -f makefile.vc FINAL=$(FINAL) nmake -f makefile.vc FINAL=$(FINAL)
# cd $(WXDIR)\samples\regtest cd $(WXDIR)\samples\splitter
# nmake -f makefile.vc FINAL=$(FINAL) 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: clean:
cd $(WXDIR)\samples\splitter cd $(WXDIR)\samples\bombs
nmake -f makefile.vc clean nmake -f makefile.vc clean
cd $(WXDIR)\samples\mdi cd $(WXDIR)\samples\caret
nmake -f makefile.vc clean nmake -f makefile.vc clean
cd $(WXDIR)\samples\minimal cd $(WXDIR)\samples\checklst
nmake -f makefile.vc clean nmake -f makefile.vc clean
cd $(WXDIR)\samples\layout cd $(WXDIR)\samples\config
nmake -f makefile.vc clean nmake -f makefile.vc clean
cd $(WXDIR)\samples\printing cd $(WXDIR)\samples\controls
nmake -f makefile.vc clean nmake -f makefile.vc clean
cd $(WXDIR)\samples\toolbar cd $(WXDIR)\samples\db
nmake -f makefile.vc clean
cd $(WXDIR)\samples\dde
nmake -f makefile.vc clean nmake -f makefile.vc clean
cd $(WXDIR)\samples\dialogs cd $(WXDIR)\samples\dialogs
nmake -f makefile.vc clean nmake -f makefile.vc clean
cd $(WXDIR)\samples\resource cd $(WXDIR)\samples\dnd
nmake -f makefile.vc clean
cd $(WXDIR)\samples\listctrl
nmake -f makefile.vc clean
cd $(WXDIR)\samples\treectrl
nmake -f makefile.vc clean
cd $(WXDIR)\samples\validate
nmake -f makefile.vc clean nmake -f makefile.vc clean
cd $(WXDIR)\samples\docview cd $(WXDIR)\samples\docview
nmake -f makefile.vc clean nmake -f makefile.vc clean
cd $(WXDIR)\samples\docvwmdi cd $(WXDIR)\samples\docvwmdi
nmake -f makefile.vc clean nmake -f makefile.vc clean
cd $(WXDIR)\samples\controls cd $(WXDIR)\samples\drawing
nmake -f makefile.vc clean nmake -f makefile.vc clean
cd $(WXDIR)\samples\nativdlg cd $(WXDIR)\samples\dynamic
nmake -f makefile.vc clean nmake -f makefile.vc clean
cd $(WXDIR)\samples\grid cd $(WXDIR)\samples\forty
nmake -f makefile.vc clean
cd $(WXDIR)\samples\internat
nmake -f makefile.vc clean
cd $(WXDIR)\samples\checklst
nmake -f makefile.vc clean
cd $(WXDIR)\samples\ownerdrw
nmake -f makefile.vc clean
cd $(WXDIR)\samples\dnd
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
nmake -f makefile.vc clean
cd $(WXDIR)\samples\sashtest
nmake -f makefile.vc clean
cd $(WXDIR)\samples\config
nmake -f makefile.vc clean
cd $(WXDIR)\samples\memcheck
nmake -f makefile.vc clean
cd $(WXDIR)\samples\minifram
nmake -f makefile.vc clean
cd $(WXDIR)\samples\bombs
nmake -f makefile.vc clean nmake -f makefile.vc clean
cd $(WXDIR)\samples\fractal cd $(WXDIR)\samples\fractal
nmake -f makefile.vc clean nmake -f makefile.vc clean
cd $(WXDIR)\samples\wxpoem cd $(WXDIR)\samples\grid
nmake -f makefile.vc clean nmake -f makefile.vc clean
cd $(WXDIR)\samples\typetest cd $(WXDIR)\samples\help
nmake -f makefile.vc clean nmake -f makefile.vc clean
cd $(WXDIR)\samples\proplist cd $(WXDIR)\samples\html
nmake -f makefile.vc clean nmake -f makefile.vc clean
cd $(WXDIR)\samples\image cd $(WXDIR)\samples\image
nmake -f makefile.vc clean nmake -f makefile.vc clean
cd $(WXDIR)\samples\dde cd $(WXDIR)\samples\internat
nmake -f client.vc clean
nmake -f server.vc clean
cd $(WXDIR)\samples\caret
nmake -f makefile.vc clean nmake -f makefile.vc clean
cd $(WXDIR)\samples\drawing cd $(WXDIR)\samples\joytest
nmake -f makefile.vc clean
cd $(WXDIR)\samples\layout
nmake -f makefile.vc clean
cd $(WXDIR)\samples\listctrl
nmake -f makefile.vc clean
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\minimal
nmake -f makefile.vc clean
cd $(WXDIR)\samples\nativdlg
nmake -f makefile.vc clean
cd $(WXDIR)\samples\notebook
nmake -f makefile.vc clean
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\regtest
nmake -f makefile.vc clean
cd $(WXDIR)\samples\resource
nmake -f makefile.vc clean
cd $(WXDIR)\samples\richedit
nmake -f makefile.vc clean
cd $(WXDIR)\samples\sashtest
nmake -f makefile.vc clean nmake -f makefile.vc clean
cd $(WXDIR)\samples\scroll cd $(WXDIR)\samples\scroll
nmake -f makefile.vc clean 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

10
src/common/cmndata.cpp
View File

@@ -219,7 +219,7 @@ wxPrintData::wxPrintData(const wxPrintData& printData)
wxPrintData::~wxPrintData() wxPrintData::~wxPrintData()
{ {
#ifdef __WXMSW__ #ifdef __WXMSW__
HGLOBAL hDevMode = (HGLOBAL) m_devMode; HGLOBAL hDevMode = (HGLOBAL)(DWORD) m_devMode;
if (hDevMode ) if (hDevMode )
GlobalFree(hDevMode); GlobalFree(hDevMode);
#endif #endif
@@ -264,7 +264,7 @@ static wxString wxGetPrintDlgError()
void wxPrintData::ConvertToNative() void wxPrintData::ConvertToNative()
{ {
HGLOBAL hDevMode = (HGLOBAL) m_devMode; HGLOBAL hDevMode = (HGLOBAL)(DWORD) m_devMode;
if (!hDevMode) if (!hDevMode)
{ {
// Use PRINTDLG as a way of creating a DEVMODE object // Use PRINTDLG as a way of creating a DEVMODE object
@@ -435,7 +435,7 @@ void wxPrintData::ConvertToNative()
void wxPrintData::ConvertFromNative() void wxPrintData::ConvertFromNative()
{ {
HGLOBAL hDevMode = (HGLOBAL) m_devMode; HGLOBAL hDevMode = (HGLOBAL)(DWORD) m_devMode;
if (!hDevMode) if (!hDevMode)
return; return;
@@ -755,7 +755,7 @@ void wxPrintDialogData::ConvertToNative()
GlobalFree(pd->hDevMode); GlobalFree(pd->hDevMode);
} }
pd->hDevMode = (HGLOBAL) m_printData.GetNativeData(); pd->hDevMode = (HGLOBAL)(DWORD) m_printData.GetNativeData();
m_printData.SetNativeData((void*) NULL); m_printData.SetNativeData((void*) NULL);
@@ -817,7 +817,7 @@ void wxPrintDialogData::ConvertFromNative()
if (m_printData.GetNativeData()) if (m_printData.GetNativeData())
{ {
// Make sure we don't leak memory // Make sure we don't leak memory
GlobalFree((HGLOBAL) m_printData.GetNativeData()); GlobalFree((HGLOBAL)(DWORD) m_printData.GetNativeData());
} }
m_printData.SetNativeData((void*) pd->hDevMode); m_printData.SetNativeData((void*) pd->hDevMode);
pd->hDevMode = NULL; pd->hDevMode = NULL;

2
src/common/file.cpp
View File

@@ -500,7 +500,7 @@ bool wxTempFile::Open(const wxString& strName)
if ( !GetTempFileName(strPath, _T("wx_"),0, m_strTemp.GetWriteBuf(MAX_PATH)) ) if ( !GetTempFileName(strPath, _T("wx_"),0, m_strTemp.GetWriteBuf(MAX_PATH)) )
#else #else
// Not sure why MSVC++ 1.5 header defines first param as BYTE - bug? // 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 #endif
wxLogLastError(_T("GetTempFileName")); wxLogLastError(_T("GetTempFileName"));
m_strTemp.UngetWriteBuf(); m_strTemp.UngetWriteBuf();

4
src/common/image.cpp
View File

@@ -682,7 +682,11 @@ wxBitmap wxImage::ConvertToBitmap() const
return wxNullBitmap; return wxNullBitmap;
// sizeLimit is the MS upper limit for the DIB size // sizeLimit is the MS upper limit for the DIB size
#ifdef WIN32
int sizeLimit = 1024*768*3; int sizeLimit = 1024*768*3;
#else
int sizeLimit = 0x7fff ;
#endif
// width and height of the device-dependent bitmap // width and height of the device-dependent bitmap
int width = GetWidth(); int width = GetWidth();

2
src/common/list.cpp
View File

@@ -563,7 +563,7 @@ wxStringList::wxStringList (const wxChar *first, ...)
s = va_arg(ap, const wxChar *); s = va_arg(ap, const wxChar *);
// if (s == NULL) // if (s == NULL)
#ifdef __WXMSW__ #ifdef __WXMSW__
if ((int) s == 0) if ((int)(long) s == 0)
#else #else
if ((long) s == 0) if ((long) s == 0)
#endif #endif

2
src/common/odbc.cpp
View File

@@ -443,7 +443,7 @@ float wxDatabase::GetODBCVersionFloat(bool implementation)
if (retcode == SQL_ERROR) if (retcode == SQL_ERROR)
return 0.0; return 0.0;
else else
return atof(buf); return (float)atof(buf);
} }
/* /*

2
src/common/resource.cpp
View File

@@ -2504,7 +2504,7 @@ int wxResourceGetIdentifier(const wxString& name, wxResourceTable *table)
if (!table) if (!table)
table = wxDefaultResourceTable; table = wxDefaultResourceTable;
return (int)table->identifiers.Get(name); return (int)(long)table->identifiers.Get(name);
} }
/* /*

12
src/generic/gridg.cpp
View File

@@ -1786,21 +1786,21 @@ void wxGenericGrid::DrawTextRect(wxDC *dc, const wxString& text, wxRect *rect, i
{ {
case wxRIGHT: case wxRIGHT:
{ {
x = (rect->x + rect->width - textWidth - 1.0); x = (rect->x + rect->width - textWidth - (float)1.0);
y = (rect->y + (rect->height - textHeight)/2.0); y = (rect->y + (rect->height - textHeight)/(float)2.0);
break; break;
} }
case wxCENTRE: case wxCENTRE:
{ {
x = (rect->x + (rect->width - textWidth)/2.0); x = (rect->x + (rect->width - textWidth)/(float)2.0);
y = (rect->y + (rect->height - textHeight)/2.0); y = (rect->y + (rect->height - textHeight)/(float)2.0);
break; break;
} }
case wxLEFT: case wxLEFT:
default: default:
{ {
x = (rect->x + 1.0); x = (rect->x + (float)1.0);
y = (rect->y + (rect->height - textHeight)/2.0); y = (rect->y + (rect->height - textHeight)/(float)2.0);
break; break;
} }
} }

4
src/msw/bitmap.cpp
View File

@@ -80,7 +80,7 @@ wxBitmapRefData::~wxBitmapRefData()
if (m_selectedInto) if (m_selectedInto)
{ {
wxChar buf[200]; 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); wxFatalError(buf);
} }
if (m_hBitmap) if (m_hBitmap)
@@ -146,7 +146,7 @@ bool wxBitmap::FreeResource(bool WXUNUSED(force))
if (M_BITMAPDATA->m_selectedInto) if (M_BITMAPDATA->m_selectedInto)
{ {
wxChar buf[200]; 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); wxFatalError(buf);
} }
if (M_BITMAPDATA->m_hBitmap) if (M_BITMAPDATA->m_hBitmap)

4
src/msw/curico.cpp
View File

@@ -113,7 +113,7 @@ HANDLE ReadIcon( wxChar *szFileName, int *W, int *H)
return (HANDLE) NULL; return (HANDLE) NULL;
// inserted by P.S. // inserted by P.S.
while( (nDirEntries < iconFileHead.wResourceCount) && while( ((unsigned)nDirEntries < iconFileHead.wResourceCount) &&
((iconFileRes.bWidth != nWidth) || (iconFileRes.bHeight != nHeight))) ((iconFileRes.bWidth != nWidth) || (iconFileRes.bHeight != nHeight)))
{ {
cbRes = _lread( hFile, (LPSTR )&iconFileRes, sizeof( ICONFILERES)); cbRes = _lread( hFile, (LPSTR )&iconFileRes, sizeof( ICONFILERES));
@@ -361,7 +361,7 @@ HANDLE ReadCur( wxChar *szFileName, LPPOINT lpptHotSpot, int *W, int *H)
return (HANDLE) NULL; return (HANDLE) NULL;
// following added by P.S. // following added by P.S.
while( (nDirEntries < curFileHead.wResourceCount) && while( ((unsigned)nDirEntries < curFileHead.wResourceCount) &&
((curFileRes.bWidth != nWidth) || (curFileRes.bHeight != nHeight))) ((curFileRes.bWidth != nWidth) || (curFileRes.bHeight != nHeight)))
{ {
cbRes = _lread( hFile, (LPSTR )&curFileRes, sizeof( CURFILERES)); cbRes = _lread( hFile, (LPSTR )&curFileRes, sizeof( CURFILERES));

4
src/msw/dc.cpp
View File

@@ -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, Arc(GetHdc(),xxx1,yyy1,xxx2,yyy2,
xx1,yy1,xx2,yy2); xx1,yy1,xx2,yy2);
CalcBoundingBox((xc-radius), (yc-radius)); CalcBoundingBox((long)(xc-radius), (long)(yc-radius));
CalcBoundingBox((xc+radius), (yc+radius)); CalcBoundingBox((long)(xc+radius), (long)(yc+radius));
} }
void wxDC::DoDrawPoint(long x, long y) void wxDC::DoDrawPoint(long x, long y)

2
src/msw/dcprint.cpp
View File

@@ -361,7 +361,7 @@ WXHDC WXDLLEXPORT wxGetPrinterDC(const wxPrintData& printDataConst)
LPDEVMODE lpDevMode = (LPDEVMODE) NULL; LPDEVMODE lpDevMode = (LPDEVMODE) NULL;
HGLOBAL hDevMode = (HGLOBAL) printData.GetNativeData(); HGLOBAL hDevMode = (HGLOBAL)(DWORD) printData.GetNativeData();
if ( hDevMode ) if ( hDevMode )
lpDevMode = (DEVMODE*) GlobalLock(hDevMode); lpDevMode = (DEVMODE*) GlobalLock(hDevMode);

4
src/msw/dib.cpp
View File

@@ -647,7 +647,7 @@ HPALETTE MakeDIBPalette(LPBITMAPINFOHEADER lpInfo)
#ifdef __WXWINE__ #ifdef __WXWINE__
return (FALSE); return (FALSE);
#else #else
NPLOGPALETTE npPal; LPLOGPALETTE npPal;
RGBQUAD far *lpRGB; RGBQUAD far *lpRGB;
HPALETTE hLogPal; HPALETTE hLogPal;
WORD i; WORD i;
@@ -661,7 +661,7 @@ HPALETTE MakeDIBPalette(LPBITMAPINFOHEADER lpInfo)
npPal = (NPLOGPALETTE)LocalAlloc(LMEM_FIXED, sizeof(LOGPALETTE) + npPal = (NPLOGPALETTE)LocalAlloc(LMEM_FIXED, sizeof(LOGPALETTE) +
(WORD)lpInfo->biClrUsed * sizeof(PALETTEENTRY)); (WORD)lpInfo->biClrUsed * sizeof(PALETTEENTRY));
*/ */
npPal = (NPLOGPALETTE)malloc(sizeof(LOGPALETTE) + npPal = (LPLOGPALETTE)malloc(sizeof(LOGPALETTE) +
(WORD)lpInfo->biClrUsed * sizeof(PALETTEENTRY)); (WORD)lpInfo->biClrUsed * sizeof(PALETTEENTRY));
if (!npPal) if (!npPal)
return(FALSE); return(FALSE);

2
src/msw/dibutils.cpp
View File

@@ -716,7 +716,7 @@ HPALETTE MakePalette(const BITMAPINFO FAR* Info, UINT flags)
logPal->palVersion = 0x300; // Windows 3.0 version logPal->palVersion = 0x300; // Windows 3.0 version
logPal->palNumEntries = nColors; 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].peRed = rgb[n].rgbRed;
logPal->palPalEntry[n].peGreen = rgb[n].rgbGreen; logPal->palPalEntry[n].peGreen = rgb[n].rgbGreen;
logPal->palPalEntry[n].peBlue = rgb[n].rgbBlue; logPal->palPalEntry[n].peBlue = rgb[n].rgbBlue;

12
src/msw/makefile.vc
View File

@@ -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 $(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 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 -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/wx/manual.tex $(DOCDIR)/pdf/wx.rtf -twice -rtf
cd $(THISDIR) cd $(THISDIR)
$(DOCDIR)/pdf/porting.rtf: $(DOCDIR)/latex/porting/porting.tex $(DOCDIR)/pdf/porting.rtf: $(DOCDIR)/latex/porting/porting.tex
cd $(DOCDIR)\latex\porting 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 -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/porting/porting.tex $(DOCDIR)/pdf/porting.rtf -twice -rtf
cd $(THISDIR) 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 $(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 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 -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/proplist/prop.tex $(DOCDIR)/pdf/prop.rtf -twice -rtf
cd $(THISDIR) cd $(THISDIR)
$(DOCDIR)/pdf/techref.rtf: $(DOCDIR)/latex/techref/techref.tex $(DOCDIR)/pdf/techref.rtf: $(DOCDIR)/latex/techref/techref.tex
cd $(DOCDIR)\latex\techref 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 -start $(WAITFLAG) tex2rtf $(DOCDIR)/latex/techref/techref.tex $(DOCDIR)/pdf/techref.rtf -twice -rtf
cd $(THISDIR) cd $(THISDIR)

2
src/msw/mdi.cpp
View File

@@ -482,7 +482,7 @@ bool wxMDIParentFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND hwnd)
if ( child->GetHWND() ) if ( child->GetHWND() )
{ {
long childId = wxGetWindowId(child->GetHWND()); long childId = wxGetWindowId(child->GetHWND());
if (childId == id) if (childId == (long)id)
{ {
::SendMessage( GetWinHwnd(GetClientWindow()), ::SendMessage( GetWinHwnd(GetClientWindow()),
WM_MDIACTIVATE, WM_MDIACTIVATE,

2
src/msw/minifram.cpp
View File

@@ -983,7 +983,7 @@ BOOL PASCAL DrawCaption( HDC hDC, HWND hWnd, LPRECT lprc,
SetBkMode( hDC, nBkMode ) ; SetBkMode( hDC, nBkMode ) ;
#ifdef __WIN16__ #ifdef __WIN16__
GlobalFreePtr( (unsigned int) lpsz ) ; GlobalFreePtr( (unsigned int)(DWORD) lpsz ) ;
#else #else
GlobalFreePtr( lpsz ) ; GlobalFreePtr( lpsz ) ;
#endif #endif

2
utils/tex2rtf/src/htmlutil.cpp
View File

@@ -2021,7 +2021,7 @@ bool HTMLOnArgument(int macroId, int arg_no, bool start)
if (imageFile) if (imageFile)
delete[] imageFile; delete[] imageFile;
imageFile = NULL; imageFile = NULL;
if (f) if (!f.IsEmpty())
{ {
imageFile = copystring(f); imageFile = copystring(f);
} }

3
utils/tex2rtf/src/makefile.vc
View File

@@ -110,7 +110,8 @@ $(LOCALDOCDIR)\tex2rtf.rtf: $(DOCSOURCES)
$(DOCDIR)\pdf\tex2rtf.rtf: $(DOCSOURCES) $(DOCDIR)\pdf\tex2rtf.rtf: $(DOCSOURCES)
cd $(LOCALDOCDIR) 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 -start /w tex2rtf $(LOCALDOCDIR)\tex2rtf.tex $(DOCDIR)\pdf\tex2rtf.rtf -twice -rtf
cd $(THISDIR) cd $(THISDIR)