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

BC++ and Watcom C++ makefile and source fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4152 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart 1999-10-23 19:55:01 +00:00
parent 18c98e42ee
commit 4d85bcd1f5
13 changed files with 35 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
distrib/msw/bc.rsp
View File

@ -1,3 +1,2 @@
src/bc32.ide
src/bc32d.ide
samples/bc32.ide

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

@ -308,7 +308,7 @@ $(CFG): makefile.b32
-WE
-tWM
-I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/png;$(WXDIR)/src/jpeg;$(WXDIR)/src/zlib;$(WXDIR)/src/xpm
-I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/generic;$(WXDIR)/src/png;$(WXDIR)/src/jpeg;$(WXDIR)/src/zlib;$(WXDIR)/src/xpm
-I$(WXDIR)\include\wx\msw\gnuwin32
-L$(BCCDIR)\lib

2
distrib/msw/tmake/bcc.t
View File

@ -273,7 +273,7 @@ $(CFG): makefile.bcc
-Fs-
-Vf
-Ff=4
-I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/png;$(WXDIR)/src/zlib;$(WXDIR)/src/xpm
-I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/generic;$(WXDIR)/src/png;$(WXDIR)/src/zlib;$(WXDIR)/src/xpm
-I$(WXDIR)\include\wx\msw\gnuwin32
-L$(BCCDIR)\lib
-D__WXWIN__

4
distrib/msw/tmake/wat.t
View File

@ -2,6 +2,10 @@
#! File: wat.t
#! Purpose: tmake template file from which makefile.wat is generated by running
#! tmake -t wat wxwin.pro -o makefile.wat
#! TODO:
#! - unzip.c must be compiled with $(CC), not $(CCC).
#! - extended.c, unzip.c targets must be as per b32.t etc.
#! - OLE files not generated correctly (need 'ole/' directory)
#! Author: Vadim Zeitlin
#! Created: 14.07.99
#! Version: $Id$

1
distrib/msw/zipdist.bat
View File

@ -86,6 +86,7 @@ cd %dest\wx
unzip32 -o ..\wx200msw.zip
unzip32 -o ..\wx200gen.zip
unzip32 -o ..\wx200vc.zip
unzip32 -o ..\wx200bc.zip
unzip32 -o ..\wx200hlp.zip
unzip32 -o ..\glcanvas.zip
unzip32 -o ..\treedraw.zip

2
docs/latex/wx/wx.hpj
View File

@ -1,5 +1,5 @@
[OPTIONS]
BMROOT=d:\wx2\wxWind~1\docs\latex\wx ; Assume that bitmaps are where the source is
BMROOT=d:\wx2\wxWind~1\docs/latex/wx ; Assume that bitmaps are where the source is
TITLE=wxWindows Manual
CONTENTS=Contents
COMPRESS=HIGH

4
include/wx/font.h
View File

@ -114,6 +114,8 @@ enum wxFontEncoding
// wxFontBase represents a font object
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxFontRefData;
class wxFontBase : public wxGDIObject
{
public:
@ -167,7 +169,7 @@ public:
protected:
// get the internal data
class WXDLLEXPORT wxFontRefData *GetFontData() const
wxFontRefData *GetFontData() const
{ return (wxFontRefData *)m_refData; }
private:

17
src/generic/grid.cpp
View File

@ -9,24 +9,23 @@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
#pragma implementation "grid.h"
#endif
// For compilers that support precompilation, includes "wx/wx.h".
#include "wx/wxprec.h"
#include "wx/defs.h"
#if !defined(wxUSE_NEW_GRID) || !(wxUSE_NEW_GRID)
#include "gridg.cpp"
#else
#ifdef __GNUG__
#pragma implementation "grid.h"
#endif
#ifdef __BORLANDC__
#pragma hdrstop
#endif
#if !defined(wxUSE_NEW_GRID) || !(wxUSE_NEW_GRID)
#include "gridg.cpp"
#else
#ifndef WX_PRECOMP
#include "wx/utils.h"
#include "wx/dcclient.h"

2
src/makewat.env
View File

@ -55,7 +55,7 @@ LIBS = $(WXDIR)\lib\wx.lib $(WXDIR)\lib\zlib.lib $(WXDIR)\lib\png.lib $(WXDIR)
$(WATLIBDIR)\comctl32.lib $(WATLIBDIR)\comdlg32.lib &
$(WATLIBDIR)\ole32.lib $(WATLIBDIR)\oleaut32.lib &
$(WATLIBDIR)\uuid.lib # $(WATLIBDIR)\odbc32.lib
IFLAGS = -i=$(WXINC) -i=$(%watcom)\h;$(%watcom)\h\nt # -i=$(WXDIR)\include\wx\msw\gnuwin32
IFLAGS = -i=$(WXINC) -i=$(%watcom)\h;$(%watcom)\h\nt;$(WXDIR)\src\png;$(WXDIR)\src\zlib;$(WXDIR)\src\jpeg;$(WXDIR)\include\wx\msw\gnuwin32
RESFLAGS1 = -r -bt=nt /i$(WXDIR)\include
RESFLAGS2 = -R $(name) /i$(WXDIR)\include

4
src/msw/makefile.b32
View File

@ -1,6 +1,6 @@
# This file was automatically generated by tmake at 18:37, 1999/10/22
# This file was automatically generated by tmake at 14:33, 1999/10/23
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE B32.T!
#
@ -829,7 +829,7 @@ $(CFG): makefile.b32
-WE
-tWM
-I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/png;$(WXDIR)/src/jpeg;$(WXDIR)/src/zlib;$(WXDIR)/src/xpm
-I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/generic;$(WXDIR)/src/png;$(WXDIR)/src/jpeg;$(WXDIR)/src/zlib;$(WXDIR)/src/xpm
-I$(WXDIR)\include\wx\msw\gnuwin32
-L$(BCCDIR)\lib

4
src/msw/makefile.bcc
View File

@ -1,6 +1,6 @@
# This file was automatically generated by tmake at 18:37, 1999/10/22
# This file was automatically generated by tmake at 14:33, 1999/10/23
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BCC.T!
#
@ -720,7 +720,7 @@ $(CFG): makefile.bcc
-Fs-
-Vf
-Ff=4
-I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/png;$(WXDIR)/src/zlib;$(WXDIR)/src/xpm
-I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/generic;$(WXDIR)/src/png;$(WXDIR)/src/zlib;$(WXDIR)/src/xpm
-I$(WXDIR)\include\wx\msw\gnuwin32
-L$(BCCDIR)\lib
-D__WXWIN__

18
src/msw/makefile.wat
View File

@ -290,7 +290,7 @@ accel.obj: $(MSWDIR)\accel.cpp
app.obj: $(MSWDIR)\app.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
automtn.obj: $(MSWDIR)\automtn.cpp
automtn.obj: $(MSWDIR)\ole\automtn.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
bitmap.obj: $(MSWDIR)\bitmap.cpp
@ -341,7 +341,7 @@ cursor.obj: $(MSWDIR)\cursor.cpp
data.obj: $(MSWDIR)\data.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
dataobj.obj: $(MSWDIR)\dataobj.cpp
dataobj.obj: $(MSWDIR)\ole\dataobj.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
dc.obj: $(MSWDIR)\dc.cpp
@ -377,10 +377,10 @@ dirdlg.obj: $(MSWDIR)\dirdlg.cpp
dragimag.obj: $(MSWDIR)\dragimag.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
dropsrc.obj: $(MSWDIR)\dropsrc.cpp
dropsrc.obj: $(MSWDIR)\ole\dropsrc.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
droptgt.obj: $(MSWDIR)\droptgt.cpp
droptgt.obj: $(MSWDIR)\ole\droptgt.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
filedlg.obj: $(MSWDIR)\filedlg.cpp
@ -404,7 +404,7 @@ gaugemsw.obj: $(MSWDIR)\gaugemsw.cpp
gdiobj.obj: $(MSWDIR)\gdiobj.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
gsocket.obj: $(MSWDIR)\gsocket.cpp
gsocket.obj: $(MSWDIR)\gsocket.c
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
helpwin.obj: $(MSWDIR)\helpwin.cpp
@ -545,7 +545,7 @@ utils.obj: $(MSWDIR)\utils.cpp
utilsexc.obj: $(MSWDIR)\utilsexc.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
uuid.obj: $(MSWDIR)\uuid.cpp
uuid.obj: $(MSWDIR)\ole\uuid.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
wave.obj: $(MSWDIR)\wave.cpp
@ -619,7 +619,7 @@ dynlib.obj: $(COMMDIR)\dynlib.cpp
event.obj: $(COMMDIR)\event.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
extended.obj: $(COMMDIR)\extended.cpp
extended.obj: $(COMMDIR)\extended.c
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
ffile.obj: $(COMMDIR)\ffile.cpp
@ -796,8 +796,8 @@ tokenzr.obj: $(COMMDIR)\tokenzr.cpp
txtstrm.obj: $(COMMDIR)\txtstrm.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
unzip.obj: $(COMMDIR)\unzip.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
unzip.obj: $(COMMDIR)\unzip.c
*$(CC) $(CPPFLAGS) $(IFLAGS) $<
url.obj: $(COMMDIR)\url.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<

4
src/msw/ole/dataobj.cpp
View File

@ -451,11 +451,11 @@ STDMETHODIMP wxIDataObject::SetData(FORMATETC *pformatetc,
case CF_OEMTEXT:
size = strlen((const char *)pBuf);
break;
#ifndef __WATCOMC__
case CF_UNICODETEXT:
size = wcslen((const wchar_t *)pBuf);
break;
#endif
case CF_BITMAP:
case CF_HDROP:
// these formats don't use size at all, anyhow (but