diff --git a/contrib/include/wx/xrc/xh_split.h b/contrib/include/wx/xrc/xh_split.h new file mode 100644 index 0000000000..010bede9f0 --- /dev/null +++ b/contrib/include/wx/xrc/xh_split.h @@ -0,0 +1,28 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: xh_split.h +// Purpose: XRC resource for wxSplitterWindow +// Author: panga@freemail.hu, Vaclav Slavik +// Created: 2003/01/26 +// RCS-ID: $Id$ +// Copyright: (c) 2003 panga@freemail.hu, Vaclav Slavik +// Licence: wxWindows licence +///////////////////////////////////////////////////////////////////////////// + +#ifndef _WX_XH_SPLIT_H_ +#define _WX_XH_SPLIT_H_ + +#if defined(__GNUG__) && !defined(__APPLE__) +#pragma interface "xh_split.h" +#endif + +#include "wx/xrc/xmlres.h" + +class WXXMLDLLEXPORT wxSplitterWindowXmlHandler : public wxXmlResourceHandler +{ +public: + wxSplitterWindowXmlHandler(); + virtual wxObject *DoCreateResource(); + virtual bool CanHandle(wxXmlNode *node); +}; + +#endif // _WX_XH_SPLIT_H_ diff --git a/contrib/samples/stc/makefile.wat b/contrib/samples/stc/makefile.wat new file mode 100644 index 0000000000..88dd113f02 --- /dev/null +++ b/contrib/samples/stc/makefile.wat @@ -0,0 +1,17 @@ +# +# Makefile for WATCOM +# + + +WXDIR = $(WXWIN) + +EXTRACPPFLAGS = -I$(WXDIR)\contrib\include +THISDIR = $(WXDIR)\contrib\samples\stc +OUTPUTDIR = $(THISDIR)\ + +PROGRAM = stctest +EXTRALIBS = $(WXDIR)\lib\stc.lib +OBJECTS = $(PROGRAM).obj + +!include $(WXDIR)\src\makeprog.wat + diff --git a/contrib/samples/svg/makefile.wat b/contrib/samples/svg/makefile.wat new file mode 100644 index 0000000000..c21f84f740 --- /dev/null +++ b/contrib/samples/svg/makefile.wat @@ -0,0 +1,17 @@ +# +# Makefile for WATCOM +# + + +WXDIR = $(%WXWIN) + +EXTRACPPFLAGS = -I$(WXDIR)\contrib\include +THISDIR = $(WXDIR)\contrib\samples\svg +OUTPUTDIR = $(THISDIR)\ + +PROGRAM = svgtest +EXTRALIBS = $(WXDIR)\lib\svg.lib +OBJECTS = $(PROGRAM).obj + +!include $(WXDIR)\src\makeprog.wat + diff --git a/contrib/src/stc/makefile.wat b/contrib/src/stc/makefile.wat new file mode 100644 index 0000000000..c9f3157bf8 --- /dev/null +++ b/contrib/src/stc/makefile.wat @@ -0,0 +1,78 @@ +# STC makefile for Watcom C++ + +WXDIR = ..\..\.. + +SCINTILLA=$(WXDIR)\contrib\src\stc\scintilla +S=$(SCINTILLA)\src +STCEXTRACPPFLAGS=-D__WX__ -DSCI_LEXER -DLINK_LEXERS -I$(SCINTILLA)\include -I$(S) + +EXTRACPPFLAGS = -I$(WXDIR)\contrib\include $(STCEXTRACPPFLAGS) + +!include $(WXDIR)\src\makewat.env + +STCLIB = $(WXDIR)\lib\stc.lib +THISDIR = $(WXDIR)\contrib\src\stc +OUTPUTDIR = $(THISDIR)\ + + +NAME = stc +LNK = $(name).lnk + +OBJECTS = & + AutoComplete.obj & + CallTip.obj & + CellBuffer.obj & + ContractionState.obj & + Document.obj & + DocumentAccessor.obj & + Editor.obj & + Indicator.obj & + KeyMap.obj & + KeyWords.obj & + LexAVE.obj & + LexAda.obj & + LexBaan.obj & + LexBullant.obj & + LexMatlab.obj & + LexCPP.obj & + LexConf.obj & + LexCrontab.obj & + LexEiffel.obj & + LexHTML.obj & + LexLisp.obj & + LexLua.obj & + LexOthers.obj & + LexPascal.obj & + LexPerl.obj & + LexPython.obj & + LexRuby.obj & + LexSQL.obj & + LexVB.obj & + LineMarker.obj & + PropSet.obj & + RESearch.obj & + ScintillaBase.obj & + Style.obj & + StyleContext.obj & + UniConversion.obj & + ViewStyle.obj & + WindowAccessor.obj & + PlatWX.obj & + ScintillaWX.obj & + stc.obj + +all: $(STCLIB) .SYMBOLIC + +$(STCLIB): $(OBJECTS) + *wlib /b /c /n /P=256 $(STCLIB) $(OBJECTS) + +clean: .SYMBOLIC + -erase *.obj *.bak *.err *.pch $(STCLIB) *.lbc + +.EXTENSIONS: .cxx +.cxx: $(S) + +.cxx.obj: + $(CXX) $[*.cxx $(CXXFLAGS) $(STCEXTRACPPFLAGS) + + diff --git a/contrib/src/svg/makefile.wat b/contrib/src/svg/makefile.wat new file mode 100644 index 0000000000..c577af6bdc --- /dev/null +++ b/contrib/src/svg/makefile.wat @@ -0,0 +1,26 @@ +# svg makefile for Watcom C++ + +WXDIR = ..\..\.. +EXTRACPPFLAGS = -I$(WXDIR)\contrib\include + +!include $(WXDIR)\src\makewat.env + +SVGLIB = $(WXDIR)\lib\svg.lib +THISDIR = $(WXDIR)\contrib\src\svg +OUTPUTDIR = $(THISDIR)\ + +NAME = svg +LNK = $(name).lnk + +OBJECTS = dcsvg.obj + + +all: $(SVGLIB) .SYMBOLIC + + +$(SVGLIB): $(OBJECTS) + *wlib /b /c /n /P=256 $(SVGLIB) $(OBJECTS) + +clean: .SYMBOLIC + -erase *.obj *.bak *.err *.pch $(SVGLIB) *.lbc + diff --git a/contrib/src/xrc/xh_split.cpp b/contrib/src/xrc/xh_split.cpp new file mode 100644 index 0000000000..4b23f9ff60 --- /dev/null +++ b/contrib/src/xrc/xh_split.cpp @@ -0,0 +1,103 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: xh_split.cpp +// Purpose: XRC resource for wxSplitterWindow +// Author: panga@freemail.hu, Vaclav Slavik +// Created: 2003/01/26 +// RCS-ID: $Id$ +// Copyright: (c) 2003 panga@freemail.hu, Vaclav Slavik +// Licence: wxWindows licence +///////////////////////////////////////////////////////////////////////////// + +#ifdef __GNUG__ +#pragma implementation "xh_split.h" +#endif + +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#ifdef __BORLANDC__ + #pragma hdrstop +#endif + +#include "wx/xrc/xh_split.h" +#include "wx/splitter.h" +#include "wx/log.h" + +wxSplitterWindowXmlHandler::wxSplitterWindowXmlHandler() : wxXmlResourceHandler() +{ + XRC_ADD_STYLE(wxSP_3D); + XRC_ADD_STYLE(wxSP_3DSASH); + XRC_ADD_STYLE(wxSP_3DBORDER); + XRC_ADD_STYLE(wxSP_FULLSASH); + XRC_ADD_STYLE(wxSP_BORDER); + XRC_ADD_STYLE(wxSP_NOBORDER); + XRC_ADD_STYLE(wxSP_PERMIT_UNSPLIT); + XRC_ADD_STYLE(wxSP_LIVE_UPDATE); + AddWindowStyles(); +} + +wxObject *wxSplitterWindowXmlHandler::DoCreateResource() +{ + XRC_MAKE_INSTANCE(splitter, wxSplitterWindow); + + splitter->Create(m_parentAsWindow, + GetID(), + GetPosition(), GetSize(), + GetStyle(wxT("style"), wxSP_3D), + GetName()); + + SetupWindow(splitter); + + long sashpos = GetLong(wxT("sashpos"), 0); + long minpanesize = GetLong(wxT("minsize"), -1); + if (minpanesize != -1) + splitter->SetMinimumPaneSize(minpanesize); + + wxWindow *win1 = NULL, *win2 = NULL; + wxXmlNode *n = m_node->GetChildren(); + while (n) + { + if ((n->GetType() == wxXML_ELEMENT_NODE) && + (n->GetName() == wxT("object") || + n->GetName() == wxT("object_ref"))) + { + wxObject *created = CreateResFromNode(n, splitter, NULL); + wxWindow *win = wxDynamicCast(created, wxWindow); + if (win1 == NULL) + { + win1 = win; + } + else + { + win2 = win; + break; + } + } + n = n->GetNext(); + } + + if (win1 == NULL) + wxLogError(wxT("wxSplitterWindow node must contain at least one window.")); + + bool horizontal = (GetParamValue(wxT("orientation")) != wxT("vertical")); + if (win1 && win2) + { + if (horizontal) + splitter->SplitHorizontally(win1, win2, sashpos); + else + splitter->SplitVertically(win1, win2, sashpos); + } + else + { + splitter->Initialize(win1); + } + + return splitter; +} + +bool wxSplitterWindowXmlHandler::CanHandle(wxXmlNode *node) +{ + return IsOfClass(node, wxT("wxSplitterWindow")); +} + + diff --git a/distrib/msw/tmake/watbase.t b/distrib/msw/tmake/watbase.t new file mode 100644 index 0000000000..9935d99319 --- /dev/null +++ b/distrib/msw/tmake/watbase.t @@ -0,0 +1,182 @@ +#!############################################################################# +#! File: wat.t +#! Purpose: tmake template file from which makefile.wat is generated by running +#! tmake -t wat wxwin.pro -o makefile.wat +#! Author: Vadim Zeitlin +#! Created: 14.07.99 +#! Version: $Id$ +#!############################################################################# +#${ + #! include the code which parses filelist.txt file and initializes + #! %wxCommon, %wxGeneric and %wxMSW hashes. + IncludeTemplate("filelist.t"); + + #! now transform these hashes into $project tags + foreach $file (sort keys %wxCommon) { + next if $wxCommon{$file} !~ /\bB\b/; + + $isCFile = $file =~ /\.c$/; + $file =~ s/cp?p?$/obj/; + $project{"WXCOMMONOBJS"} .= $file . " "; + $project{"WXCOBJS"} .= $file . " " if $isCFile; + } + + foreach $file (sort keys %wxMSW) { + next if $wxMSW{$file} !~ /\bB\b/; + + my $isCFile = $file =~ /\.c$/; + $file =~ s/cp?p?$/obj/; + $project{"WXMSWOBJS"} .= $file . " "; + $project{"WXCOBJS"} .= $file . " " if $isCFile; + } + + foreach $file (sort keys %wxBase) { + my $isCFile = $file =~ /\.c$/; + $file =~ s/cp?p?$/obj/; + $project{"WXCOMMONOBJS"} .= $file . " "; + $project{"WXCOBJS"} .= $file . " " if $isCFile; + } + +#$} +#! an attempt to embed '#' directly in the string somehow didn't work... +#$ $text = chr(35) . '!/binb/wmake.exe'; + +# This file was automatically generated by tmake +# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WATBASE.T! + +############################################################################## +# Name: makebase.wat +# Purpose: Builds wxBase library for Watcom C++ under Win32 +# Author: Vadim Zeitlin +# Created: 21.01.03 +# RCS-ID: $Id$ +# Copyright: (c) 2003 Vadim Zeitlin +# Licence: wxWindows licence +############################################################################## + +wxUSE_GUI=0 + +!include ..\makewat.env + +LIBTARGET = $(WXDIR)\lib\$(LIBNAME).lib + +EXTRATARGETS = zlib regex +EXTRATARGETSCLEAN = clean_zlib clean_regex +COMMDIR=$(WXDIR)\src\common +MSWDIR=$(WXDIR)\src\msw +OLEDIR=$(MSWDIR)\ole + +COMMONOBJS = & + #$ ExpandGlue("WXCOMMONOBJS", "\$(OUTPUTDIR)", " &\n\t\$(OUTPUTDIR)") + +MSWOBJS = & + #$ ExpandGlue("WXMSWOBJS", "\$(OUTPUTDIR)", " &\n\t\$(OUTPUTDIR)") + +OBJECTS = $(COMMONOBJS) $(MSWOBJS) + +SETUP_H=$(ARCHINCDIR)\wx\setup.h + +all: $(SETUP_H) $(OUTPUTDIR) $(OBJECTS) $(LIBTARGET) $(EXTRATARGETS) .SYMBOLIC + +$(ARCHINCDIR)\wx: + mkdir $(ARCHINCDIR) + mkdir $(ARCHINCDIR)\wx + +$(OUTPUTDIR): + mkdir $(OUTPUTDIR) + +$(SETUP_H): $(WXDIR)\include\wx\msw\setup.h $(ARCHINCDIR)\wx + copy $(WXDIR)\include\wx\msw\setup.h $@ + +LBCFILE=$(OUTPUTDIR)wx$(TOOLKIT).lbc +$(LIBTARGET) : $(OBJECTS) + %create $(LBCFILE) + @for %i in ( $(OBJECTS) ) do @%append $(LBCFILE) +%i + wlib /q /b /c /n /p=512 $^@ @$(LBCFILE) + + +clean: .SYMBOLIC $(EXTRATARGETSCLEAN) + -erase *.obj + -erase $(LIBTARGET) + -erase *.pch + -erase *.err + -erase *.lbc + +cleanall: clean + -erase $(LBCFILE) + +#${ + $_ = $project{"WXMSWOBJS"}; + my @objs = split; + foreach (@objs) { + $text .= "\$(OUTPUTDIR)" . $_ . ': $('; + s/\.obj$//; + $text .= 'MSWDIR)\\'; + + my $suffix, $cc; + if ( $project{"WXCOBJS"} =~ /\b\Q$_\E\b/ ) { + $suffix = "c"; + $cc="CC"; + $flags="CFLAGS"; + } + else { + $suffix = "cpp"; + $cc="CXX"; + $flags="CXXFLAGS"; + } + $text .= $_ . ".$suffix\n" . + " *\$($cc) \$($flags) \$<" . "\n\n"; + } +#$} + +######################################################## +# Common objects (always compiled) + +#${ + $_ = $project{"WXCOMMONOBJS"}; + my @objs = split; + foreach (@objs) { + $text .= "\$(OUTPUTDIR)" . $_; + s/\.obj$//; + $text .= ': $(COMMDIR)\\'; + my $suffix, $cc; + if ( $project{"WXCOBJS"} =~ /\b\Q$_\E\b/ ) { + $suffix = "c"; + $cc="CC"; + $flags="CFLAGS"; + } + else { + $suffix = "cpp"; + $cc="CXX"; + $flags="CXXFLAGS"; + } + $text .= $_ . ".$suffix\n" . + " *\$($cc) \$($flags) \$<" . "\n\n"; + } +#$} + +zlib: .SYMBOLIC + cd $(WXDIR)\src\zlib + wmake -f makefile.wat all + cd $(WXDIR)\src\msw + +clean_zlib: .SYMBOLIC + cd $(WXDIR)\src\zlib + wmake -f makefile.wat clean + cd $(WXDIR)\src\msw + +regex: .SYMBOLIC + cd $(WXDIR)\src\regex + wmake -f makefile.wat all + cd $(WXDIR)\src\msw + +clean_regex: .SYMBOLIC + cd $(WXDIR)\src\regex + wmake -f makefile.wat clean + cd $(WXDIR)\src\msw + +MFTYPE=watbase +self : .SYMBOLIC $(WXDIR)\distrib\msw\tmake\filelist.txt $(WXDIR)\distrib\msw\tmake\$(MFTYPE).t + cd $(WXDIR)\distrib\msw\tmake + tmake -t $(MFTYPE) wxwin.pro -o makebase.wat + copy makebase.wat $(WXDIR)\src\msw diff --git a/include/wx/xrc/xh_split.h b/include/wx/xrc/xh_split.h new file mode 100644 index 0000000000..010bede9f0 --- /dev/null +++ b/include/wx/xrc/xh_split.h @@ -0,0 +1,28 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: xh_split.h +// Purpose: XRC resource for wxSplitterWindow +// Author: panga@freemail.hu, Vaclav Slavik +// Created: 2003/01/26 +// RCS-ID: $Id$ +// Copyright: (c) 2003 panga@freemail.hu, Vaclav Slavik +// Licence: wxWindows licence +///////////////////////////////////////////////////////////////////////////// + +#ifndef _WX_XH_SPLIT_H_ +#define _WX_XH_SPLIT_H_ + +#if defined(__GNUG__) && !defined(__APPLE__) +#pragma interface "xh_split.h" +#endif + +#include "wx/xrc/xmlres.h" + +class WXXMLDLLEXPORT wxSplitterWindowXmlHandler : public wxXmlResourceHandler +{ +public: + wxSplitterWindowXmlHandler(); + virtual wxObject *DoCreateResource(); + virtual bool CanHandle(wxXmlNode *node); +}; + +#endif // _WX_XH_SPLIT_H_ diff --git a/samples/console/makefile.wat b/samples/console/makefile.wat new file mode 100644 index 0000000000..6af511edf2 --- /dev/null +++ b/samples/console/makefile.wat @@ -0,0 +1,9 @@ +wxUSE_GUI = 0 +OUTPUTDIR = Watcom\ + +PROGRAM = console +OBJECTS = $(OUTPUTDIR)$(PROGRAM).obj + +!include $(%WXWIN)\src\makeprog.wat + + diff --git a/src/msw/makebase.wat b/src/msw/makebase.wat new file mode 100644 index 0000000000..7559ceeeb3 --- /dev/null +++ b/src/msw/makebase.wat @@ -0,0 +1,412 @@ +#!/binb/wmake.exe + +# This file was automatically generated by tmake +# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WATBASE.T! + +############################################################################## +# Name: makebase.wat +# Purpose: Builds wxBase library for Watcom C++ under Win32 +# Author: Vadim Zeitlin +# Created: 21.01.03 +# RCS-ID: $Id$ +# Copyright: (c) 2003 Vadim Zeitlin +# Licence: wxWindows licence +############################################################################## + +wxUSE_GUI=0 + +!include ..\makewat.env + +LIBTARGET = $(WXDIR)\lib\wx$(TOOLKIT)$(DEBUGSUFFIX)_w.lib + +EXTRATARGETS = zlib regex +EXTRATARGETSCLEAN = clean_zlib clean_regex +COMMDIR=$(WXDIR)\src\common +MSWDIR=$(WXDIR)\src\msw +OLEDIR=$(MSWDIR)\ole + +COMMONOBJS = & + $(OUTPUTDIR)appcmn.obj & + $(OUTPUTDIR)clntdata.obj & + $(OUTPUTDIR)cmdline.obj & + $(OUTPUTDIR)config.obj & + $(OUTPUTDIR)datetime.obj & + $(OUTPUTDIR)datstrm.obj & + $(OUTPUTDIR)db.obj & + $(OUTPUTDIR)dbtable.obj & + $(OUTPUTDIR)dircmn.obj & + $(OUTPUTDIR)dynarray.obj & + $(OUTPUTDIR)dynlib.obj & + $(OUTPUTDIR)dynload.obj & + $(OUTPUTDIR)encconv.obj & + $(OUTPUTDIR)event.obj & + $(OUTPUTDIR)extended.obj & + $(OUTPUTDIR)ffile.obj & + $(OUTPUTDIR)file.obj & + $(OUTPUTDIR)fileconf.obj & + $(OUTPUTDIR)filefn.obj & + $(OUTPUTDIR)filename.obj & + $(OUTPUTDIR)filesys.obj & + $(OUTPUTDIR)fontmap.obj & + $(OUTPUTDIR)fs_inet.obj & + $(OUTPUTDIR)fs_mem.obj & + $(OUTPUTDIR)fs_zip.obj & + $(OUTPUTDIR)ftp.obj & + $(OUTPUTDIR)hash.obj & + $(OUTPUTDIR)hashmap.obj & + $(OUTPUTDIR)http.obj & + $(OUTPUTDIR)intl.obj & + $(OUTPUTDIR)ipcbase.obj & + $(OUTPUTDIR)list.obj & + $(OUTPUTDIR)log.obj & + $(OUTPUTDIR)longlong.obj & + $(OUTPUTDIR)memory.obj & + $(OUTPUTDIR)mimecmn.obj & + $(OUTPUTDIR)module.obj & + $(OUTPUTDIR)msgout.obj & + $(OUTPUTDIR)mstream.obj & + $(OUTPUTDIR)object.obj & + $(OUTPUTDIR)process.obj & + $(OUTPUTDIR)protocol.obj & + $(OUTPUTDIR)regex.obj & + $(OUTPUTDIR)sckaddr.obj & + $(OUTPUTDIR)sckfile.obj & + $(OUTPUTDIR)sckipc.obj & + $(OUTPUTDIR)sckstrm.obj & + $(OUTPUTDIR)socket.obj & + $(OUTPUTDIR)strconv.obj & + $(OUTPUTDIR)stream.obj & + $(OUTPUTDIR)string.obj & + $(OUTPUTDIR)sysopt.obj & + $(OUTPUTDIR)textbuf.obj & + $(OUTPUTDIR)textfile.obj & + $(OUTPUTDIR)timercmn.obj & + $(OUTPUTDIR)tokenzr.obj & + $(OUTPUTDIR)txtstrm.obj & + $(OUTPUTDIR)unzip.obj & + $(OUTPUTDIR)url.obj & + $(OUTPUTDIR)utilscmn.obj & + $(OUTPUTDIR)variant.obj & + $(OUTPUTDIR)wfstream.obj & + $(OUTPUTDIR)wxchar.obj & + $(OUTPUTDIR)zipstrm.obj & + $(OUTPUTDIR)zstream.obj & + $(OUTPUTDIR)init.obj + +MSWOBJS = & + $(OUTPUTDIR)dde.obj & + $(OUTPUTDIR)dir.obj & + $(OUTPUTDIR)gsocket.obj & + $(OUTPUTDIR)gsockmsw.obj & + $(OUTPUTDIR)main.obj & + $(OUTPUTDIR)mimetype.obj & + $(OUTPUTDIR)regconf.obj & + $(OUTPUTDIR)registry.obj & + $(OUTPUTDIR)snglinst.obj & + $(OUTPUTDIR)thread.obj & + $(OUTPUTDIR)utils.obj & + $(OUTPUTDIR)utilsexc.obj & + $(OUTPUTDIR)volume.obj + +OBJECTS = $(COMMONOBJS) $(MSWOBJS) + +SETUP_H=$(ARCHINCDIR)\wx\setup.h + +all: $(SETUP_H) $(OUTPUTDIR) $(OBJECTS) $(LIBTARGET) $(EXTRATARGETS) .SYMBOLIC + +$(ARCHINCDIR)\wx: + mkdir $(ARCHINCDIR) + mkdir $(ARCHINCDIR)\wx + +$(OUTPUTDIR): + mkdir $(OUTPUTDIR) + +$(SETUP_H): $(WXDIR)\include\wx\msw\setup.h $(ARCHINCDIR)\wx + copy $(WXDIR)\include\wx\msw\setup.h $@ + +LBCFILE=$(OUTPUTDIR)wx$(TOOLKIT).lbc +$(LIBTARGET) : $(OBJECTS) + %create $(LBCFILE) + @for %i in ( $(OBJECTS) ) do @%append $(LBCFILE) +%i + wlib /q /b /c /n /p=512 $^@ @$(LBCFILE) + + +clean: .SYMBOLIC $(EXTRATARGETSCLEAN) + -erase *.obj + -erase $(LIBTARGET) + -erase *.pch + -erase *.err + -erase *.lbc + +cleanall: clean + -erase $(LBCFILE) + +$(OUTPUTDIR)dde.obj: $(MSWDIR)\dde.cpp + *$(CXX) $(CXXFLAGS) $< + +$(OUTPUTDIR)dir.obj: $(MSWDIR)\dir.cpp + *$(CXX) $(CXXFLAGS) $< + +$(OUTPUTDIR)gsocket.obj: $(MSWDIR)\gsocket.c + *$(CC) $(CFLAGS) $< + +$(OUTPUTDIR)gsockmsw.obj: $(MSWDIR)\gsockmsw.c + *$(CC) $(CFLAGS) $< + +$(OUTPUTDIR)main.obj: $(MSWDIR)\main.cpp + *$(CXX) $(CXXFLAGS) $< + +$(OUTPUTDIR)mimetype.obj: $(MSWDIR)\mimetype.cpp + *$(CXX) $(CXXFLAGS) $< + +$(OUTPUTDIR)regconf.obj: $(MSWDIR)\regconf.cpp + *$(CXX) $(CXXFLAGS) $< + +$(OUTPUTDIR)registry.obj: $(MSWDIR)\registry.cpp + *$(CXX) $(CXXFLAGS) $< + +$(OUTPUTDIR)snglinst.obj: $(MSWDIR)\snglinst.cpp + *$(CXX) $(CXXFLAGS) $< + +$(OUTPUTDIR)thread.obj: $(MSWDIR)\thread.cpp + *$(CXX) $(CXXFLAGS) $< + +$(OUTPUTDIR)utils.obj: $(MSWDIR)\utils.cpp + *$(CXX) $(CXXFLAGS) $< + +$(OUTPUTDIR)utilsexc.obj: $(MSWDIR)\utilsexc.cpp + *$(CXX) $(CXXFLAGS) $< + +$(OUTPUTDIR)volume.obj: $(MSWDIR)\volume.cpp + *$(CXX) $(CXXFLAGS) $< + + + +######################################################## +# Common objects (always compiled) + +$(OUTPUTDIR)appcmn.obj: $(COMMDIR)\appcmn.cpp + *$(CXX) $(CXXFLAGS) $< + +$(OUTPUTDIR)clntdata.obj: $(COMMDIR)\clntdata.cpp + *$(CXX) $(CXXFLAGS) $< + +$(OUTPUTDIR)cmdline.obj: $(COMMDIR)\cmdline.cpp + *$(CXX) $(CXXFLAGS) $< + +$(OUTPUTDIR)config.obj: $(COMMDIR)\config.cpp + *$(CXX) $(CXXFLAGS) $< + +$(OUTPUTDIR)datetime.obj: $(COMMDIR)\datetime.cpp + *$(CXX) $(CXXFLAGS) $< + +$(OUTPUTDIR)datstrm.obj: $(COMMDIR)\datstrm.cpp + *$(CXX) $(CXXFLAGS) $< + +$(OUTPUTDIR)db.obj: $(COMMDIR)\db.cpp + *$(CXX) $(CXXFLAGS) $< + +$(OUTPUTDIR)dbtable.obj: $(COMMDIR)\dbtable.cpp + *$(CXX) $(CXXFLAGS) $< + +$(OUTPUTDIR)dircmn.obj: $(COMMDIR)\dircmn.cpp + *$(CXX) $(CXXFLAGS) $< + +$(OUTPUTDIR)dynarray.obj: $(COMMDIR)\dynarray.cpp + *$(CXX) $(CXXFLAGS) $< + +$(OUTPUTDIR)dynlib.obj: $(COMMDIR)\dynlib.cpp + *$(CXX) $(CXXFLAGS) $< + +$(OUTPUTDIR)dynload.obj: $(COMMDIR)\dynload.cpp + *$(CXX) $(CXXFLAGS) $< + +$(OUTPUTDIR)encconv.obj: $(COMMDIR)\encconv.cpp + *$(CXX) $(CXXFLAGS) $< + +$(OUTPUTDIR)event.obj: $(COMMDIR)\event.cpp + *$(CXX) $(CXXFLAGS) $< + +$(OUTPUTDIR)extended.obj: $(COMMDIR)\extended.c + *$(CC) $(CFLAGS) $< + +$(OUTPUTDIR)ffile.obj: $(COMMDIR)\ffile.cpp + *$(CXX) $(CXXFLAGS) $< + +$(OUTPUTDIR)file.obj: $(COMMDIR)\file.cpp + *$(CXX) $(CXXFLAGS) $< + +$(OUTPUTDIR)fileconf.obj: $(COMMDIR)\fileconf.cpp + *$(CXX) $(CXXFLAGS) $< + +$(OUTPUTDIR)filefn.obj: $(COMMDIR)\filefn.cpp + *$(CXX) $(CXXFLAGS) $< + +$(OUTPUTDIR)filename.obj: $(COMMDIR)\filename.cpp + *$(CXX) $(CXXFLAGS) $< + +$(OUTPUTDIR)filesys.obj: $(COMMDIR)\filesys.cpp + *$(CXX) $(CXXFLAGS) $< + +$(OUTPUTDIR)fontmap.obj: $(COMMDIR)\fontmap.cpp + *$(CXX) $(CXXFLAGS) $< + +$(OUTPUTDIR)fs_inet.obj: $(COMMDIR)\fs_inet.cpp + *$(CXX) $(CXXFLAGS) $< + +$(OUTPUTDIR)fs_mem.obj: $(COMMDIR)\fs_mem.cpp + *$(CXX) $(CXXFLAGS) $< + +$(OUTPUTDIR)fs_zip.obj: $(COMMDIR)\fs_zip.cpp + *$(CXX) $(CXXFLAGS) $< + +$(OUTPUTDIR)ftp.obj: $(COMMDIR)\ftp.cpp + *$(CXX) $(CXXFLAGS) $< + +$(OUTPUTDIR)hash.obj: $(COMMDIR)\hash.cpp + *$(CXX) $(CXXFLAGS) $< + +$(OUTPUTDIR)hashmap.obj: $(COMMDIR)\hashmap.cpp + *$(CXX) $(CXXFLAGS) $< + +$(OUTPUTDIR)http.obj: $(COMMDIR)\http.cpp + *$(CXX) $(CXXFLAGS) $< + +$(OUTPUTDIR)intl.obj: $(COMMDIR)\intl.cpp + *$(CXX) $(CXXFLAGS) $< + +$(OUTPUTDIR)ipcbase.obj: $(COMMDIR)\ipcbase.cpp + *$(CXX) $(CXXFLAGS) $< + +$(OUTPUTDIR)list.obj: $(COMMDIR)\list.cpp + *$(CXX) $(CXXFLAGS) $< + +$(OUTPUTDIR)log.obj: $(COMMDIR)\log.cpp + *$(CXX) $(CXXFLAGS) $< + +$(OUTPUTDIR)longlong.obj: $(COMMDIR)\longlong.cpp + *$(CXX) $(CXXFLAGS) $< + +$(OUTPUTDIR)memory.obj: $(COMMDIR)\memory.cpp + *$(CXX) $(CXXFLAGS) $< + +$(OUTPUTDIR)mimecmn.obj: $(COMMDIR)\mimecmn.cpp + *$(CXX) $(CXXFLAGS) $< + +$(OUTPUTDIR)module.obj: $(COMMDIR)\module.cpp + *$(CXX) $(CXXFLAGS) $< + +$(OUTPUTDIR)msgout.obj: $(COMMDIR)\msgout.cpp + *$(CXX) $(CXXFLAGS) $< + +$(OUTPUTDIR)mstream.obj: $(COMMDIR)\mstream.cpp + *$(CXX) $(CXXFLAGS) $< + +$(OUTPUTDIR)object.obj: $(COMMDIR)\object.cpp + *$(CXX) $(CXXFLAGS) $< + +$(OUTPUTDIR)process.obj: $(COMMDIR)\process.cpp + *$(CXX) $(CXXFLAGS) $< + +$(OUTPUTDIR)protocol.obj: $(COMMDIR)\protocol.cpp + *$(CXX) $(CXXFLAGS) $< + +$(OUTPUTDIR)regex.obj: $(COMMDIR)\regex.cpp + *$(CXX) $(CXXFLAGS) $< + +$(OUTPUTDIR)sckaddr.obj: $(COMMDIR)\sckaddr.cpp + *$(CXX) $(CXXFLAGS) $< + +$(OUTPUTDIR)sckfile.obj: $(COMMDIR)\sckfile.cpp + *$(CXX) $(CXXFLAGS) $< + +$(OUTPUTDIR)sckipc.obj: $(COMMDIR)\sckipc.cpp + *$(CXX) $(CXXFLAGS) $< + +$(OUTPUTDIR)sckstrm.obj: $(COMMDIR)\sckstrm.cpp + *$(CXX) $(CXXFLAGS) $< + +$(OUTPUTDIR)socket.obj: $(COMMDIR)\socket.cpp + *$(CXX) $(CXXFLAGS) $< + +$(OUTPUTDIR)strconv.obj: $(COMMDIR)\strconv.cpp + *$(CXX) $(CXXFLAGS) $< + +$(OUTPUTDIR)stream.obj: $(COMMDIR)\stream.cpp + *$(CXX) $(CXXFLAGS) $< + +$(OUTPUTDIR)string.obj: $(COMMDIR)\string.cpp + *$(CXX) $(CXXFLAGS) $< + +$(OUTPUTDIR)sysopt.obj: $(COMMDIR)\sysopt.cpp + *$(CXX) $(CXXFLAGS) $< + +$(OUTPUTDIR)textbuf.obj: $(COMMDIR)\textbuf.cpp + *$(CXX) $(CXXFLAGS) $< + +$(OUTPUTDIR)textfile.obj: $(COMMDIR)\textfile.cpp + *$(CXX) $(CXXFLAGS) $< + +$(OUTPUTDIR)timercmn.obj: $(COMMDIR)\timercmn.cpp + *$(CXX) $(CXXFLAGS) $< + +$(OUTPUTDIR)tokenzr.obj: $(COMMDIR)\tokenzr.cpp + *$(CXX) $(CXXFLAGS) $< + +$(OUTPUTDIR)txtstrm.obj: $(COMMDIR)\txtstrm.cpp + *$(CXX) $(CXXFLAGS) $< + +$(OUTPUTDIR)unzip.obj: $(COMMDIR)\unzip.c + *$(CC) $(CFLAGS) $< + +$(OUTPUTDIR)url.obj: $(COMMDIR)\url.cpp + *$(CXX) $(CXXFLAGS) $< + +$(OUTPUTDIR)utilscmn.obj: $(COMMDIR)\utilscmn.cpp + *$(CXX) $(CXXFLAGS) $< + +$(OUTPUTDIR)variant.obj: $(COMMDIR)\variant.cpp + *$(CXX) $(CXXFLAGS) $< + +$(OUTPUTDIR)wfstream.obj: $(COMMDIR)\wfstream.cpp + *$(CXX) $(CXXFLAGS) $< + +$(OUTPUTDIR)wxchar.obj: $(COMMDIR)\wxchar.cpp + *$(CXX) $(CXXFLAGS) $< + +$(OUTPUTDIR)zipstrm.obj: $(COMMDIR)\zipstrm.cpp + *$(CXX) $(CXXFLAGS) $< + +$(OUTPUTDIR)zstream.obj: $(COMMDIR)\zstream.cpp + *$(CXX) $(CXXFLAGS) $< + +$(OUTPUTDIR)init.obj: $(COMMDIR)\init.cpp + *$(CXX) $(CXXFLAGS) $< + + + +zlib: .SYMBOLIC + cd $(WXDIR)\src\zlib + wmake -f makefile.wat all + cd $(WXDIR)\src\msw + +clean_zlib: .SYMBOLIC + cd $(WXDIR)\src\zlib + wmake -f makefile.wat clean + cd $(WXDIR)\src\msw + +regex: .SYMBOLIC + cd $(WXDIR)\src\regex + wmake -f makefile.wat all + cd $(WXDIR)\src\msw + +clean_regex: .SYMBOLIC + cd $(WXDIR)\src\regex + wmake -f makefile.wat clean + cd $(WXDIR)\src\msw + +MFTYPE=watbase +self : .SYMBOLIC $(WXDIR)\distrib\msw\tmake\filelist.txt $(WXDIR)\distrib\msw\tmake\$(MFTYPE).t + cd $(WXDIR)\distrib\msw\tmake + tmake -t $(MFTYPE) wxwin.pro -o makebase.wat + copy makebase.wat $(WXDIR)\src\msw diff --git a/src/stc/makefile.wat b/src/stc/makefile.wat new file mode 100644 index 0000000000..c9f3157bf8 --- /dev/null +++ b/src/stc/makefile.wat @@ -0,0 +1,78 @@ +# STC makefile for Watcom C++ + +WXDIR = ..\..\.. + +SCINTILLA=$(WXDIR)\contrib\src\stc\scintilla +S=$(SCINTILLA)\src +STCEXTRACPPFLAGS=-D__WX__ -DSCI_LEXER -DLINK_LEXERS -I$(SCINTILLA)\include -I$(S) + +EXTRACPPFLAGS = -I$(WXDIR)\contrib\include $(STCEXTRACPPFLAGS) + +!include $(WXDIR)\src\makewat.env + +STCLIB = $(WXDIR)\lib\stc.lib +THISDIR = $(WXDIR)\contrib\src\stc +OUTPUTDIR = $(THISDIR)\ + + +NAME = stc +LNK = $(name).lnk + +OBJECTS = & + AutoComplete.obj & + CallTip.obj & + CellBuffer.obj & + ContractionState.obj & + Document.obj & + DocumentAccessor.obj & + Editor.obj & + Indicator.obj & + KeyMap.obj & + KeyWords.obj & + LexAVE.obj & + LexAda.obj & + LexBaan.obj & + LexBullant.obj & + LexMatlab.obj & + LexCPP.obj & + LexConf.obj & + LexCrontab.obj & + LexEiffel.obj & + LexHTML.obj & + LexLisp.obj & + LexLua.obj & + LexOthers.obj & + LexPascal.obj & + LexPerl.obj & + LexPython.obj & + LexRuby.obj & + LexSQL.obj & + LexVB.obj & + LineMarker.obj & + PropSet.obj & + RESearch.obj & + ScintillaBase.obj & + Style.obj & + StyleContext.obj & + UniConversion.obj & + ViewStyle.obj & + WindowAccessor.obj & + PlatWX.obj & + ScintillaWX.obj & + stc.obj + +all: $(STCLIB) .SYMBOLIC + +$(STCLIB): $(OBJECTS) + *wlib /b /c /n /P=256 $(STCLIB) $(OBJECTS) + +clean: .SYMBOLIC + -erase *.obj *.bak *.err *.pch $(STCLIB) *.lbc + +.EXTENSIONS: .cxx +.cxx: $(S) + +.cxx.obj: + $(CXX) $[*.cxx $(CXXFLAGS) $(STCEXTRACPPFLAGS) + + diff --git a/src/version.mak b/src/version.mak new file mode 100644 index 0000000000..34d7c11d25 --- /dev/null +++ b/src/version.mak @@ -0,0 +1,24 @@ +############################################################################## +# Name: src/version.mak +# Purpose: file defining wxWindows version used by all other makefiles +# Author: Vadim Zeitlin +# Modified by: +# Created: 25.02.03 +# RCS-ID: $Id$ +# Copyright: (c) 2003 Vadim Zeitlin +# Licence: wxWindows license +############################################################################## + +wxMAJOR_VERSION=2 +wxMINOR_VERSION=5 +wxRELEASE_NUMBER=0 + +# release number if used in the DLL file names only for the unstable branch as +# for the stable branches the micro releases are supposed to be backwards +# compatible and so should have the same name or otherwise it would be +# impossible to use them without recompiling the applications (which is the +# whole goal of keeping them backwards compatible in the first place) +# +# as 2.5 is an unstable branch, wxRELEASE_NUMBER_IFUNSTABLE should be set +# (but when we go to 2.6, it should become empty) +wxRELEASE_NUMBER_IFUNSTABLE=$(wxRELEASE_NUMBER) diff --git a/src/xrc/xh_split.cpp b/src/xrc/xh_split.cpp new file mode 100644 index 0000000000..4b23f9ff60 --- /dev/null +++ b/src/xrc/xh_split.cpp @@ -0,0 +1,103 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: xh_split.cpp +// Purpose: XRC resource for wxSplitterWindow +// Author: panga@freemail.hu, Vaclav Slavik +// Created: 2003/01/26 +// RCS-ID: $Id$ +// Copyright: (c) 2003 panga@freemail.hu, Vaclav Slavik +// Licence: wxWindows licence +///////////////////////////////////////////////////////////////////////////// + +#ifdef __GNUG__ +#pragma implementation "xh_split.h" +#endif + +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#ifdef __BORLANDC__ + #pragma hdrstop +#endif + +#include "wx/xrc/xh_split.h" +#include "wx/splitter.h" +#include "wx/log.h" + +wxSplitterWindowXmlHandler::wxSplitterWindowXmlHandler() : wxXmlResourceHandler() +{ + XRC_ADD_STYLE(wxSP_3D); + XRC_ADD_STYLE(wxSP_3DSASH); + XRC_ADD_STYLE(wxSP_3DBORDER); + XRC_ADD_STYLE(wxSP_FULLSASH); + XRC_ADD_STYLE(wxSP_BORDER); + XRC_ADD_STYLE(wxSP_NOBORDER); + XRC_ADD_STYLE(wxSP_PERMIT_UNSPLIT); + XRC_ADD_STYLE(wxSP_LIVE_UPDATE); + AddWindowStyles(); +} + +wxObject *wxSplitterWindowXmlHandler::DoCreateResource() +{ + XRC_MAKE_INSTANCE(splitter, wxSplitterWindow); + + splitter->Create(m_parentAsWindow, + GetID(), + GetPosition(), GetSize(), + GetStyle(wxT("style"), wxSP_3D), + GetName()); + + SetupWindow(splitter); + + long sashpos = GetLong(wxT("sashpos"), 0); + long minpanesize = GetLong(wxT("minsize"), -1); + if (minpanesize != -1) + splitter->SetMinimumPaneSize(minpanesize); + + wxWindow *win1 = NULL, *win2 = NULL; + wxXmlNode *n = m_node->GetChildren(); + while (n) + { + if ((n->GetType() == wxXML_ELEMENT_NODE) && + (n->GetName() == wxT("object") || + n->GetName() == wxT("object_ref"))) + { + wxObject *created = CreateResFromNode(n, splitter, NULL); + wxWindow *win = wxDynamicCast(created, wxWindow); + if (win1 == NULL) + { + win1 = win; + } + else + { + win2 = win; + break; + } + } + n = n->GetNext(); + } + + if (win1 == NULL) + wxLogError(wxT("wxSplitterWindow node must contain at least one window.")); + + bool horizontal = (GetParamValue(wxT("orientation")) != wxT("vertical")); + if (win1 && win2) + { + if (horizontal) + splitter->SplitHorizontally(win1, win2, sashpos); + else + splitter->SplitVertically(win1, win2, sashpos); + } + else + { + splitter->Initialize(win1); + } + + return splitter; +} + +bool wxSplitterWindowXmlHandler::CanHandle(wxXmlNode *node) +{ + return IsOfClass(node, wxT("wxSplitterWindow")); +} + +