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

BC++/Mingw32 patches applied

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7596 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2000-06-19 08:00:27 +00:00
parent 3591a31424
commit b7bcf0138c
18 changed files with 60 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
distrib/msw/tmake/b32.t
View File

@@ -112,12 +112,12 @@ PERIPH_CLEAN_TARGET=clean_ctl3d $(PERIPH_CLEAN_TARGET)
!endif !endif
!if "$(USE_XPM_IN_MSW)" == "1" !if "$(USE_XPM_IN_MSW)" == "1"
PERIPH_LIBS=$(WXLIB)\xpm.lib $(PERIPH_LIBS) PERIPH_LIBS=$(WXDIR)\lib\xpm.lib $(PERIPH_LIBS)
PERIPH_TARGET=xpm $(PERIPH_TARGET) PERIPH_TARGET=xpm $(PERIPH_TARGET)
PERIPH_CLEAN_TARGET=clean_xpm $(PERIPH_CLEAN_TARGET) PERIPH_CLEAN_TARGET=clean_xpm $(PERIPH_CLEAN_TARGET)
!endif !endif
#PERIPH_LIBS=$(WXDIR)\lib\zlib.lib $(WXDIR)\lib\winpng.lib $(WXDIR)\lib\jpeg.lib $(PERIPH_LIBS) #PERIPH_LIBS=$(WXDIR)\lib\zlib.lib $(WXDIR)\lib\winpng.lib $(WXDIR)\lib\jpeg.lib $(WXDIR)\lib\tiff.lib $(PERIPH_LIBS)
PERIPH_LIBS= PERIPH_LIBS=
PERIPH_TARGET=zlib png jpeg tiff $(PERIPH_TARGET) PERIPH_TARGET=zlib png jpeg tiff $(PERIPH_TARGET)
PERIPH_CLEAN_TARGET=clean_zlib clean_png clean_jpeg clean_tiff $(PERIPH_CLEAN_TARGET) PERIPH_CLEAN_TARGET=clean_zlib clean_png clean_jpeg clean_tiff $(PERIPH_CLEAN_TARGET)
@@ -126,7 +126,7 @@ PERIPH_CLEAN_TARGET=clean_zlib clean_png clean_jpeg clean_tiff $(PERIPH_CLEAN_TA
DUMMY=dummy DUMMY=dummy
!else !else
DUMMY=dummydll DUMMY=dummydll
LIBS= cw32 import32 ole2w32 LIBS= cw32mt import32 ole2w32 odbc32 xpm zlib winpng jpeg tiff
!endif !endif
LIBTARGET=$(WXLIB) LIBTARGET=$(WXLIB)
@@ -181,7 +181,7 @@ $(LIBTARGET): $(DUMMY).obj $(OBJECTS)
$(LIBTARGET): $(DUMMY).obj $(OBJECTS) $(LIBTARGET): $(DUMMY).obj $(OBJECTS)
-erase $(LIBTARGET) -erase $(LIBTARGET)
-erase $(WXLIBDIR)\wx.dll -erase $(WXLIBDIR)\wx.dll
tlink32 $(LINK_FLAGS) /v @&&! $(LINK) $(LINK_FLAGS) /L$(WXLIBDIR) /v @&&!
c0d32.obj $(OBJECTS) c0d32.obj $(OBJECTS)
$(WXLIBDIR)\wx $(WXLIBDIR)\wx
nul nul
@@ -370,6 +370,9 @@ $(WIN95FLAG)
clean: $(PERIPH_CLEAN_TARGET) clean: $(PERIPH_CLEAN_TARGET)
-erase $(LIBTARGET) -erase $(LIBTARGET)
-erase $(WXLIBDIR)\wx.dll
-erase $(WXLIBDIR)\wx.tds
-erase $(WXLIBDIR)\wx.il?
-erase *.obj -erase *.obj
-erase *.pch -erase *.pch
-erase *.csm -erase *.csm

6
docs/html/faq.htm
View File

@@ -8,10 +8,10 @@
<font face="Arial, Lucida Sans, Helvetica"> <font face="Arial, Lucida Sans, Helvetica">
<table width=100% border=4 cellpadding=5 cellspacing=0> <table width=100% border=0 cellpadding=5 cellspacing=0>
<tr> <tr>
<td bgcolor="#660000"> <td bgcolor="#C4ECF9">
<font size=+1 face="Arial, Lucida Sans, Helvetica" color="#FFFFFF"> <font size=+1 face="Arial, Lucida Sans, Helvetica" color="#000000">
wxWindows 2 FAQ wxWindows 2 FAQ
</font> </font>
</td> </td>

6
docs/html/faqgen.htm
View File

@@ -8,10 +8,10 @@
<font face="Arial, Lucida Sans, Helvetica"> <font face="Arial, Lucida Sans, Helvetica">
<table width=100% border=4 cellpadding=5 cellspacing=0> <table width=100% border=0 cellpadding=5 cellspacing=0>
<tr> <tr>
<td bgcolor="#660000"> <td bgcolor="#C4ECF9">
<font size=+1 face="Arial, Lucida Sans, Helvetica" color="#FFFFFF"> <font size=+1 face="Arial, Lucida Sans, Helvetica" color="#000000">
wxWindows 2 FAQ: General wxWindows 2 FAQ: General
</font> </font>
</td> </td>

6
docs/html/faqgtk.htm
View File

@@ -8,10 +8,10 @@
<font face="Arial, Lucida Sans, Helvetica"> <font face="Arial, Lucida Sans, Helvetica">
<table width=100% border=4 cellpadding=5 cellspacing=0> <table width=100% border=0 cellpadding=5 cellspacing=0>
<tr> <tr>
<td bgcolor="#660000"> <td bgcolor="#C4ECF9">
<font size=+1 face="Arial, Lucida Sans, Helvetica" color="#FFFFFF"> <font size=+1 face="Arial, Lucida Sans, Helvetica" color="#000000">
wxWindows 2 for GTK FAQ wxWindows 2 for GTK FAQ
</font> </font>
</td> </td>

6
docs/html/faqmac.htm
View File

@@ -8,10 +8,10 @@
<font face="Arial, Lucida Sans, Helvetica"> <font face="Arial, Lucida Sans, Helvetica">
<table width=100% border=4 cellpadding=5 cellspacing=0> <table width=100% border=0 cellpadding=5 cellspacing=0>
<tr> <tr>
<td bgcolor="#660000"> <td bgcolor="#C4ECF9">
<font size=+1 face="Arial, Lucida Sans, Helvetica" color="#FFFFFF"> <font size=+1 face="Arial, Lucida Sans, Helvetica" color="#000000">
wxWindows 2 for Mac FAQ wxWindows 2 for Mac FAQ
</font> </font>
</td> </td>

6
docs/html/faqmsw.htm
View File

@@ -8,10 +8,10 @@
<font face="Arial, Lucida Sans, Helvetica"> <font face="Arial, Lucida Sans, Helvetica">
<table width=100% border=4 cellpadding=5 cellspacing=0> <table width=100% border=0 cellpadding=5 cellspacing=0>
<tr> <tr>
<td bgcolor="#660000"> <td bgcolor="#C4ECF9">
<font size=+1 face="Arial, Lucida Sans, Helvetica" color="#FFFFFF"> <font size=+1 face="Arial, Lucida Sans, Helvetica" color="#000000">
wxWindows 2 for Windows FAQ wxWindows 2 for Windows FAQ
</font> </font>
</td> </td>

8
docs/html/index.htm
View File

@@ -11,11 +11,11 @@
<a name="top"></a> <a name="top"></a>
<table width=100% border=4 cellpadding=5 cellspacing=0> <table width=100% border=0 cellpadding=5 cellspacing=0>
<tr> <tr>
<td bgcolor="#660000"> <td bgcolor="#C4ECF9">
<font size=+1 face="Arial, Lucida Sans, Helvetica" color="#FFFFFF"> <font size=+1 face="Arial, Lucida Sans, Helvetica" color="#000000">
<IMG src="logo.gif" align=right> <IMG src="logo.gif" align=left>
<!-- wxWindows Documentation --> <!-- wxWindows Documentation -->
</font> </font>
</td> </td>

BIN
docs/html/logo.gif
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

6
docs/html/platform.htm
View File

@@ -8,10 +8,10 @@
<FONT FACE="Arial, Lucida Sans, Helvetica"> <FONT FACE="Arial, Lucida Sans, Helvetica">
<table align=center width=100% border=4 cellpadding=5 cellspacing=0> <table align=center width=100% border=0 cellpadding=5 cellspacing=0>
<tr> <tr>
<td bgcolor="#660000" align=left colspan=2> <td bgcolor="#C4ECF9" align=left colspan=2>
<font size=+1 face="Arial, Lucida Sans, Helvetica" color="#FFFFFF"> <font size=+1 face="Arial, Lucida Sans, Helvetica" color="#000000">
Supported Platforms Supported Platforms
</font> </font>
</td> </td>

6
docs/html/standard.htm
View File

@@ -9,10 +9,10 @@
<font face="Arial, Lucida Sans, Helvetica"> <font face="Arial, Lucida Sans, Helvetica">
<table width=100% border=4 cellpadding=5 cellspacing=0> <table width=100% border=0 cellpadding=5 cellspacing=0>
<tr> <tr>
<td bgcolor="#660000"> <td bgcolor="#C4ECF9">
<font size=+1 face="Arial, Lucida Sans, Helvetica" color="#FFFFFF"> <font size=+1 face="Arial, Lucida Sans, Helvetica" color="#000000">
wxWindows Programmer Style Guide wxWindows Programmer Style Guide
</font> </font>
</td> </td>

6
docs/html/wxbook.htm
View File

@@ -8,10 +8,10 @@
<font face="Arial, Lucida Sans, Helvetica"> <font face="Arial, Lucida Sans, Helvetica">
<table width=100% border=4 cellpadding=5 cellspacing=0> <table width=100% border=0 cellpadding=5 cellspacing=0>
<tr> <tr>
<td bgcolor="#660000"> <td bgcolor="#C4ECF9">
<font size=+1 face="Arial, Lucida Sans, Helvetica" color="#FFFFFF"> <font size=+1 face="Arial, Lucida Sans, Helvetica" color="#000000">
wxWindows Book wxWindows Book
</font> </font>
</td> </td>

19
docs/msw/install.txt
View File

@@ -34,20 +34,8 @@ program contains the following:
- Tex2RTF source; - Tex2RTF source;
- Dialog Editor binary. - Dialog Editor binary.
Alternatively, you may unarchive the set of .zip files by hand, Alternatively, you may unarchive the .zip form by hand:
where x is the minor version number and y is the release number: wxMSW-x.y.z.zip where x.y.z is the version number.
wx2_x_y_gen.zip Generic source code and samples (required)
wx2_x_y_msw.zip Windows-specific source code and samples (required)
wx2_x_y_doc.zip Documentation source code (not required)
wx2_x_y_hlp.zip WinHelp documentation
wx2_x_y_pdf.zip Acrobat PDF documentation
wx2_x_y_htm.zip HTML documentation
wx2_x_y_vc.zip MS VC++ 5.0 project files
wx2_x_y_cw.zip Metrowerks CodeWarrior project files
wx2_x_y_bc.zip BC++ 5 project files
jpeg.zip Use this to allow wxImage to read and write JPEG files
tiff.zip Use this to allow wxImage to read and write TIFF files
Unarchive the required files plus any optional documentation Unarchive the required files plus any optional documentation
files into a suitable directory such as c:\wx. files into a suitable directory such as c:\wx.
@@ -204,7 +192,8 @@ web site or CD-ROM.
Note (6): to create your own IDE files, see the technical note on the Note (6): to create your own IDE files, see the technical note on the
wxWindows web site or CD-ROM, entitled "Compiling wxWindows wxWindows web site or CD-ROM, entitled "Compiling wxWindows
applications in the VC++ IDE". You can also copy .dsp and .dsw applications in the VC++ IDE" (technical note docs/tech/tn0010.htm in the
wxWindows distribution). You can also copy .dsp and .dsw
files from an existing wxWindows sample and adapt them. files from an existing wxWindows sample and adapt them.
Visual C++ 1.5 compilation (16-bit) Visual C++ 1.5 compilation (16-bit)

1
src/common/dlgcmn.cpp
View File

@@ -29,6 +29,7 @@
#endif #endif
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/button.h"
#include "wx/dialog.h" #include "wx/dialog.h"
#include "wx/dcclient.h" #include "wx/dcclient.h"
#include "wx/intl.h" #include "wx/intl.h"

1
src/generic/logg.cpp
View File

@@ -33,6 +33,7 @@
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/app.h" #include "wx/app.h"
#include "wx/button.h"
#include "wx/intl.h" #include "wx/intl.h"
#include "wx/log.h" #include "wx/log.h"
#include "wx/menu.h" #include "wx/menu.h"

5
src/generic/panelg.cpp
View File

@@ -34,10 +34,11 @@
#include "wx/colour.h" #include "wx/colour.h"
#include "wx/settings.h" #include "wx/settings.h"
#include "wx/log.h" #include "wx/log.h"
#include "wx/toolbar.h"
#include "wx/statusbr.h"
#endif #endif
#include "wx/toolbar.h"
#include "wx/statusbr.h"
#include "wx/generic/panelg.h" #include "wx/generic/panelg.h"
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

2
src/generic/treelay.cpp
View File

@@ -21,7 +21,7 @@
#endif #endif
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include <wx/wx.h> #include "wx/wx.h"
#endif #endif
#if wxUSE_TREELAYOUT #if wxUSE_TREELAYOUT

2
src/makeprog.b32
View File

@@ -30,7 +30,7 @@ OPT = -Od
DEBUG_FLAGS = DEBUG_FLAGS =
!endif !endif
CPPFLAGS=$(CPP_FLAGS) $(DEBUG_FLAGS) $(OPT) @$(CFG) CPPFLAGS=$(CPP_FLAGS) $(EXTRACPPFLAGS) $(DEBUG_FLAGS) $(DLL_FLAGS) $(OPT) @$(CFG)
all: $(TARGET).exe $(EXTRATARGETS) all: $(TARGET).exe $(EXTRATARGETS)

22
src/msw/makefile.b32
View File

@@ -1,6 +1,6 @@
# This file was automatically generated by tmake at 20:16, 2000/03/31 # This file was automatically generated by tmake at 09:26, 2000/06/19
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE B32.T! # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE B32.T!
# #
@@ -51,12 +51,12 @@ PERIPH_CLEAN_TARGET=clean_ctl3d $(PERIPH_CLEAN_TARGET)
!endif !endif
!if "$(USE_XPM_IN_MSW)" == "1" !if "$(USE_XPM_IN_MSW)" == "1"
PERIPH_LIBS=$(WXLIB)\xpm.lib $(PERIPH_LIBS) PERIPH_LIBS=$(WXDIR)\lib\xpm.lib $(PERIPH_LIBS)
PERIPH_TARGET=xpm $(PERIPH_TARGET) PERIPH_TARGET=xpm $(PERIPH_TARGET)
PERIPH_CLEAN_TARGET=clean_xpm $(PERIPH_CLEAN_TARGET) PERIPH_CLEAN_TARGET=clean_xpm $(PERIPH_CLEAN_TARGET)
!endif !endif
#PERIPH_LIBS=$(WXDIR)\lib\zlib.lib $(WXDIR)\lib\winpng.lib $(WXDIR)\lib\jpeg.lib $(PERIPH_LIBS) #PERIPH_LIBS=$(WXDIR)\lib\zlib.lib $(WXDIR)\lib\winpng.lib $(WXDIR)\lib\jpeg.lib $(WXDIR)\lib\tiff.lib $(PERIPH_LIBS)
PERIPH_LIBS= PERIPH_LIBS=
PERIPH_TARGET=zlib png jpeg tiff $(PERIPH_TARGET) PERIPH_TARGET=zlib png jpeg tiff $(PERIPH_TARGET)
PERIPH_CLEAN_TARGET=clean_zlib clean_png clean_jpeg clean_tiff $(PERIPH_CLEAN_TARGET) PERIPH_CLEAN_TARGET=clean_zlib clean_png clean_jpeg clean_tiff $(PERIPH_CLEAN_TARGET)
@@ -65,7 +65,7 @@ PERIPH_CLEAN_TARGET=clean_zlib clean_png clean_jpeg clean_tiff $(PERIPH_CLEAN_TA
DUMMY=dummy DUMMY=dummy
!else !else
DUMMY=dummydll DUMMY=dummydll
LIBS= cw32 import32 ole2w32 LIBS= cw32mt import32 ole2w32 odbc32 xpm zlib winpng jpeg tiff
!endif !endif
LIBTARGET=$(WXLIB) LIBTARGET=$(WXLIB)
@@ -97,6 +97,7 @@ GENERICOBJS= $(MSWDIR)\busyinfo.obj \
$(MSWDIR)\scrolwin.obj \ $(MSWDIR)\scrolwin.obj \
$(MSWDIR)\splitter.obj \ $(MSWDIR)\splitter.obj \
$(MSWDIR)\statusbr.obj \ $(MSWDIR)\statusbr.obj \
$(MSWDIR)\tabg.obj \
$(MSWDIR)\tbarsmpl.obj \ $(MSWDIR)\tbarsmpl.obj \
$(MSWDIR)\textdlgg.obj \ $(MSWDIR)\textdlgg.obj \
$(MSWDIR)\tipdlg.obj \ $(MSWDIR)\tipdlg.obj \
@@ -264,8 +265,8 @@ MSWOBJS = $(MSWDIR)\accel.obj \
$(MSWDIR)\glcanvas.obj \ $(MSWDIR)\glcanvas.obj \
$(MSWDIR)\gsocket.obj \ $(MSWDIR)\gsocket.obj \
$(MSWDIR)\gsockmsw.obj \ $(MSWDIR)\gsockmsw.obj \
$(MSWDIR)\helpwin.obj \
$(MSWDIR)\helpchm.obj \ $(MSWDIR)\helpchm.obj \
$(MSWDIR)\helpwin.obj \
$(MSWDIR)\icon.obj \ $(MSWDIR)\icon.obj \
$(MSWDIR)\imaglist.obj \ $(MSWDIR)\imaglist.obj \
$(MSWDIR)\joystick.obj \ $(MSWDIR)\joystick.obj \
@@ -360,7 +361,7 @@ $(LIBTARGET): $(DUMMY).obj $(OBJECTS)
$(LIBTARGET): $(DUMMY).obj $(OBJECTS) $(LIBTARGET): $(DUMMY).obj $(OBJECTS)
-erase $(LIBTARGET) -erase $(LIBTARGET)
-erase $(WXLIBDIR)\wx.dll -erase $(WXLIBDIR)\wx.dll
tlink32 $(LINK_FLAGS) /v @&&! $(LINK) $(LINK_FLAGS) /L$(WXLIBDIR) /v @&&!
c0d32.obj $(OBJECTS) c0d32.obj $(OBJECTS)
$(WXLIBDIR)\wx $(WXLIBDIR)\wx
nul nul
@@ -392,6 +393,8 @@ $(MSWDIR)\accel.obj: $(MSWDIR)\accel.$(SRCSUFF)
$(MSWDIR)\app.obj: $(MSWDIR)\app.$(SRCSUFF) $(MSWDIR)\app.obj: $(MSWDIR)\app.$(SRCSUFF)
$(MSWDIR)\automtn.obj: $(OLEDIR)\automtn.$(SRCSUFF)
$(MSWDIR)\bitmap.obj: $(MSWDIR)\bitmap.$(SRCSUFF) $(MSWDIR)\bitmap.obj: $(MSWDIR)\bitmap.$(SRCSUFF)
$(MSWDIR)\bmpbuttn.obj: $(MSWDIR)\bmpbuttn.$(SRCSUFF) $(MSWDIR)\bmpbuttn.obj: $(MSWDIR)\bmpbuttn.$(SRCSUFF)
@@ -518,8 +521,6 @@ $(MSWDIR)\notebook.obj: $(MSWDIR)\notebook.$(SRCSUFF)
$(MSWDIR)\oleutils.obj: $(OLEDIR)\oleutils.$(SRCSUFF) $(MSWDIR)\oleutils.obj: $(OLEDIR)\oleutils.$(SRCSUFF)
$(MSWDIR)\automtn.obj: $(OLEDIR)\automtn.$(SRCSUFF)
$(MSWDIR)\ownerdrw.obj: $(MSWDIR)\ownerdrw.$(SRCSUFF) $(MSWDIR)\ownerdrw.obj: $(MSWDIR)\ownerdrw.$(SRCSUFF)
$(MSWDIR)\palette.obj: $(MSWDIR)\palette.$(SRCSUFF) $(MSWDIR)\palette.obj: $(MSWDIR)\palette.$(SRCSUFF)
@@ -837,6 +838,8 @@ $(MSWDIR)\splitter.obj: $(GENDIR)\splitter.$(SRCSUFF)
$(MSWDIR)\statusbr.obj: $(GENDIR)\statusbr.$(SRCSUFF) $(MSWDIR)\statusbr.obj: $(GENDIR)\statusbr.$(SRCSUFF)
$(MSWDIR)\tabg.obj: $(GENDIR)\tabg.$(SRCSUFF)
$(MSWDIR)\tbarsmpl.obj: $(GENDIR)\tbarsmpl.$(SRCSUFF) $(MSWDIR)\tbarsmpl.obj: $(GENDIR)\tbarsmpl.$(SRCSUFF)
$(MSWDIR)\textdlgg.obj: $(GENDIR)\textdlgg.$(SRCSUFF) $(MSWDIR)\textdlgg.obj: $(GENDIR)\textdlgg.$(SRCSUFF)
@@ -999,6 +1002,9 @@ $(WIN95FLAG)
clean: $(PERIPH_CLEAN_TARGET) clean: $(PERIPH_CLEAN_TARGET)
-erase $(LIBTARGET) -erase $(LIBTARGET)
-erase $(WXLIBDIR)\wx.dll
-erase $(WXLIBDIR)\wx.tds
-erase $(WXLIBDIR)\wx.il?
-erase *.obj -erase *.obj
-erase *.pch -erase *.pch
-erase *.csm -erase *.csm