diff --git a/contrib/include/wx/xrc/xh_wizrd.h b/contrib/include/wx/xrc/xh_wizrd.h new file mode 100644 index 0000000000..aa5dfbf972 --- /dev/null +++ b/contrib/include/wx/xrc/xh_wizrd.h @@ -0,0 +1,38 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: xh_wizrd.h +// Purpose: XML resource handler for wxWizard +// Author: Vaclav Slavik +// Created: 2003/03/02 +// RCS-ID: $Id$ +// Copyright: (c) 2000 Vaclav Slavik +// Licence: wxWindows licence +///////////////////////////////////////////////////////////////////////////// + +#ifndef _WX_XH_WIZRD_H_ +#define _WX_XH_WIZRDL_H_ + +#if defined(__GNUG__) && !defined(__APPLE__) +#pragma interface "xh_wizrd.h" +#endif + +#include "wx/xrc/xmlres.h" + +#if wxUSE_WIZARDDLG + +#include "wx/wizard.h" + +class WXXMLDLLEXPORT wxWizardXmlHandler : public wxXmlResourceHandler +{ +public: + wxWizardXmlHandler(); + virtual wxObject *DoCreateResource(); + virtual bool CanHandle(wxXmlNode *node); + +private: + wxWizard *m_wizard; + wxWizardPageSimple *m_lastSimplePage; +}; + +#endif + +#endif // _WX_XH_PANEL_H_ diff --git a/contrib/src/xrc/xh_wizrd.cpp b/contrib/src/xrc/xh_wizrd.cpp new file mode 100644 index 0000000000..958845ba64 --- /dev/null +++ b/contrib/src/xrc/xh_wizrd.cpp @@ -0,0 +1,99 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: xh_wizrd.cpp +// Purpose: XRC resource for wxWizard +// Author: Vaclav Slavik +// Created: 2003/03/01 +// RCS-ID: $Id$ +// Copyright: (c) 2000 Vaclav Slavik +// Licence: wxWindows licence +///////////////////////////////////////////////////////////////////////////// + +#ifdef __GNUG__ +#pragma implementation "xh_wizrd.h" +#endif + +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#ifdef __BORLANDC__ + #pragma hdrstop +#endif + +#if wxUSE_WIZARDDLG + +#include "wx/xrc/xh_wizrd.h" +#include "wx/log.h" +#include "wx/wizard.h" + + +wxWizardXmlHandler::wxWizardXmlHandler() : wxXmlResourceHandler() +{ + m_wizard = NULL; + m_lastSimplePage = NULL; + XRC_ADD_STYLE(wxWIZARD_EX_HELPBUTTON); +} + +wxObject *wxWizardXmlHandler::DoCreateResource() +{ + if (m_class == wxT("wxWizard")) + { + XRC_MAKE_INSTANCE(wiz, wxWizard) + + long style = GetStyle(wxT("exstyle"), 0); + if (style != 0) + wiz->SetExtraStyle(style); + wiz->Create(m_parentAsWindow, + GetID(), + GetText(wxT("title")), + GetBitmap(), + GetPosition()); + + wxWizard *old = m_wizard; + m_wizard = wiz; + m_lastSimplePage = NULL; + CreateChildren(wiz, true /*this handler only*/); + m_wizard = old; + return wiz; + } + else + { + wxWizardPage *page = NULL; + if (m_class == wxT("wxWizardPageSimple")) + { + XRC_MAKE_INSTANCE(p, wxWizardPageSimple) + p->Create(m_wizard, NULL, NULL, GetBitmap()); + if (m_lastSimplePage) + wxWizardPageSimple::Chain(m_lastSimplePage, p); + page = p; + m_lastSimplePage = p; + } + else /*if (m_class == wxT("wxWizardPage"))*/ + { + wxWizardPage *p = NULL; + if (m_instance) + p = wxStaticCast(m_instance, wxWizardPage); + else + wxLogError(wxT("wxWizardPage is abstract class, must be subclassed")); + p->Create(m_wizard, GetBitmap()); + page = p; + } + + page->SetName(GetName()); + page->SetId(GetID()); + + SetupWindow(page); + CreateChildren(page); + return page; + } +} + +bool wxWizardXmlHandler::CanHandle(wxXmlNode *node) +{ + return IsOfClass(node, wxT("wxWizard")) || + (m_wizard != NULL && + (IsOfClass(node, wxT("wxWizardPage")) || + IsOfClass(node, wxT("wxWizardPageSimple"))) + ); +} + +#endif // wxUSE_WIZARDDLG diff --git a/include/wx/xrc/xh_wizrd.h b/include/wx/xrc/xh_wizrd.h new file mode 100644 index 0000000000..aa5dfbf972 --- /dev/null +++ b/include/wx/xrc/xh_wizrd.h @@ -0,0 +1,38 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: xh_wizrd.h +// Purpose: XML resource handler for wxWizard +// Author: Vaclav Slavik +// Created: 2003/03/02 +// RCS-ID: $Id$ +// Copyright: (c) 2000 Vaclav Slavik +// Licence: wxWindows licence +///////////////////////////////////////////////////////////////////////////// + +#ifndef _WX_XH_WIZRD_H_ +#define _WX_XH_WIZRDL_H_ + +#if defined(__GNUG__) && !defined(__APPLE__) +#pragma interface "xh_wizrd.h" +#endif + +#include "wx/xrc/xmlres.h" + +#if wxUSE_WIZARDDLG + +#include "wx/wizard.h" + +class WXXMLDLLEXPORT wxWizardXmlHandler : public wxXmlResourceHandler +{ +public: + wxWizardXmlHandler(); + virtual wxObject *DoCreateResource(); + virtual bool CanHandle(wxXmlNode *node); + +private: + wxWizard *m_wizard; + wxWizardPageSimple *m_lastSimplePage; +}; + +#endif + +#endif // _WX_XH_PANEL_H_ diff --git a/lib/_sc/Readme.txt b/lib/_sc/Readme.txt new file mode 100644 index 0000000000..a0061668d6 --- /dev/null +++ b/lib/_sc/Readme.txt @@ -0,0 +1,4 @@ +This directory contains files for the Digitalmars compiler, currently 8.34 beta +to resolve externals which are not present in the .lib files released by DigitalMars. + +Chris Elliott, biol75@york.ac.uk, 07 May 03 diff --git a/src/jpeg/makefile.sc b/src/jpeg/makefile.sc new file mode 100644 index 0000000000..49ddf8ef9f --- /dev/null +++ b/src/jpeg/makefile.sc @@ -0,0 +1,67 @@ +############################################################################## +# Name: src/jpeg/makefile.sc +# Purpose: build jpeg Digital Mars 8.33 compiler +# Author: Chris Elliott +# Created: 21.01.03 +# RCS-ID: $Id$ +# Licence: wxWindows licence +############################################################################## + +WXDIR = ..\.. + +include $(WXDIR)\src\makesc.env + +LIBTARGET=$(WXDIR)\lib\jpeg$(SC_SUFFIX).lib +THISDIR=$(WXDIR)\src\jpeg + +# variables +OBJECTS = \ + $(THISDIR)\jcomapi.obj \ + $(THISDIR)\jutils.obj \ + $(THISDIR)\jerror.obj \ + $(THISDIR)\jmemmgr.obj \ + $(THISDIR)\jmemnobs.obj \ + $(THISDIR)\jcapimin.obj \ + $(THISDIR)\jcapistd.obj \ + $(THISDIR)\jctrans.obj \ + $(THISDIR)\jcparam.obj \ + $(THISDIR)\jdatadst.obj \ + $(THISDIR)\jcinit.obj \ + $(THISDIR)\jcmaster.obj \ + $(THISDIR)\jcmarker.obj \ + $(THISDIR)\jcmainct.obj \ + $(THISDIR)\jcprepct.obj \ + $(THISDIR)\jccoefct.obj \ + $(THISDIR)\jccolor.obj \ + $(THISDIR)\jcsample.obj \ + $(THISDIR)\jchuff.obj \ + $(THISDIR)\jcphuff.obj \ + $(THISDIR)\jcdctmgr.obj \ + $(THISDIR)\jfdctfst.obj \ + $(THISDIR)\jfdctflt.obj \ + $(THISDIR)\jfdctint.obj \ + $(THISDIR)\jdapimin.obj \ + $(THISDIR)\jdapistd.obj \ + $(THISDIR)\jdtrans.obj \ + $(THISDIR)\jdatasrc.obj \ + $(THISDIR)\jdmaster.obj \ + $(THISDIR)\jdinput.obj \ + $(THISDIR)\jdmarker.obj \ + $(THISDIR)\jdhuff.obj \ + $(THISDIR)\jdphuff.obj \ + $(THISDIR)\jdmainct.obj \ + $(THISDIR)\jdcoefct.obj \ + $(THISDIR)\jdpostct.obj \ + $(THISDIR)\jddctmgr.obj \ + $(THISDIR)\jidctfst.obj \ + $(THISDIR)\jidctflt.obj \ + $(THISDIR)\jidctint.obj \ + $(THISDIR)\jidctred.obj \ + $(THISDIR)\jdsample.obj \ + $(THISDIR)\jdcolor.obj \ + $(THISDIR)\jquant1.obj \ + $(THISDIR)\jquant2.obj \ + $(THISDIR)\jdmerge.obj + +include $(WXDIR)\src\makelib.sc + diff --git a/src/makelib.sc b/src/makelib.sc new file mode 100644 index 0000000000..a14475acf3 --- /dev/null +++ b/src/makelib.sc @@ -0,0 +1,22 @@ +############################################################################## +# Name: src/makelib.sc +# Purpose: build library Digital Mars 8.33 compiler +# Author: Chris Elliott +# Created: 21.01.03 +# RCS-ID: $Id$ +# Licence: wxWindows licence +############################################################################## + + + + +all: $(LIBTARGET) + +$(LIBTARGET): $(OBJECTS) + lib -c $(LIBTARGET) $(OBJECTS) + + +clean: + -del $(THISDIR)\*.obj + -del $(LIBTARGET) + diff --git a/src/png/makefile.sc b/src/png/makefile.sc new file mode 100644 index 0000000000..23c5a20ffe --- /dev/null +++ b/src/png/makefile.sc @@ -0,0 +1,35 @@ +############################################################################## +# Name: src/png/makefile.sc +# Purpose: build png Digital Mars 8.33 compiler +# Author: Chris Elliott +# Created: 21.01.03 +# RCS-ID: $Id$ +# Licence: wxWindows licence +############################################################################## + +WXDIR = ..\.. +include $(WXDIR)\src\makesc.env +LIBTARGET=$(WXDIR)\lib\png$(SC_SUFFIX).lib +THISDIR=$(WXDIR)\src\png + +# variables +OBJECTS = \ + $(THISDIR)\png.obj \ + $(THISDIR)\pngread.obj \ + $(THISDIR)\pngrtran.obj \ + $(THISDIR)\pngrutil.obj \ + $(THISDIR)\pngpread.obj \ + $(THISDIR)\pngtrans.obj \ + $(THISDIR)\pngwrite.obj \ + $(THISDIR)\pngwtran.obj \ + $(THISDIR)\pngwutil.obj \ + $(THISDIR)\pngerror.obj \ + $(THISDIR)\pngmem.obj \ + $(THISDIR)\pngwio.obj \ + $(THISDIR)\pngrio.obj \ + $(THISDIR)\pngget.obj \ + $(THISDIR)\pngset.obj + + +include $(WXDIR)\src\makelib.sc\ + diff --git a/src/regex/makefile.sc b/src/regex/makefile.sc new file mode 100644 index 0000000000..e2e7983689 --- /dev/null +++ b/src/regex/makefile.sc @@ -0,0 +1,25 @@ +############################################################################## +# Name: src/regex/makefile.sc +# Purpose: build regex Digital Mars 8.33 compiler +# Author: Chris Elliott +# Created: 21.01.03 +# RCS-ID: $Id$ +# Licence: wxWindows licence +############################################################################## + +WXDIR = ..\.. + +include $(WXDIR)\src\makesc.env + +LIBTARGET=$(WXDIR)\lib\regex$(SC_SUFFIX).lib +THISDIR=$(WXDIR)\src\regex + +# variables +OBJECTS = \ + $(THISDIR)\regcomp.obj \ + $(THISDIR)\regexec.obj \ + $(THISDIR)\regerror.obj \ + $(THISDIR)\regfree.obj \ + +include $(WXDIR)\src\makelib.sc + diff --git a/src/tiff/makefile.sc b/src/tiff/makefile.sc new file mode 100644 index 0000000000..b73d481e88 --- /dev/null +++ b/src/tiff/makefile.sc @@ -0,0 +1,54 @@ +############################################################################## +# Name: src/tiff/makefile.sc +# Purpose: build tiff Digital Mars 8.33 compiler +# Author: Chris Elliott +# Created: 21.01.03 +# RCS-ID: $Id$ +# Licence: wxWindows licence +############################################################################## + +WXDIR = ..\.. + +include $(WXDIR)\src\makesc.env + +LIBTARGET=$(WXDIR)\lib\tiff$(SC_SUFFIX).lib +THISDIR=$(WXDIR)\src\tiff + +# variables +OBJECTS = \ + $(THISDIR)\tif_aux.obj \ + $(THISDIR)\tif_close.obj \ + $(THISDIR)\tif_codec.obj \ + $(THISDIR)\tif_compress.obj \ + $(THISDIR)\tif_dir.obj \ + $(THISDIR)\tif_dirinfo.obj \ + $(THISDIR)\tif_dirread.obj \ + $(THISDIR)\tif_dirwrite.obj \ + $(THISDIR)\tif_dumpmode.obj \ + $(THISDIR)\tif_error.obj \ + $(THISDIR)\tif_fax3.obj \ + $(THISDIR)\tif_fax3sm.obj \ + $(THISDIR)\tif_flush.obj \ + $(THISDIR)\tif_getimage.obj \ + $(THISDIR)\tif_jpeg.obj \ + $(THISDIR)\tif_luv.obj \ + $(THISDIR)\tif_lzw.obj \ + $(THISDIR)\tif_next.obj \ + $(THISDIR)\tif_open.obj \ + $(THISDIR)\tif_packbits.obj \ + $(THISDIR)\tif_pixarlog.obj \ + $(THISDIR)\tif_predict.obj \ + $(THISDIR)\tif_print.obj \ + $(THISDIR)\tif_read.obj \ + $(THISDIR)\tif_strip.obj \ + $(THISDIR)\tif_swab.obj \ + $(THISDIR)\tif_thunder.obj \ + $(THISDIR)\tif_tile.obj \ + $(THISDIR)\tif_version.obj \ + $(THISDIR)\tif_warning.obj \ + $(THISDIR)\tif_win32.obj \ + $(THISDIR)\tif_write.obj \ + $(THISDIR)\tif_zip.obj \ + +include $(WXDIR)\src\makelib.sc + diff --git a/src/xrc/xh_wizrd.cpp b/src/xrc/xh_wizrd.cpp new file mode 100644 index 0000000000..958845ba64 --- /dev/null +++ b/src/xrc/xh_wizrd.cpp @@ -0,0 +1,99 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: xh_wizrd.cpp +// Purpose: XRC resource for wxWizard +// Author: Vaclav Slavik +// Created: 2003/03/01 +// RCS-ID: $Id$ +// Copyright: (c) 2000 Vaclav Slavik +// Licence: wxWindows licence +///////////////////////////////////////////////////////////////////////////// + +#ifdef __GNUG__ +#pragma implementation "xh_wizrd.h" +#endif + +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#ifdef __BORLANDC__ + #pragma hdrstop +#endif + +#if wxUSE_WIZARDDLG + +#include "wx/xrc/xh_wizrd.h" +#include "wx/log.h" +#include "wx/wizard.h" + + +wxWizardXmlHandler::wxWizardXmlHandler() : wxXmlResourceHandler() +{ + m_wizard = NULL; + m_lastSimplePage = NULL; + XRC_ADD_STYLE(wxWIZARD_EX_HELPBUTTON); +} + +wxObject *wxWizardXmlHandler::DoCreateResource() +{ + if (m_class == wxT("wxWizard")) + { + XRC_MAKE_INSTANCE(wiz, wxWizard) + + long style = GetStyle(wxT("exstyle"), 0); + if (style != 0) + wiz->SetExtraStyle(style); + wiz->Create(m_parentAsWindow, + GetID(), + GetText(wxT("title")), + GetBitmap(), + GetPosition()); + + wxWizard *old = m_wizard; + m_wizard = wiz; + m_lastSimplePage = NULL; + CreateChildren(wiz, true /*this handler only*/); + m_wizard = old; + return wiz; + } + else + { + wxWizardPage *page = NULL; + if (m_class == wxT("wxWizardPageSimple")) + { + XRC_MAKE_INSTANCE(p, wxWizardPageSimple) + p->Create(m_wizard, NULL, NULL, GetBitmap()); + if (m_lastSimplePage) + wxWizardPageSimple::Chain(m_lastSimplePage, p); + page = p; + m_lastSimplePage = p; + } + else /*if (m_class == wxT("wxWizardPage"))*/ + { + wxWizardPage *p = NULL; + if (m_instance) + p = wxStaticCast(m_instance, wxWizardPage); + else + wxLogError(wxT("wxWizardPage is abstract class, must be subclassed")); + p->Create(m_wizard, GetBitmap()); + page = p; + } + + page->SetName(GetName()); + page->SetId(GetID()); + + SetupWindow(page); + CreateChildren(page); + return page; + } +} + +bool wxWizardXmlHandler::CanHandle(wxXmlNode *node) +{ + return IsOfClass(node, wxT("wxWizard")) || + (m_wizard != NULL && + (IsOfClass(node, wxT("wxWizardPage")) || + IsOfClass(node, wxT("wxWizardPageSimple"))) + ); +} + +#endif // wxUSE_WIZARDDLG diff --git a/src/zlib/makefile.sc b/src/zlib/makefile.sc new file mode 100644 index 0000000000..e34a264de6 --- /dev/null +++ b/src/zlib/makefile.sc @@ -0,0 +1,33 @@ +############################################################################## +# Name: src/zlib/makefile.sc +# Purpose: build zlib Digital Mars 8.33 compiler +# Author: Chris Elliott +# Created: 21.01.03 +# RCS-ID: $Id$ +# Licence: wxWindows licence +############################################################################## + +WXDIR = ..\.. +include $(WXDIR)\src\makesc.env +LIBTARGET=$(WXDIR)\lib\zlib$(SC_SUFFIX).lib +THISDIR=$(WXDIR)\src\zlib + +# variables +OBJECTS = \ + $(THISDIR)\adler32.obj \ + $(THISDIR)\compress.obj \ + $(THISDIR)\crc32.obj \ + $(THISDIR)\gzio.obj \ + $(THISDIR)\uncompr.obj \ + $(THISDIR)\deflate.obj \ + $(THISDIR)\trees.obj \ + $(THISDIR)\zutil.obj \ + $(THISDIR)\inflate.obj \ + $(THISDIR)\infblock.obj \ + $(THISDIR)\inftrees.obj \ + $(THISDIR)\infcodes.obj \ + $(THISDIR)\infutil.obj \ + $(THISDIR)\inffast.obj + +include $(WXDIR)\src\makelib.sc +