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

Small changes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7113 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2000-04-11 11:26:52 +00:00
parent f0d59a5183
commit 64dffa993f
22 changed files with 103 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/dbtable.cpp
View File

@@ -31,8 +31,8 @@
// Use this line for wxWindows v1.x
//#include "wx_ver.h"
// Use this line for wxWindows v2.x
#include "wx/version.h"
#include "wx/wxprec.h"
#include "wx/version.h"
#if wxMAJOR_VERSION == 2
# ifdef __GNUG__

3
src/common/imagjpeg.cpp
View File

@@ -29,6 +29,9 @@
#include "wx/app.h"
extern "C"
{
#ifdef __WATCOMC__
#define HAVE_BOOLEAN
#endif
#include "jpeglib.h"
}
#include "wx/filefn.h"

2
src/common/variant.cpp
View File

@@ -1509,7 +1509,7 @@ bool wxVariant::operator== (void* value) const
bool wxVariant::operator!= (void* value) const
{
return (!((*this) == value));
return (!((*this) == (void*) value));
}
void wxVariant::operator= (void* value)

2
src/jpeg/jconfig.h
View File

@@ -56,6 +56,8 @@
/* #define INLINE __inline__ */
#if defined(__VISAGECPP__) && (__IBMCPP__ >= 400 || __IBMC__ >= 400)
#define INLINE
#elif defined(__WATCOMC__)
#define INLINE
#else
#define INLINE inline
#endif

2
src/msw/app.cpp
View File

@@ -157,7 +157,7 @@ LRESULT WXDLLEXPORT APIENTRY wxWndProc(HWND, UINT, WPARAM, LPARAM);
// FIXME wxUSE_ON_FATAL_EXCEPTION is only supported for VC++ now because it
// needs compiler support for Win32 SEH. Others (especially Borland)
// probably have it too, but I'm not sure about how it works
#ifndef __VISUALC__
#if !defined(__VISUALC__) || defined(__WIN16__)
#undef wxUSE_ON_FATAL_EXCEPTION
#define wxUSE_ON_FATAL_EXCEPTION 0
#endif // VC++

4
src/msw/button.cpp
View File

@@ -91,7 +91,11 @@ bool wxButton::Create(wxWindow *parent,
if (m_hWnd == 0)
{
wxString msg;
#ifdef __WIN16__
msg.Printf(wxT("CreateWindowEx failed"));
#else
msg.Printf(wxT("CreateWindowEx failed with error number %ld"), (long) GetLastError());
#endif
wxFAIL_MSG(msg);
}

4
src/msw/makefile.vc
View File

@@ -1,4 +1,4 @@
# This file was automatically generated by tmake at 20:13, 2000/03/31
# This file was automatically generated by tmake at 12:33, 2000/04/05
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!
# File: makefile.vc
@@ -102,6 +102,7 @@ GENERICOBJS= ..\generic\$D\busyinfo.obj \
..\generic\$D\scrolwin.obj \
..\generic\$D\splitter.obj \
..\generic\$D\statusbr.obj \
..\generic\$D\tabg.obj \
..\generic\$D\tbarsmpl.obj \
..\generic\$D\textdlgg.obj \
..\generic\$D\tipdlg.obj \
@@ -127,7 +128,6 @@ NONESSENTIALOBJS= ..\generic\$D\caret.obj \
..\generic\$D\printps.obj \
..\generic\$D\prntdlgg.obj \
..\generic\$D\statline.obj \
..\generic\$D\tabg.obj \
..\generic\$D\treectrl.obj
COMMONOBJS = \

2
src/msw/printdlg.cpp
View File

@@ -187,4 +187,4 @@ int wxPageSetupDialog::ShowModal()
}
#endif
// wxUSE_PRINTING_ARCHITECTURE
// wxUSE_PRINTING_ARCHITECTURE

94
src/wxvc_dll.dsp
View File

@@ -69,7 +69,7 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXMAKINGDLL=1 /Yu"wx/wxprec.h" /FD /c
# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXMAKINGDLL=1 /Yu"wx/wxprec.h" /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x809 /d "_DEBUG"
@@ -1416,7 +1416,7 @@ SOURCE=.\jpeg\jcapimin.c
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
# ADD CPP /I ".."
# ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
@@ -1433,7 +1433,7 @@ SOURCE=.\jpeg\jcapistd.c
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
# ADD CPP /I ".."
# ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
@@ -1450,7 +1450,7 @@ SOURCE=.\jpeg\jccoefct.c
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
# ADD CPP /I ".."
# ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
@@ -1467,7 +1467,7 @@ SOURCE=.\jpeg\jccolor.c
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
# ADD CPP /I ".."
# ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
@@ -1484,7 +1484,7 @@ SOURCE=.\jpeg\jcdctmgr.c
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
# ADD CPP /I ".."
# ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
@@ -1501,7 +1501,7 @@ SOURCE=.\jpeg\jchuff.c
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
# ADD CPP /I ".."
# ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
@@ -1518,7 +1518,7 @@ SOURCE=.\jpeg\jcinit.c
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
# ADD CPP /I ".."
# ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
@@ -1535,7 +1535,7 @@ SOURCE=.\jpeg\jcmainct.c
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
# ADD CPP /I ".."
# ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
@@ -1552,7 +1552,7 @@ SOURCE=.\jpeg\jcmarker.c
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
# ADD CPP /I ".."
# ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
@@ -1569,7 +1569,7 @@ SOURCE=.\jpeg\jcmaster.c
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
# ADD CPP /I ".."
# ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
@@ -1586,7 +1586,7 @@ SOURCE=.\jpeg\jcomapi.c
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
# ADD CPP /I ".."
# ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
@@ -1603,7 +1603,7 @@ SOURCE=.\jpeg\jcparam.c
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
# ADD CPP /I ".."
# ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
@@ -1620,7 +1620,7 @@ SOURCE=.\jpeg\jcphuff.c
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
# ADD CPP /I ".."
# ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
@@ -1637,7 +1637,7 @@ SOURCE=.\jpeg\jcprepct.c
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
# ADD CPP /I ".."
# ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
@@ -1654,7 +1654,7 @@ SOURCE=.\jpeg\jcsample.c
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
# ADD CPP /I ".."
# ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
@@ -1671,7 +1671,7 @@ SOURCE=.\jpeg\jctrans.c
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
# ADD CPP /I ".."
# ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
@@ -1688,7 +1688,7 @@ SOURCE=.\jpeg\jdapimin.c
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
# ADD CPP /I ".."
# ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
@@ -1705,7 +1705,7 @@ SOURCE=.\jpeg\jdapistd.c
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
# ADD CPP /I ".."
# ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
@@ -1722,7 +1722,7 @@ SOURCE=.\jpeg\jdatadst.c
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
# ADD CPP /I ".."
# ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
@@ -1739,7 +1739,7 @@ SOURCE=.\jpeg\jdatasrc.c
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
# ADD CPP /I ".."
# ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
@@ -1756,7 +1756,7 @@ SOURCE=.\jpeg\jdcoefct.c
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
# ADD CPP /I ".."
# ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
@@ -1773,7 +1773,7 @@ SOURCE=.\jpeg\jdcolor.c
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
# ADD CPP /I ".."
# ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
@@ -1790,7 +1790,7 @@ SOURCE=.\jpeg\jddctmgr.c
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
# ADD CPP /I ".."
# ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
@@ -1807,7 +1807,7 @@ SOURCE=.\jpeg\jdhuff.c
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
# ADD CPP /I ".."
# ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
@@ -1824,7 +1824,7 @@ SOURCE=.\jpeg\jdinput.c
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
# ADD CPP /I ".."
# ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
@@ -1841,7 +1841,7 @@ SOURCE=.\jpeg\jdmainct.c
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
# ADD CPP /I ".."
# ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
@@ -1858,7 +1858,7 @@ SOURCE=.\jpeg\jdmarker.c
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
# ADD CPP /I ".."
# ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
@@ -1875,7 +1875,7 @@ SOURCE=.\jpeg\jdmaster.c
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
# ADD CPP /I ".."
# ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
@@ -1892,7 +1892,7 @@ SOURCE=.\jpeg\jdmerge.c
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
# ADD CPP /I ".."
# ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
@@ -1909,7 +1909,7 @@ SOURCE=.\jpeg\jdphuff.c
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
# ADD CPP /I ".."
# ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
@@ -1926,7 +1926,7 @@ SOURCE=.\jpeg\jdpostct.c
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
# ADD CPP /I ".."
# ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
@@ -1943,7 +1943,7 @@ SOURCE=.\jpeg\jdsample.c
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
# ADD CPP /I ".."
# ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
@@ -1960,7 +1960,7 @@ SOURCE=.\jpeg\jdtrans.c
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
# ADD CPP /I ".."
# ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
@@ -1977,7 +1977,7 @@ SOURCE=.\jpeg\jerror.c
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
# ADD CPP /I ".."
# ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
@@ -1994,7 +1994,7 @@ SOURCE=.\jpeg\jfdctflt.c
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
# ADD CPP /I ".."
# ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
@@ -2011,7 +2011,7 @@ SOURCE=.\jpeg\jfdctfst.c
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
# ADD CPP /I ".."
# ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
@@ -2028,7 +2028,7 @@ SOURCE=.\jpeg\jfdctint.c
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
# ADD CPP /I ".."
# ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
@@ -2045,7 +2045,7 @@ SOURCE=.\jpeg\jidctflt.c
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
# ADD CPP /I ".."
# ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
@@ -2062,7 +2062,7 @@ SOURCE=.\jpeg\jidctfst.c
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
# ADD CPP /I ".."
# ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
@@ -2079,7 +2079,7 @@ SOURCE=.\jpeg\jidctint.c
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
# ADD CPP /I ".."
# ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
@@ -2096,7 +2096,7 @@ SOURCE=.\jpeg\jidctred.c
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
# ADD CPP /I ".."
# ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
@@ -2113,7 +2113,7 @@ SOURCE=.\jpeg\jmemmgr.c
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
# ADD CPP /I ".."
# ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
@@ -2130,7 +2130,7 @@ SOURCE=.\jpeg\jmemnobs.c
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
# ADD CPP /I ".."
# ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
@@ -2147,7 +2147,7 @@ SOURCE=.\jpeg\jquant1.c
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
# ADD CPP /I ".."
# ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
@@ -2164,7 +2164,7 @@ SOURCE=.\jpeg\jquant2.c
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
# ADD CPP /I ".."
# ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
@@ -2181,7 +2181,7 @@ SOURCE=.\jpeg\jutils.c
!ELSEIF "$(CFG)" == "wxvc_dll - Win32 Debug"
# ADD CPP /I ".."
# ADD CPP /Zi /I ".."
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF