This commit was manufactured by cvs2svn to create tag 'PRE_REWRITE'.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/PRE_REWRITE@658 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1998-09-03 15:38:49 +00:00
19 changed files with 3456 additions and 1361 deletions
--- a/include/wx/date.h
+++ b/include/wx/date.h
@@ -1,146 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        date.h
-// Purpose:     wxDate class
-// Author:      Julian Smart, Steve Marcus, Eric Simon, Chris Hill,
-//              Charles D. Price
-// Modified by:
-// Created:     01/02/97
-// RCS-ID:      $Id$
-// Copyright:   (c)
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_DATE_H_
-#define _WX_DATE_H_
-
-#ifdef __GNUG__
-#pragma interface "date.h"
-#endif
-
-#include "wx/object.h"
-#include "wx/string.h"
-
-#if wxUSE_TIMEDATE
-// These lines necessary to stop VC++ 6 being confused about namespaces
-class WXDLLEXPORT wxDate;
-bool WXDLLEXPORT operator<(const wxDate &dt1, const wxDate &dt2);
-bool WXDLLEXPORT operator<(const wxDate &dt1, const wxDate &dt2);
-bool WXDLLEXPORT operator <= (const wxDate &dt1, const wxDate &dt2);
-bool WXDLLEXPORT operator >  (const wxDate &dt1, const wxDate &dt2);
-bool WXDLLEXPORT operator >= (const wxDate &dt1, const wxDate &dt2);
-bool WXDLLEXPORT operator == (const wxDate &dt1, const wxDate &dt2);
-bool WXDLLEXPORT operator != (const wxDate &dt1, const wxDate &dt2);
-
-enum wxdate_format_type {wxMDY, wxDAY, wxMONTH, wxFULL, wxEUROPEAN};
-
-#define wxNO_CENTURY  0x02
-#define wxDATE_ABBR   0x04
-
-class WXDLLEXPORT wxDate : public wxObject
-{
-DECLARE_DYNAMIC_CLASS(wxDate)
-
-protected:
-    unsigned long julian; // see julDate();  days since 1/1/4713 B.C.
-    int month;            // see NMonth()
-    int day;              // see Day()
-    int year;             // see NYear4()
-    int day_of_week;      // see NDOW();  1 = Sunday, ... 7 = Saturday
-
-private:
-    int       DisplayFormat;
-    unsigned char DisplayOptions;
-
-    void julian_to_mdy ();         // convert julian day to mdy
-    void julian_to_wday ();        // convert julian day to day_of_week
-    void mdy_to_julian ();         // convert mdy to julian day
-
-public:
-    wxDate ();
-    wxDate (long j);
-    wxDate (int m, int d, int y);
-    wxDate (const wxString& dat);
-    wxDate (const wxDate &dt);
-
-#ifndef __SALFORDC__
-    operator wxString  (void);
-#endif
-
-    void operator =   (const wxDate& date);
-    void operator =   (const wxString& date);
-
-    wxDate operator +  (long i);
-    wxDate operator +  (int  i);
-
-    wxDate operator -  (long i);
-    wxDate operator -  (int  i);
-
-    long operator -  (const wxDate &dt);
-
-    wxDate &operator += (long i);
-    wxDate &operator -= (long i);
-
-    wxDate &operator ++ ();     // Prefix increment
-    wxDate &operator ++ (int);  // Postfix increment
-    wxDate &operator -- ();     // Prefix decrement
-    wxDate &operator -- (int);  // Postfix decrement
-
-    friend bool WXDLLEXPORT operator <  (const wxDate &dt1, const wxDate &dt2);
-    friend bool WXDLLEXPORT operator <= (const wxDate &dt1, const wxDate &dt2);
-    friend bool WXDLLEXPORT operator >  (const wxDate &dt1, const wxDate &dt2);
-    friend bool WXDLLEXPORT operator >= (const wxDate &dt1, const wxDate &dt2);
-    friend bool WXDLLEXPORT operator == (const wxDate &dt1, const wxDate &dt2);
-    friend bool WXDLLEXPORT operator != (const wxDate &dt1, const wxDate &dt2);
-
-#if wxUSE_STD_IOSTREAM
-    friend ostream WXDLLEXPORT & operator << (ostream &os, const wxDate &dt);
-#endif
-
-    wxString FormatDate      (int type=-1) const;
-    void  SetFormat (int format);
-    int   SetOption (int option, bool enable=TRUE);
-
-    long  GetJulianDate() const;  // returns julian date
-    int   GetDayOfYear()  const;  // returns relative date since Jan. 1
-    bool  IsLeapYear()    const;  // returns TRUE if leap year, FALSE if not
-
-    // Version 4.0 Extension to Public Interface - CDP
-
-    // These 'Set's modify the date object and actually SET it
-    // They all return a reference to self (*this)
-
-    wxDate &Set();            // Sets to current system date
-    wxDate &Set(long lJulian);
-    wxDate &Set(int nMonth, int nDay, int nYear);
-
-    wxDate &AddWeeks(int nCount = 1);  //
-    wxDate &AddMonths(int nCount = 1); // May also pass neg# to decrement
-    wxDate &AddYears(int nCount = 1);  //
-
-    int   GetDay() const;      // Numeric Day of date object
-    int   GetDaysInMonth();    // Number of days in month (1..31)
-    int   GetFirstDayOfMonth() const; // First Day Of Month  (1..7)
-
-    wxString GetDayOfWeekName();       // Character Day Of Week ('Sunday'..'Saturday')
-    int   GetDayOfWeek() const;     // (1..7)
-
-    int   GetWeekOfMonth();            // Numeric Week Of Month  (1..6)
-    int   GetWeekOfYear();            // Numeric Week Of Year   (1..52)
-
-    wxString GetMonthName();            // Character Month name
-    int   GetMonth() const;          // Month Number (1..12)
-    wxDate  GetMonthStart();         // First Date Of Month
-    wxDate  GetMonthEnd();           // Last Date Of Month
-
-    int   GetYear() const;           // eg. 1992
-    wxDate  GetYearStart();          // First Date Of Year
-    wxDate  GetYearEnd();            // Last Date Of Year
-
-    bool IsBetween(const wxDate& first, const wxDate& second) const;
-
-    wxDate Previous(int dayOfWeek) const;
-};
-
-#endif // wxUSE_TIMEDATE
-#endif
-    // _WX_DATE_H_
--- a/include/wx/time.h
+++ b/include/wx/time.h
@@ -1,112 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        time.h
-// Purpose:     wxTime class, from NIHCL
-// Author:      Julian Smart, after K. E. Gorlen
-// Modified by:
-// Created:     01/02/97
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_TIMEH__
-#define _WX_TIMEH__
-
-#include "wx/object.h"
-
-#if wxUSE_TIMEDATE
-
-#ifdef __GNUG__
-#pragma interface "time.h"
-#endif
-
-class WXDLLEXPORT wxDate;
-
-typedef unsigned short hourTy;
-typedef unsigned short minuteTy;
-typedef unsigned short secondTy;
-typedef unsigned long clockTy;
-
-class WXDLLEXPORT wxTime: public wxObject
-{
-        DECLARE_DYNAMIC_CLASS(wxTime)
-        
-public:                 // type definitions
-    enum tFormat { wx12h, wx24h };
-    enum tPrecision { wxStdMinSec, wxStdMin };
-private:
-    static tFormat      Format;
-    static tPrecision   Precision;
-
-    clockTy    sec;        /* seconds since 1/1/1901 */
-
-    bool IsDST() const;
-    wxTime GetLocalTime() const;
-private:        // static member functions
-    static wxTime GetLocalTime(const wxDate& date, hourTy h=0, minuteTy m=0, secondTy s=0);
-    static wxTime GetBeginDST(unsigned year);
-    static wxTime GetEndDST(unsigned year);
-public:
-    wxTime();             // current time 
-    wxTime(clockTy s)         { sec = s; }
-    void operator=(const wxTime& t)     { sec = t.sec; } // Ordering required for some compilers
-    wxTime(const wxTime& t)         { (*this) = t ; }
-    wxTime(hourTy h, minuteTy m, secondTy s =0, bool dst =FALSE);
-    wxTime(const wxDate&, hourTy h =0, minuteTy m =0, secondTy s=0, bool dst =FALSE);
-
-    // Convert to string
-#ifndef __SALFORDC__
-    operator wxChar * (void);
-    operator wxDate() const;
-#endif
-
-    bool operator<(const wxTime& t) const     { return sec < t.sec; }
-    bool operator<=(const wxTime& t) const    { return sec <= t.sec; }
-    bool operator>(const wxTime& t) const     { return sec > t.sec; }
-    bool operator>=(const wxTime& t) const    { return sec >= t.sec; }
-    bool operator==(const wxTime& t) const    { return sec == t.sec; }
-    bool operator!=(const wxTime& t) const    { return sec != t.sec; }
-    friend wxTime operator+(const wxTime& t, long s)    { return wxTime(t.sec+s); }
-    friend wxTime operator+(long s, const wxTime& t)    { return wxTime(t.sec+s); }
-    long operator-(const wxTime& t) const     { return sec - t.sec; }
-    wxTime operator-(long s) const    { return wxTime(sec-s); }
-    void operator+=(long s)     { sec += s; }
-    void operator-=(long s)     { sec -= s; }
-    bool IsBetween(const wxTime& a, const wxTime& b) const;
-
-    /// Get day
-    int GetDay() const;
-    /// Get month
-    int GetMonth() const;
-    /// Get year
-    int GetYear() const;
-    /// Get day of week (0=Sunday 6=Saturday)
-    int GetDayOfWeek() const;
-
-    hourTy GetHour() const;        // hour in local time
-    hourTy GetHourGMT() const;     // hour in GMT
-    minuteTy GetMinute() const;    // minute in local time
-    minuteTy GetMinuteGMT() const;     // minute in GMT
-    secondTy GetSecond() const;    // second in local time or GMT
-    clockTy GetSeconds() const     { return sec; }
-    secondTy GetSecondGMT() const ;
-    wxTime Max(const wxTime&) const;
-    wxTime Min(const wxTime&) const;
-    static void SetFormat(const tFormat lFormat = wx12h,
-                  const tPrecision lPrecision = wxStdMinSec);
-    wxChar *FormatTime() const;
-/*
-    virtual int compare(const Object&) const;
-    virtual void deepenShallowCopy();       // {}
-    virtual unsigned hash() const;
-    virtual bool isEqual(const Object&) const;
-    virtual void printOn(ostream& strm =cout) const;
-    virtual const Class* species() const;
-*/
-};
-
-#endif
-  // wxUSE_TIMEDATE
-#endif
-    // _WX_TIMEH__
-
--- a/src/common/date.cpp
+++ b/src/common/date.cpp
@@ -1,656 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        date.cpp
-// Purpose:     wxDate class
-// Author:
-//    Originally inspired by Steve Marcus (CIS 72007,1233)  6/16/91
-//    Enhanced by Eric Simon (CIS 70540,1522)               6/29/91
-//    Further Enhanced by Chris Hill (CIS 72030,2606)       7/11/91
-//    Still Further Enhanced by Hill & Simon  v3.10         8/05/91
-//    Version 4 by Charles D. Price                         6/27/92
-//    Integrated into wxWindows by Julian Smart             9th July 1995
-// Modified by:
-// Created:     01/02/97
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifdef __GNUG__
-#pragma implementation "date.h"
-#endif
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-  #pragma hdrstop
-#endif
-
-#if wxUSE_TIMEDATE
-
-#include "wx/date.h"
-#include "wx/intl.h"
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include "wx/ioswrap.h"
-
-#include <time.h>
-#include <string.h>
-
-#define ABBR_LENGTH 3
-
-static const wxChar *dayname[] = {
-    wxT("Sunday"), wxT("Monday"), wxT("Tuesday"), wxT("Wednesday"),
-    wxT("Thursday"), wxT("Friday"), wxT("Saturday")
-};
-
-static const wxChar *mname[] = {
-    wxT("January"), wxT("February"), wxT("March"), wxT("April"), wxT("May"), wxT("June"),
-    wxT("July"), wxT("August"), wxT("September"), wxT("October"), wxT("November"), wxT("December")
-};
-
-static int GauDays[] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
-
-IMPLEMENT_DYNAMIC_CLASS(wxDate, wxObject)
-
-    ////////////////////////////////////////////////////////////
-    // Constructors
-    ////////////////////////////////////////////////////////////
-
-wxDate::wxDate()
-{
-    DisplayFormat=wxMDY;
-    DisplayOptions='\0';
-    month = day = year = day_of_week = 0;
-    julian = 0;
-}
-
-wxDate::wxDate (long j) : julian(j)
-{
-    DisplayFormat=wxMDY;
-    DisplayOptions='\0';
-    julian_to_mdy ();
-}
-
-wxDate::wxDate (int m, int d, int y) : month(m), day(d), year(y)
-{
-    DisplayFormat=wxMDY;
-    DisplayOptions='\0';
-    mdy_to_julian ();
-}
-
-wxDate::wxDate (const wxString& dat)
-{
-    DisplayFormat=wxMDY;
-    DisplayOptions='\0';
-    if (wxStrcmp(dat, wxT("TODAY")) == 0 || wxStrcmp(dat, wxT("today")) == 0)
-    {
-        // Sets the current date
-        Set();
-    }
-    else
-    {
-        wxChar buf[100];
-        wxStrcpy(buf, dat);
-
-        wxChar *save_ptr, *token = wxStrtok(buf,wxT("/-"),&save_ptr);
-        month = wxAtoi(token);
-        day   = wxAtoi(wxStrtok((wxChar *) NULL,wxT("/-"),&save_ptr));
-        year  = wxAtoi(wxStrtok((wxChar *) NULL,wxT(" "),&save_ptr));
-    }
-
-    mdy_to_julian ();
-}
-
-wxDate::wxDate (const wxDate &dt)
-{
-    DisplayFormat=dt.DisplayFormat;
-    DisplayOptions=dt.DisplayOptions;
-    month = dt.month;
-    day   = dt.day;
-    year  = dt.year;
-    mdy_to_julian ();
-}
-
-void wxDate::operator = (const wxDate &dt)
-{
-    DisplayFormat=dt.DisplayFormat;
-    DisplayOptions=dt.DisplayOptions;
-    month = dt.month;
-    day   = dt.day;
-    year  = dt.year;
-    mdy_to_julian (); // wxUSE_TIMEDATE
-}
-
-void wxDate::operator = (const wxString& dat)
-{
-    DisplayFormat=wxMDY;
-    DisplayOptions='\0';
-    if (wxStrcmp(dat, wxT("TODAY")) == 0 || wxStrcmp(dat, wxT("today")) == 0)
-    {
-        // Sets the current date
-        Set();
-    }
-    else
-    {
-        wxChar buf[100];
-        wxStrcpy(buf, dat);
-
-        wxChar *save_ptr, *token = wxStrtok(buf,wxT("/-"),&save_ptr);
-        month = wxAtoi(token);
-        day   = wxAtoi(wxStrtok((wxChar *) NULL,wxT("/-"),&save_ptr));
-        year  = wxAtoi(wxStrtok((wxChar *) NULL,wxT(" "),&save_ptr));
-    }
-
-    mdy_to_julian ();
-}
-
-//////////////////////////////////////////////////////////////
-// Conversion operations
-//////////////////////////////////////////////////////////////
-
-#ifndef __SALFORDC__
-wxDate::operator wxString( void )
-{
-    return FormatDate();
-}
-#endif
-
-//////////////////////////////////////////////////////////////
-// Date Arithmetic
-//////////////////////////////////////////////////////////////
-
-wxDate wxDate::operator + (long i)
-{
-    wxDate dp(julian + i);
-    return dp;
-}
-
-wxDate wxDate::operator + (int i)
-{
-    wxDate dp(julian + (long)i);
-    return dp;
-}
-
-wxDate wxDate::operator - (long i)
-{
-    wxDate dp(julian - i);
-    return dp;
-}
-
-wxDate wxDate::operator - (int i)
-{
-    wxDate dp(julian - (long)i);
-    return dp;
-}
-
-long wxDate::operator - (const wxDate &dt)
-{
-    return ( julian - dt.julian );
-}
-
-wxDate &wxDate::operator += (long i)
-{
-    julian += i;
-    julian_to_mdy();
-    return *this;
-}
-
-wxDate &wxDate::operator -= (long i)
-{
-    julian -= i;
-    julian_to_mdy();
-    return *this;
-}
-
-wxDate &wxDate::operator ++()
-{
-    julian++;
-    julian_to_mdy();
-    return *this;
-}
-
-wxDate &wxDate::operator ++(int)
-{
-    julian++;
-    julian_to_mdy();
-    return *this;
-}
-
-wxDate &wxDate::operator --()
-{
-    julian--;
-    julian_to_mdy();
-    return *this;
-}
-
-wxDate &wxDate::operator --(int)
-{
-    julian--;
-    julian_to_mdy();
-    return *this;
-}
-
-//////////////////////////////////////////////////////////////
-// Date comparison
-//////////////////////////////////////////////////////////////
-
-bool WXDLLEXPORT operator <  (const wxDate &dt1, const wxDate &dt2)
-{
-    return ( dt1.julian < dt2.julian );
-}
-
-bool WXDLLEXPORT operator <= (const wxDate &dt1, const wxDate &dt2)
-{
-    return ( (dt1.julian == dt2.julian) || (dt1.julian < dt2.julian) );
-}
-
-bool WXDLLEXPORT operator >  (const wxDate &dt1, const wxDate &dt2)
-{
-    return ( dt1.julian > dt2.julian );
-}
-
-bool WXDLLEXPORT operator >= (const wxDate &dt1, const wxDate &dt2)
-{
-    return ( (dt1.julian == dt2.julian) || (dt1.julian > dt2.julian) );
-}
-
-bool WXDLLEXPORT operator == (const wxDate &dt1, const wxDate &dt2)
-{
-    return ( dt1.julian == dt2.julian );
-}
-
-bool WXDLLEXPORT operator != (const wxDate &dt1, const wxDate &dt2)
-{
-    return ( dt1.julian != dt2.julian );
-}
-
-
-#if wxUSE_STD_IOSTREAM
-
-////////////////////////////////////////////////////////////////
-// Ostream operations
-////////////////////////////////////////////////////////////////
-
-ostream WXDLLEXPORT & operator << (ostream &os, const wxDate &dt)
-{
-    return os << dt.FormatDate().mb_str();
-}
-
-#endif
-
-//////////////////////////////////////////////////////////////
-// Conversion routines
-//////////////////////////////////////////////////////////////
-
-void wxDate::julian_to_wday (void)
-{
-    // Correction by Peter Stadel <peters@jetcity.com>
-    day_of_week = (int)((julian - 2) % 7L);
-/*
-    day_of_week = (int) ((julian + 2) % 7 + 1);
-*/
-}
-
-void wxDate::julian_to_mdy ()
-{
-    long a,b,c,d,e,z,alpha;
-    z = julian+1;
-    // dealing with Gregorian calendar reform
-    if (z < 2299161L)
-        a = z;
-    else {
-        alpha = (long) ((z-1867216.25) / 36524.25);
-        a = z + 1 + alpha - alpha/4;
-    }
-    b = ( a > 1721423 ? a + 1524 : a + 1158 );
-    c = (long) ((b - 122.1) / 365.25);
-    d = (long) (365.25 * c);
-    e = (long) ((b - d) / 30.6001);
-    day = (int)(b - d - (long)(30.6001 * e));
-    month = (int)((e < 13.5) ? e - 1 : e - 13);
-    year = (int)((month > 2.5 ) ? (c - 4716) : c - 4715);
-    julian_to_wday ();
-}
-
-void wxDate::mdy_to_julian (void)
-{
-    int a,b=0;
-    int work_month=month, work_day=day, work_year=year;
-    // correct for negative year
-    if (work_year < 0)
-        work_year++;
-    if (work_month <= 2)
-    { work_year--; work_month +=12; }
-
-    // deal with Gregorian calendar
-    if (work_year*10000. + work_month*100. + work_day >= 15821015.)
-    {
-        a = (int)(work_year/100.);
-        b = 2 - a + a/4;
-    }
-    julian = (long) (365.25*work_year) +
-        (long) (30.6001 * (work_month+1))  +  work_day + 1720994L + b;
-    julian_to_wday ();
-}
-
-////////////////////////////////////////////////////////////////
-// Format routine
-////////////////////////////////////////////////////////////////
-
-wxString wxDate::FormatDate (int type) const
-{
-    int actualType = type;
-    if (actualType == -1)
-        actualType = DisplayFormat;
-
-    wxChar buf[40];
-
-    memset( buf, '\0', sizeof(buf) );
-    switch ( actualType )
-    {
-        case wxDAY:
-            if ( (day_of_week < 1) || (day_of_week > 7) )
-                wxStrcpy(buf, _("invalid day"));
-            else
-                wxStrncpy( buf, wxGetTranslation(dayname[day_of_week-1]),
-               (DisplayOptions & wxDATE_ABBR) ? ABBR_LENGTH : 9);
-            return wxString(buf);
-
-        case wxMONTH:
-            if ( (month < 1) || (month > 12) )
-                wxStrcpy(buf, _("invalid month"));
-            else
-                wxStrncpy( buf, wxGetTranslation(mname[month-1]),
-               (DisplayOptions & wxDATE_ABBR) ? ABBR_LENGTH : 9);
-            return wxString(buf);
-
-        case wxFULL:
-            if ( (month < 1) || (month > 12) || (day_of_week < 0) ||
-                    (day_of_week > 7) )
-            {
-                wxStrcpy(buf, _("invalid date"));
-                return wxString(buf);
-            }
-            wxStrncpy( buf, wxGetTranslation(dayname[day_of_week-1]),
-               (DisplayOptions & wxDATE_ABBR) ? ABBR_LENGTH : 9);
-            wxStrcat( buf, wxT(", "));
-            wxStrncat( buf, wxGetTranslation(mname[month-1]),
-               (DisplayOptions & wxDATE_ABBR) ? ABBR_LENGTH : 9);
-            wxStrcat( buf, wxT(" "));
-            wxSprintf( buf+wxStrlen(buf), wxT("%d, %d"), day, abs(year) );
-            if (year < 0)
-                wxStrcat(buf,_(" B.C."));
-            return wxString(buf);
-
-        case wxEUROPEAN:
-            if ( (month < 1) || (month > 12) || (day_of_week < 0) ||
-                    (day_of_week > 7) )
-            {
-                wxStrcpy(buf, _("invalid date"));
-                return wxString(buf);
-            }
-            wxSprintf(buf,wxT("%d "),  day);
-            wxStrncat(buf, wxGetTranslation(mname[month-1]),
-                    (DisplayOptions & wxDATE_ABBR) ? ABBR_LENGTH : 9);
-            wxSprintf( buf+wxStrlen(buf), wxT(" %d"), abs(year) );
-            if (year < 0)
-                wxStrcat(buf, _(" B.C."));
-            return wxString(buf);
-
-        case wxMDY:
-        default:
-            if (day==0 || month==0 || year==0)
-                wxStrcpy(buf, _("invalid date"));
-            else
-                wxSprintf( buf+wxStrlen(buf), wxT("%1d/%1d/%02d"), month, day,
-               (DisplayOptions & wxNO_CENTURY) && (abs(year) > 1899)
-               ? (abs(year) - (abs(year) / 100 * 100))
-               : (abs(year))  );
-            return wxString(buf);
-    }
-}
-
-void wxDate::SetFormat( int format )
-{
-    DisplayFormat = format;
-}
-
-int wxDate::SetOption( int option, bool action )
-{
-    switch ( option )
-    {
-        case wxNO_CENTURY:
-            if ( action )
-                DisplayOptions |= wxNO_CENTURY;
-            else
-            {
-                DisplayOptions &= (~wxNO_CENTURY);
-            }
-            return 1;
-        case wxDATE_ABBR:
-            if ( action )
-                DisplayOptions |= wxDATE_ABBR;
-            else
-            {
-                DisplayOptions &= (~wxDATE_ABBR);
-            }
-            return 1;
-        default:
-            return 0;
-    }
-}
-
-///////////////////////////////////////////////////////////////
-//  Miscellaneous Routines
-///////////////////////////////////////////////////////////////
-
-long wxDate::GetJulianDate( void ) const
-{
-    return julian;
-}
-
-int wxDate::GetDayOfYear( void ) const
-{
-    wxDate temp( 1, 1, year );
-
-    return (int) (julian - temp.julian + 1);
-}
-
-
-bool wxDate::IsLeapYear( void ) const
-{
-    return  ( (year >= 1582) ?
-            (year % 4 == 0  &&  year % 100 != 0  ||  year % 400 == 0 ):
-            (year % 4 == 0) );
-}
-
-// Version 4.0 Extension to Public Interface - CDP
-
-wxDate& wxDate::Set()
-{
-    //#ifdef __WXMSW__
-#if 0
-    struct _dosdate_t sDate;
-    _dos_getdate(&sDate);
-
-    month = sDate.month;
-    day   = sDate.day;
-    year  = sDate.year;
-
-    mdy_to_julian();
-#else
-    time_t now = time((time_t *) NULL);
-    struct tm *localTime = localtime(&now);
-
-    month = localTime->tm_mon + 1;
-    day = localTime->tm_mday;
-    year = localTime->tm_year + 1900;
-
-    mdy_to_julian ();
-#endif
-    return *this;
-}
-
-wxDate& wxDate::Set(
-        int  nMonth,
-        int  nDay,
-        int  nYear)
-{
-    month = nMonth;
-    year  = nYear < 0 ? 9999 : nYear;
-    year  = nYear > 9999 ? 0 : nYear;
-    day   = nDay < GetDaysInMonth() ? nDay : GetDaysInMonth();
-
-    mdy_to_julian();
-    return *this;
-}
-
-wxDate &
-wxDate::Set(long j)
-{
-    julian = j;
-
-    julian_to_mdy();
-    return *this;
-}
-
-
-int wxDate::GetDaysInMonth()
-{
-    return GauDays[month-1] + (month==2 && IsLeapYear());
-}
-
-int wxDate::GetFirstDayOfMonth() const
-{
-    return wxDate(month, 1, year).GetDayOfWeek();
-}
-
-int wxDate::GetDay() const
-{
-    return day;
-}
-
-int wxDate::GetDayOfWeek() const
-{
-    return day_of_week;
-}
-
-int wxDate::GetYear() const
-{
-    return year;
-}
-
-int wxDate::GetMonth() const
-{
-    return month;
-}
-
-wxDate& wxDate::AddWeeks(int nCount)
-{
-    Set(julian + (long)nCount*7);
-    return *this;
-}
-
-wxDate& wxDate::AddMonths(int nCount)
-{
-    month += nCount;
-
-    if (month < 1) {
-        month = 12;
-        year--;
-    }
-
-    if (month > 12) {
-        month = 1;
-        year++;
-    }
-    mdy_to_julian();
-    return *this;
-}
-
-wxDate& wxDate::AddYears(int nCount)
-{
-    year += nCount;
-    mdy_to_julian();
-    return *this;
-}
-
-int wxDate::GetWeekOfMonth()
-{
-    // Abs day includes the days from previous month that fills up
-    // the begin. of the week.
-    int nAbsDay = day + GetFirstDayOfMonth()-1;
-    return (nAbsDay-GetDayOfWeek())/7 + 1;
-}
-
-int wxDate::GetWeekOfYear()
-{
-    wxDate   doTemp(1, 1, year);
-    return (int)(((julian - doTemp.julian+1)/7) + 1);
-}
-
-wxDate wxDate::GetMonthStart()
-{
-    return(wxDate(month, 1, year));
-}
-
-wxDate wxDate::GetMonthEnd()
-{
-    return(wxDate(month+1, 1, year)-1);
-}
-
-wxDate wxDate::GetYearStart()
-{
-    return(wxDate(1, 1, year));
-}
-
-wxDate wxDate::GetYearEnd()
-{
-    return(wxDate(1, 1, year+1)-1);
-}
-
-wxString wxDate::GetMonthName()
-{
-    return(FormatDate(wxMONTH));
-}
-
-wxString wxDate::GetDayOfWeekName()
-{
-    return(FormatDate(wxDAY));
-}
-
-bool wxDate::IsBetween(const wxDate& first, const wxDate& second) const
-{
-    return (julian >= first.julian && julian <= second.julian);
-}
-
-// This function is from NIHCL
-wxDate wxDate::Previous(int dayOfWeek) const
-{
-    int this_day_Of_Week, desired_day_Of_Week;
-    long j;
-
-    //      Set the desired and current day of week to start at 0 (Monday)
-    //      and end at 6 (Sunday).
-
-    desired_day_Of_Week = dayOfWeek - 1; // These functions return a value
-    this_day_Of_Week    = GetDayOfWeek() - 1;            // from 1-7.  Subtract 1 for 0-6.
-    j = julian;
-
-    //      Have to determine how many days difference from current day back to
-    //      desired, if any.  Special calculation under the 'if' statement to
-    //      effect the wraparound counting from Monday (0) back to Sunday (6).
-
-    if (desired_day_Of_Week > this_day_Of_Week)
-        this_day_Of_Week += 7 - desired_day_Of_Week;
-    else
-        this_day_Of_Week -= desired_day_Of_Week;
-    j -= this_day_Of_Week; // Adjust j to set it at the desired day of week.
-    return wxDate(j);
-}
-
-#endif
--- a/src/common/time.cpp
+++ b/src/common/time.cpp
@@ -1,447 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        time.cpp
-// Purpose:     wxTime class, from NIHCL
-// Author:      Julian Smart, after K. E. Gorlen
-// Modified by:
-// Created:     04/01/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:     wxWindows license
-/////////////////////////////////////////////////////////////////////////////
-
-#ifdef __GNUG__
-#pragma implementation "time.h"
-#endif
-
-/*
-Provides an object that represents a Time, stored as the number of
-seconds since January 1, 1901, GMT.
-*/
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#include "wx/setup.h"
-
-#if wxUSE_TIMEDATE
-
-#include "wx/time.h"
-#include "wx/date.h"
-#include "wx/utils.h"
-#include "wx/intl.h"
-
-#if wxUSE_STD_IOSTREAM
-    #include "wx/ioswrap.h"
-    #if wxUSE_IOSTREAMH
-        #include <iomanip.h>
-    #else
-        #include <iomanip>
-    #endif
-#endif
-
-#include <string.h>
-#include <time.h>
-
-IMPLEMENT_DYNAMIC_CLASS(wxTime, wxObject)
-
-
-#ifndef WX_TIMEZONE
-    #define WX_TIMEZONE _timezone
-#endif
-
-extern long wxGetUTCTime(void);
-bool wxGetTZandDST(long *timeZone, int *dstObserved)
-{
-  time_t now;
-  struct tm *tm;
-
-  now = time((time_t *) NULL);
-
-  if (now != (time_t)-1)
-  {
-    tm = localtime(&now);
-
-    if ((tm) && (tm->tm_isdst > 0))
-      *dstObserved = 1;
-  }
-  *timeZone = WX_TIMEZONE;
-
-  return TRUE;
-}
-
-
-static long TIME_ZONE;          /* seconds west of GMT */
-static int DST_OBSERVED;        /* flags U.S. daylight saving time observed */
-
-static bool wxTimeInitialized = FALSE;
-
-wxTime::tFormat    wxTime::Format    = wxTime::wx12h;
-wxTime::tPrecision wxTime::Precision  = wxTime::wxStdMinSec;
-
-static const unsigned long seconds_in_day = 24*60*60L;
-static const wxDate refDate(1,1,1901);
-// static const wxDate maxDate(49709L);      /* ((2**32)-1)/seconds_in_day -1 */
-
-wxTime wxTime::GetLocalTime(const wxDate& date, hourTy h, minuteTy m, secondTy s)
-/*
-      Return a local wxTime for the specified Standard Time date, hour, minute,
-      and second.
-*/
-{
-  if (!wxTimeInitialized)
-  {
-   wxGetTZandDST(&TIME_ZONE, &DST_OBSERVED);
-   wxTimeInitialized = TRUE;
-  }
-/*
-      if (!date.IsBetween(refDate,maxDate))
-           setError(NIHCL_DATERANGE,DEFAULT,
-                date.dayOfMonth(),date.nameOfMonth(),date.year());
-*/
-  // The following line causes an error in GCC 2.1
-//   long daysBetween = date-refDate;
-  // ... but this seems to get round it.
-  wxDate tmp1(date);
-  wxDate tmp2(refDate);
-  long daysBetween = tmp1 - tmp2;
-
-  return wxTime(seconds_in_day*daysBetween + 60*60L*h + 60*m + s);
-}
-
-wxTime::wxTime()
-/*
-      Construct a wxTime for this instant.
-*/
-{
-  if (!wxTimeInitialized)
-  {
-   wxGetTZandDST(&TIME_ZONE, &DST_OBSERVED);
-   wxTimeInitialized = TRUE;
-  }
-  sec = wxGetUTCTime();
-#ifdef __SALFORDC__
-  sec += (unsigned long) 2177452800;     /* seconds from 1/1/01 to 1/1/70 */
-#else
-  sec += 2177452800UL;     /* seconds from 1/1/01 to 1/1/70 */
-#endif
-}
-
-wxTime::wxTime(hourTy h, minuteTy m, secondTy s, bool dst)
-/*
-      Construct a wxTime for today at the specified (local) hour, minute, and
-      second.
-*/
-{
-  if (!wxTimeInitialized)
-  {
-   wxGetTZandDST(&TIME_ZONE, &DST_OBSERVED);
-   wxTimeInitialized = TRUE;
-  }
-
-  sec = wxTime(wxDate(),h,m,s,dst).sec;
-}
-
-
-wxTime::wxTime(const wxDate& date, hourTy h, minuteTy m, secondTy s, bool dst)
-/*
-        Construct a wxTime for the specified (local) Date, hour, minute, and
-        second.
-*/
-{
-  if (!wxTimeInitialized)
-  {
-    wxGetTZandDST(&TIME_ZONE, &DST_OBSERVED);
-   wxTimeInitialized = TRUE;
-  }
-  sec = GetLocalTime(date,h,m,s).sec-3600;
-  if (IsDST())
-  {
-    sec += 3600;
-    if (IsDST() || dst) sec -= 3600;
-  }
-  else
-  {
-    sec += 3600;
-/*
-                if (IsDST()) setError(NIHCL_BADTIME,DEFAULT,
-                date.dayOfMonth(),date.nameOfMonth(),date.year(),
-                h,m,s,(dst?_("DST"):""));
-*/
-  }
-  sec += TIME_ZONE;                               // adjust to GMT
-}
-
-#ifndef __SALFORDC__
-wxTime::operator wxDate() const
-/*
-      Convert a wxTime to a local wxDate
-*/
-{
-//      return wxDate((int)(GetLocalTime().sec/seconds_in_day));     4.2 cc bug
-      long daycount = (long)(GetLocalTime().sec/seconds_in_day);
-
-        wxDate date(1,1,1901);
-        date += daycount;
-        return date;
-}
-#endif
-
-bool wxTime::IsBetween(const wxTime& a, const wxTime& b) const
-{
-        return *this >= a && *this <= b;
-}
-
-hourTy wxTime::GetHour() const
-/*
-      Return the hour of this wxTime in local time; i.e., adjust for
-        time zone and Daylight Savings Time.
-*/
-{
-      return GetLocalTime().GetHourGMT();
-}
-
-hourTy wxTime::GetHourGMT() const
-/*
-        Return the hour of this Time in GMT.
-*/
-{
-      return (hourTy)((sec % 86400) / 3600);
-}
-
-wxTime wxTime::GetBeginDST(unsigned year)
-/*
-      Return the local Standard Time at which Daylight Savings Time
-        begins in the specified year.
-*/
-{
-        // Previous Sunday
-        wxTime DSTtime(GetLocalTime(wxDate(3,31,year).Previous(1)+7,2));
-        if (year<=1986) {
-                // Previous Sunday
-           DSTtime = GetLocalTime(wxDate(4,30,year).Previous(1),2);
-           if (year==1974) DSTtime = GetLocalTime(wxDate(1,6,1974),2);
-                if (year==1975) DSTtime = GetLocalTime(wxDate(2,23,1975),2);
-        }
-        return DSTtime;
-}
-
-wxTime wxTime::GetEndDST(unsigned year)
-/*
-        Return the local Standard Time at which Daylight Savings Time
-        ends in the specified year.
-*/
-{
-      wxTime STDtime(GetLocalTime(wxDate(10,31,year).Previous(1),2-1));
-      return STDtime;
-}
-
-bool wxTime::IsDST() const
-/*
-        Return TRUE if this local Standard Time should be adjusted
-        for Daylight Savings Time.
-*/
-{
-        long daycount = (long)(sec/seconds_in_day);
-
-        // At this point, daycount is the number of days from 1/1/1901.
-      // Need to convert to julian date (which starts at 1/1/4713 B.C.)
-      wxDate date(1,1,1901);
-        date += daycount;
-
-        unsigned year = date.GetYear();
-      if (DST_OBSERVED)
-        {
-                if (*this >= GetBeginDST(year))
-                        if (*this < GetEndDST(year)) return TRUE;
-        }
-        return FALSE;
-}
-
-wxTime wxTime::GetLocalTime() const
-/*
-        Adjusts this GM Time for local time zone and Daylight Savings Time.
-*/
-{
-      wxTime local_time(sec-TIME_ZONE);
-        if (local_time.IsDST()) local_time.sec += 3600;
-        return local_time;
-}
-
-minuteTy wxTime::GetMinute() const
-/*
-        Return the minute of this wxTime in local time; i.e., adjust
-      for time zone and Daylight Savings Time.
-*/
-{
-        return GetLocalTime().GetMinuteGMT();
-}
-
-minuteTy wxTime::GetMinuteGMT() const
-/*
-        Return the minute of this wxTime in GMT.
-*/
-{
-      return (minuteTy)(((sec % 86400) % 3600) / 60);
-}
-
-secondTy wxTime::GetSecond() const
-/*
-        Return the second of this wxTime.
-*/
-{
-      return (secondTy)(((sec % 86400) % 3600) % 60);
-}
-
-secondTy wxTime::GetSecondGMT() const
-/*
-        Return the minute of this wxTime in GMT.
-*/
-{
-        return (secondTy)(((sec % 86400) % 3600) % 60);
-}
-
-int wxTime::GetDay() const
-{
-    wxDate da((wxDate) *this);
-    return da.GetDay();
-}
-
-int wxTime::GetDayOfWeek() const
-{
-    wxDate da((wxDate) *this);
-    return da.GetDayOfWeek();
-}
-
-int wxTime::GetMonth() const
-{
-    wxDate da((wxDate) *this);
-    return da.GetMonth();
-}
-
-int wxTime::GetYear() const
-{
-    wxDate da((wxDate) *this);
-    return da.GetYear();
-}
-
-wxTime wxTime::Max(const wxTime& t) const
-{
-        if (t < *this) return *this;
-        return t;
-}
-
-wxTime wxTime::Min(const wxTime& t) const
-{
-        if (t > *this) return *this;
-      return t;
-}
-
-#ifndef __SALFORDC__
-wxTime::operator wxChar *(void)
-{
-  return FormatTime();
-}
-#endif
-
-void wxTime::SetFormat(const wxTime::tFormat lFormat,
-                const wxTime::tPrecision lPrecision) {
-
-  wxTime::Format    = lFormat;
-  wxTime::Precision  = lPrecision;
-}
-
-wxChar *wxTime::FormatTime() const {
-  static wxChar  timeBuf[30];
-  unsigned    hh(GetHour());
-
-  switch (Format) {
-  case wx12h:
-    hh  -= 12;
-    break;
-  case wx24h:
-    break;
-  }
-
-  switch (Precision) {
-  case wxStdMinSec:
-    wxSprintf(timeBuf,wxT("%2d:%02d:%02d"),hh,GetMinute(),GetSecond());
-    break;
-  case wxStdMin:
-    wxSprintf(timeBuf,wxT("%2d:%02d"),hh,GetMinute());
-    break;
-  }
-
-  if (Format == wx12h)
-    if (GetHour() <= 12)
-      wxStrcat(timeBuf,_("am"));
-    else
-      wxStrcat(timeBuf,_("pm"));
-
-  return timeBuf;
-}
-
-/*
-int wxTime::compare(const Object& ob) const
-{
-      assertArgSpecies(ob,classDesc,"compare");
-        register clockTy t = castdown(ob).sec;
-        if (sec < t) return -1;
-        if (sec > t) return 1;
-        return 0;
-}
-
-void wxTime::deepenShallowCopy()  {}
-
-unsigned wxTime::hash() const     { return sec; }
-
-bool wxTime::isEqual(const Object& ob) const
-{
-        return ob.isSpecies(classDesc) && *this==castdown(ob);
-}
-
-const Class* wxTime::species() const { return &classDesc; }
-
-void wxTime::printOn(ostream& strm) const
-{
-        register unsigned hh = GetHour();
-        wxDate(*this).printOn(strm);
-        strm << ' ' << ((hh <= 12) ? hh : hh-12) << ':'
-             << setfill('0') << setw(2) << GetMinute() << ':'
-         << setfill('0') << setw(2) << GetSecond() << ' ';
-        if (hh < 12) strm << _("am");
-        else strm << _("pm");
-}
-
-wxTime::wxTime(OIOin& strm)
-      : BASE(strm)
-{
-      unsigned long usec;
-      strm >> sec >> usec;
-}
-
-void wxTime::storer(OIOout& strm) const
-{
-        BASE::storer(strm);
-        strm << sec << 0l;
-}
-
-
-wxTime::wxTime(OIOifd& fd)
-      : BASE(fd)
-{
-      unsigned long usec;
-      fd >> sec >> usec;
-}
-
-void wxTime::storer(OIOofd& fd) const
-{
-      BASE::storer(fd);
-      fd << sec << 0l;
-}
-*/
-
-#endif
--- a/user/wxLayout/.cvsignore
+++ b/user/wxLayout/.cvsignore
@@ -0,0 +1,2 @@
+Linux
+linux-gnu
--- a/user/wxLayout/Makefile
+++ b/user/wxLayout/Makefile
@@ -0,0 +1 @@
+include ../../setup/general/makeapp
--- a/user/wxLayout/Makefile.in
+++ b/user/wxLayout/Makefile.in
@@ -0,0 +1,26 @@
+# WXXT base directory
+WXBASEDIR=@WXBASEDIR@
+
+# set the OS type for compilation
+OS=@OS@
+# compile a library only
+RULE=bin
+
+# define library name
+BIN_TARGET=wxLayout
+# define library sources
+BIN_SRC=\
+wxLayout.cpp kbList.cpp wxlist.cpp wxlwindow.cpp wxlparser.cpp
+
+#define library objects
+BIN_OBJ=\
+wxLayout.o kbList.o wxllist.o wxlwindow.o wxlparser.o
+
+# additional things needed to link
+BIN_LINK=
+
+# additional things needed to compile
+ADD_COMPILE=
+
+# include the definitions now
+include ../../../template.mak
--- a/user/wxLayout/Micon.xpm
+++ b/user/wxLayout/Micon.xpm
@@ -0,0 +1,309 @@
+/* XPM */
+static char *Micon_xpm[] = {
+/* width height num_colors chars_per_pixel */
+"    64    48      254            2",
+/* colors */
+".. c #040207",
+".# c #6482b4",
+".a c #2a4471",
+".b c #9cc2d4",
+".c c #4c627f",
+".d c #94918e",
+".e c #0c243e",
+".f c #4c4a4a",
+".g c #3c63a8",
+".h c #7ca2ac",
+".i c #24447e",
+".j c #2c2c2c",
+".k c #5482cc",
+".l c #d4d0d0",
+".m c #99aab7",
+".n c #5c74b1",
+".o c #2c5287",
+".p c #1a2a4d",
+".q c #acdefc",
+".r c #646362",
+".s c #7491d0",
+".t c #bcc4bf",
+".u c #5273aa",
+".v c #b4b1aa",
+".w c #3d5583",
+".x c #828482",
+".y c #8c9490",
+".z c #6f7369",
+".A c #1c365c",
+".B c #041220",
+".C c #2c325c",
+".D c #94b6e4",
+".E c #3e4242",
+".F c #648edc",
+".G c #d4f2fc",
+".H c #cbd3d1",
+".I c #3c54a1",
+".J c #243244",
+".K c #4c69aa",
+".L c #7c8ba2",
+".M c #4c5d84",
+".N c #34497f",
+".O c #1c2228",
+".P c #6484c5",
+".Q c #6a7788",
+".R c #9ba09b",
+".S c #2c3634",
+".T c #acb6b4",
+".U c #141517",
+".V c #a0c4e8",
+".W c #515753",
+".X c #5c76cc",
+".Y c #1b2f51",
+".Z c #4472c4",
+".0 c #7c8a88",
+".1 c #5a6262",
+".2 c #a4aba6",
+".3 c #bcc8d5",
+".4 c #7494df",
+".5 c #84b2d4",
+".6 c #6784d9",
+".7 c #acd3e4",
+".8 c #304b72",
+".9 c #2c4c81",
+"#. c #3c5b93",
+"## c #5468bc",
+"#a c #b5bbb0",
+"#b c #1c3765",
+"#c c #444e44",
+"#d c #ecece8",
+"#e c #7ca3dc",
+"#f c #d4deda",
+"#g c #345495",
+"#h c #1c2641",
+"#i c #94a6cc",
+"#j c #243252",
+"#k c #a7acb5",
+"#l c #5c7ab3",
+"#m c #0a152d",
+"#n c #c4def0",
+"#o c #686e84",
+"#p c #a4a19e",
+"#q c #3e3c3a",
+"#r c #84aaee",
+"#s c #040a09",
+"#t c #3c6294",
+"#u c #7c929c",
+"#v c #3c5c9d",
+"#w c #4e6ead",
+"#x c #344458",
+"#y c #446bae",
+"#z c #696b6a",
+"#A c #547cbc",
+"#B c #789ae3",
+"#C c #112a44",
+"#D c #4f504b",
+"#E c #2c3140",
+"#F c #8c8688",
+"#G c #5e5c5c",
+"#H c #8c8c80",
+"#I c #cccccc",
+"#J c #4c6398",
+"#K c #c7cbc4",
+"#L c #5174b8",
+"#M c #3d558e",
+"#N c #2c3c5f",
+"#O c #acbad4",
+"#P c #3f495a",
+"#Q c #354e82",
+"#R c #6a8ac7",
+"#S c #767c84",
+"#T c #30374b",
+"#U c #b1c9e7",
+"#V c #1b315d",
+"#W c #537bcb",
+"#X c #c4bec0",
+"#Y c #243e6a",
+"#Z c #969892",
+"#0 c #7e858e",
+"#1 c #94b3f1",
+"#2 c #c2d4e8",
+"#3 c #141e35",
+"#4 c #acb2ac",
+"#5 c #c4ced0",
+"#6 c #2b4d8e",
+"#7 c #445ca2",
+"#8 c #2c3e6f",
+"#9 c #14243e",
+"a. c #f1fdfa",
+"a# c #8c9abc",
+"aa c #d7f9f9",
+"ab c #5a697e",
+"ac c #c7ebf7",
+"ad c #bceefc",
+"ae c #b4c2b4",
+"af c #889cf0",
+"ag c #d8d6c8",
+"ah c #748598",
+"ai c #b4d2fc",
+"aj c #4c5eb0",
+"ak c #3f4f64",
+"al c #8492bc",
+"am c #161d1e",
+"an c #5d7dcf",
+"ao c #5c86d6",
+"ap c #9cacc8",
+"aq c #6c92e6",
+"ar c #e4ecec",
+"as c #89b7ef",
+"at c #a6d0f8",
+"au c #e4e2e0",
+"av c #8c98a4",
+"aw c #ccdaec",
+"ax c #94bee4",
+"ay c #232b2b",
+"az c #1c2b43",
+"aA c #0c1c33",
+"aB c #99bcf7",
+"aC c #6c72bc",
+"aD c #7c766c",
+"aE c #a4a2b4",
+"aF c #6c7eac",
+"aG c #e4d6dc",
+"aH c #e4fefc",
+"aI c #84aeb4",
+"aJ c #b4b6bf",
+"aK c #345b9b",
+"aL c #bce2ef",
+"aM c #ccc6bc",
+"aN c #82a3ef",
+"aO c #7c7b77",
+"aP c #040c1e",
+"aQ c #6c7e94",
+"aR c #9ca69c",
+"aS c #acbebc",
+"aT c #a2cafa",
+"aU c #545e5f",
+"aV c #5c6a74",
+"aW c #cae6ee",
+"aX c #5c6e7c",
+"aY c #5474c6",
+"aZ c #fcfaf4",
+"a0 c #344672",
+"a1 c #446ec4",
+"a2 c #b4c4d4",
+"a3 c #313231",
+"a4 c #9cb2b4",
+"a5 c #345a8c",
+"a6 c #7496d4",
+"a7 c #0c1a24",
+"a8 c #444a47",
+"a9 c #343e3c",
+"b. c #dce6e4",
+"b# c #a9b2bc",
+"ba c #a6a6a3",
+"bb c #446a9c",
+"bc c #c4f2f8",
+"bd c #445667",
+"be c #727475",
+"bf c #6a7896",
+"bg c #9aa0a7",
+"bh c #9ec4fa",
+"bi c #545a61",
+"bj c #6474e0",
+"bk c #546674",
+"bl c #b8bcbd",
+"bm c #5d7cbf",
+"bn c #515255",
+"bo c #979a9f",
+"bp c #849cd0",
+"bq c #546a8f",
+"br c #d7d8d5",
+"bs c #688ada",
+"bt c #4f6ebe",
+"bu c #343e4c",
+"bv c #dafefc",
+"bw c #acd6fc",
+"bx c #b4b6b0",
+"by c #8c9a94",
+"bz c #203a44",
+"bA c #a4b6c8",
+"bB c #4c6a98",
+"bC c #040214",
+"bD c #5c74be",
+"bE c #4c5c98",
+"bF c #24325c",
+"bG c #8c8c8f",
+"bH c #4464a7",
+"bI c #2c457e",
+"bJ c #5c83c7",
+"bK c #34538a",
+"bL c #b4dff1",
+"bM c #7c92d4",
+"bN c #c4c4c0",
+"bO c #243759",
+"bP c #0c151e",
+"bQ c #9cb2d4",
+"bR c #6c8fd3",
+"bS c #546aab",
+"bT c #848c9f",
+"bU c #242420",
+"bV c #6c83c0",
+"bW c #343935",
+"bX c #848b89",
+"bY c #acaca6",
+"bZ c #c4cad0",
+"b0 c #445c90",
+"b1 c #243865",
+"b2 c #dce0dc",
+"b3 c #747b76",
+"b4 c #8cacee",
+"b5 c #0c0c08",
+"b6 c #446299",
+"b7 c #8493a4",
+/* pixels */
+"................................................................................................................................",
+"..................................bC....bC....bC..bC....bC..bCbCbCbC..bCbC..bC..bC..bC..bCbC..bC..bC....bC....bC................",
+"..#9#C#h#C.p.Y.Y.Y#j.Y.Y.Y#V#V#Vb1bFb1b1#8#Y.a.a#Q#Q.a.N#Q.abI.i.9bI#Q#MbK#M.wb0#M.9.N.N.N.9.abI.a#Y#Yb1b1#b#bb1b1b1#V#V#V#Vaz..",
+"..#h#C.p.p#9.Y.Y#j.AbObO.A.AbO.Ab1#Y#Y#8.a.aa0.N.8.w.w#QbK.w.ibI.9#6#Q#.#Mb0b0#J#MbK#M.NbK.N.9.NbI.N#YbIb1#Y#8#8bOb1bO#j#V#Caz..",
+"..#9.e#h#C.p.p.Y.YbO.A#b#N.a#8#Y#bb1#8#Y.Na0.9.8#Q.w.Mb0#Q#MbK.9bK#g#6.Kb6#J#J#wb0#M#MbKbK#Q#M.9bI.N.N.a.N.a.a.ab1b1#V.Y#V.Y.Y..",
+"..#9#C.p#h.p.p.p.Y#VbO#b.a.ia0.9#Q.N#YbI.a.N.N.N.w#Q.wb6b6b0b6#.#g#v#M.K#w#L.n.n#vbH#.bH.Ib6aK#MbK.9#Q#Q#Q#Q.a#Yb1.AbF#VbO.Y#j..",
+"..#h#h.p.p.p.Y.p#bbF#bb1#Y.a.8.N#Q#M#M#Q.N.9#QbK#M#Mb0b0.ubB.K.K#..K#v#w.nbmbV.nbHbS#w#7#w#vb0#.#M#Mb0#M#Q.9#Y#Yb1#Yb1b1.Y.Y.Y..",
+"..#h#9.p.p.p#V#V#b#b#Y#Y.a.ibI.N.w#Mb0b6#7#M#Q#QbK#.b6b6bq#l.n#LbHbH#y#L#R.s.4#AaY#w#w#L.K.KbH.g.KbH#v#M.9bI.i.8.a#Yb1.A.A.A#j..",
+"..#h#C.p.p.Y#V#V#bb1.abIbI#6.o.o#g.oaK#tbH.K.KbH#M.Iaj.K#w.n#R.P#Rbt#W#W.4bpb4aoanbsaobm#La1#L#A#L.ga5bK#g#g#Q.8#Y#bb1b1bOb1bO..",
+"...p.p.Y#V.Y#V.Ab1#YbI.9#Q#Q#M#M#7#7#M#v.M#J.K.K.nbS#MbH.nbm.#b4.s#Baq#Wb4aB#1aqaq#R.P.##l#RbmbD.K#7#J#J#.#Q.9.i.N.a#Y#Yb1.Aaz..",
+"..az#C#V#j#V.A#N#8.N.N.ibObz#T.J#E.J#T#Tbu.Y.8#..K.nbVbD#wbm.4a6aTb4aoaNaTaiasaNa6.n.m.3bZ#2bN.3aR#2#2.3#J#Q#MbK.8.a#8#b.AbO#j..",
+"..#h.p.p.Y.Yb1bO.ibI#g#Mbd#hambU.jbW.Sa3aybP.Y.9bHbH.ubm#BbM.P#rbhbc.qasbL.G.VbhaBbpbZaJbobxbl#I#a#abXbP#V.9#6.NbI#8#8#bbF#V#j..",
+"..az#C.Y.Y.Y#bb1.abI#Q.oaj#Pa3a3aya3a3bW.Eayb0.K.g#y.K#LanbRbhaTaxbLbvbLbvbvaLadaTai.mbobYba#Xbl.H#I#P#m#.#M#QbIbI#Y#Yb1#b#V#j..",
+"..az.p.p#VbObO#Y.a.N#g#g.I#xbW.j.ja3.E.Ebnbib0bmananbm#wanbs.4asacbLbvaHa.aHbvbc.7aIbY#p#pblbl#Kbe#F#k#9#..I#g#6.i#8#8b1b1.A#j..",
+"..#h#C.p.YbO#bb1a0bIbKbK#7#xaya3.jaya3#q.Wbn.J.wbD#Lbm.X#Bb4bhat.b#na.a.a.aZaHaHaW#k#a.vagbNaObl#I.vb3#3#w.K#7#v#M#QbIa0#Y#N#N..",
+"..#haz.p#V.YbO#Y#Y.N.9#g#7#P.EbUa8#q#D.f.f.fbi#hbB#LaY.n.P#R#e.5.7aLa.a.aZaZa.a.aS#5#p.d#p.t.l.HbYaObo.Y#w.Kb6#.#M.Na0.a#8#NbO..",
+"..#h#C.YbO#V#N#Y.8#Q#g#t##ak.j.W.f.Wbn#Gbe#zbnaU.M#Ra6#eaNb4bh.7bLaWa.aZaZaZa.br.H.2ba.H.T#fau.H.H#p.x#3#w.K#tb0#Q#Q.a#8#Nb1bO..",
+"..az#j#j.Ab1#N.a.8#Q#.bb##ak.Ebnbn.1.Ua8.zaO#z.xbubqbsbR.saqaN#1bw.7aaaHa.b.a.a4bZ#k#dbgbP.H#IbG#4bY#o#9#w.K#7b0#Q.8.a#8#NbObO..",
+"..az#j.Y.YbO#8.a.8#Q#7#t##bd.r#D#D.rbPaV#G#z.x.y#z.p.u#W.6#B#r#eaTaTaLaWaaaI#5#aau#XbraU#8.HbN.T.RbY#0#9#w.Kb6#M#Q#Qa0#Y#Y#N#N..",
+"..#h#j.YbOb1bO#Ya0.NbKa5aj.c.f#G#z.1#3.Mbe#zaO.x#pbT#.bmbsbs.F#1#easat.Gbc.hb.b2aragbgbPaC.3#k.v#4babe#9.KbH#7b0#Qak.a.i#N#Y#T..",
+"..az.Y#j.Y.Ab1#Y.8.N#gbK.IaX.r.raDaV.Bb0bfbeb3bab3#HazbBaYbsaqbRaf#1.DaB#na2#K#4b3.ybC.Yaf#k#Z.y.d#p#S#3#v#7#M#g.N.N.a#N#Y#NbO..",
+"..#h.p#C#jbFbO#8.a.NbK#.#7bk.z.zb3#H#9aKbm#J.y#Hbablb#.e.PaqbmbsaNaN#1aB#2bZ.x.2aub3.AbSbjapbobobo.rbn#9#v#gbK.9bI.a.a#Yb1bObO..",
+"..#haz.YbF#VbO#Y.abI#QaK.I.Q.z.WaO#za7b0an.ub#.R.y.R#XbXbEbtbJbR#Bbsb4.D.3.v#p#za3#s.ubJbj#u.WbWb3.Rbe#9#v#v#g.9bI#Yb1b1#b.A#j..",
+"..#h#C.p#C.Y#bbO#YbI.9.o.Iab#Zb3.x.da7bK#WbmalbTae.t#F#Gaz.nbsaqbJ.6#R#U#aaMbx#KbPbz#laoanb#ba.2.RbG#G#9#v#v#g.9bI.ab1#bbF#Vaz..",
+"..#haz.p.p#V#Vb1#Y.a#6bK#7bk.1#z#Z.y#m#.a1a1bq.LbX#HblbN.3#N.PaobJafbQ.3.tblbx.TazbB.X.kaYb7bG.d.x#ZaV#3bH#v#Q.NbI#8b1b1.A.Y.Y..",
+"..az#h#C.p#VbO#b#YbIbK#g#7aQ.d.y.RbX#mbK#y#ybt.#bZ#IaM.l.2bdbmanaobMap.t.2bY.2.ObO.s.X#W.6bX#F.yaOaD#G#9b6#7.I#Q.a.ab1#bbF.Y.Y..",
+"..#9#h.p.p#V#Vb1.a.NbK#..IaQ.xbob3aO#m.9#L.ZaY#w#iaJagaGbr#5.8aF.4a#blbN#Z#Z.WaP#l#l.6#WaY#0aO.y.xb3#PaA#7b6bK#QbI#8b1bO.A#V.Y..",
+"..#h.p#C#V.YbO#Y.abI.9aK.Ibf#D.1bYbY#mbK#ybt#ybHbSbT#aba.tbx#S.M#B.y#kbxbYbYaP.YbR#A.6bmbt.Lb3#z.W#Dbn#3bK#.#M#Q.N#Yb1b1#V.Yaz..",
+"..#h#C.p#V.p#b.A.a#Y#Q#..Ib7#kbe#4#pa7bK#ybH.g.gbHbfbZbN#4bNbgakah#Zbg#F.x.1#9bK.P#A.X.#btbTaO.W.r.ra8.e#Q.o#Q#Q.a.ab1bO.A.Yaz..",
+"..#h.p#h#C#VbOb1#YbI.9.o.I.L#H#Z.2.vaA#QbHaK.g.g#y#7#nbr#a.H.vaE.zaU#4blbebCbIaK#Lbm#LbJbtaXaO.z#z#G.EaA#g#Q.9bI.a.a#Nb1#jbO.Y..",
+"..#h#C#h#V.p#V.A.a#8.9.9.Iah#4bY#4bGbP#QaKaKaKaK#7#wbEbg.z.zay.E#a#K.2#ZbCbO#v#gbH.Xbb.ubDbk#z.r#c.f.E#9#Q#6bI.i#8b1#YbO.AbO.J..",
+"..#h.p#9.p.p#b.A#8#Y.9.9.I.0.R.2bN#XbP.NaK.IaK#v.IbS.KaQaR.Wbl#K.RbY.R.y#9#M#gaKbH.Kbb#yaCbk.r#Ga8#D#TaAbK#6.i.a#Y#bbObO.Y#jaz..",
+"..#9#9.p.p.Y#V.Ab1#YbI.9#7a#bn.Hb2#FaP.a.I#g#g#g#v#7bHb0.L.HbY.y.0#ZaObC.8b0#g#6aKbH#wbb#LaX#D#q.Ea3.UaAbK#QbI#Y#Y#bbO.AbO.Y.Y..",
+"..#9#h#h#C.p.Y#V#Y#Y#6.obEbk.H.2bUbe#m.a#g#g#Q#M#M#vaK#6bq#k.d.x.y#Z..az#M#v.o#6.o#v#L#tbSbda8bU.Ub5.O#3#6#6bI.ib1#bbF.Y#C.Yaz..",
+"..#9#9.p.p.p#Vb1#Y.N#6.o#Q#O.R.xaM.HaPa0bK#Q#Q#M#M#MbK#gb0akb3aO.xbX#9#x#v#g.N#6.9.wbH#yb0bn#D.f#q.j.U#3.N#6#8.i#b#b.Y.p.Y.paz..",
+"..#9#h#9.p.p#V#bb1#8bI#g.NbAb.br.t#H#m#Y#Q#g#Q.9.9.N#6.o#gb0avbG#Z...Y.w#g#6bIbIbIbK#v.K#Ma7#s#s....#haA#Q.NbI#Yb1#V#V#V.p.paz..",
+"..#9#9#9.p.p#VbO#Y#8#6.i#M.Q#z.H#f#K.B#Y#6.9.N.9bIbI.9.9#M#M#JbybP.B.Nb0.NbIbI#Y.ibI#vbH.wbubW.E.Sa3a7#m.o#Q#Y#Yb1#V#V#C.p.p.e..",
+"..#3#9#9#9.Y#V#VbF#Y#8#6ak#O#db2br.HaP#N.N#QbIbI.a#Y.i.8#M#Qa0.L.B.p#Q#Q.i.i.i#Y.ibI#Q#..c.E.ja3a3bWambP.N.9#Y#Y#b#b#V.p.p.p#9..",
+"..#3.e#9.p.p.Y.Yb1b1#Y#.#Ubgbl.T#S..aw#obI.a.a#8#Y#Y.a#YbI.Na0.8bO#8a0#Qa0#8b1#Y#Y#8#Q.ibO#Ta9a9bWa3ay#Eb1.a.ab1#V#V.Y.p.p.e#9..",
+"..#3#9.p#h#C.p.Y#Vb1#b#V.a.Y.Y.Y#CazbO.eb1#8#Y#b#bb1b1#8bI#Y.8.abIb1#Y.Nb1#Y#Y#Y#b#Y.9.8.8.C.JbO#j.Yaz#C.p.Y#bb1#V.p.p.p#C.e#9..",
+"..#9#9#9.p#9.p.Y.Y#V#b#bb1#8.i#8.a.a#Y#Y#Y#Yb1b1#b#bb1#N#Y#8b1#Y#Yb1#8#Yb1#b#b#b#bb1#Y.N.w.8.N.8#Q.8.i.a#b#Y#bbO#V.Y.p#C.p.p#9..",
+"..#3#9.e#9.p.p#9#C.Y#V#b#b#b#Y#Y#Y#Y#Y#Yb1b1bO#V.Y#j#Vb1b1bObObObO.Ab1#N.A.AbF#V#V#V#b#8.aa0.a.ibI.8#Y#Yb1#V#V#V#V.p.p#9.p.e#9..",
+"..#3#3#9.e.e.p.p.p.p#V.Y#b#b#Vb1#b#Yb1.A#V.Y.Y.Y.Y.Y.A#j.YbO#VbO.Y#jbO#b#j#j#V.Y#V#V#bb1#Y.a#Yb1.a#8b1b1#b.A#V#C.p.p.p.p.e.e#9..",
+"..#3aAaA#3#9.e.e#9#C#C.Y.p.Y#V#VbF#VbO.Y#j.p.p.Y#C#j.Y#j.Y#j.Y#j.Y.YbO.Y#j.Y.p.p.p.p.Y#VbOb1#NbObOb1b1.A#V.p.p.p#C.p#9#9#9.e#9..",
+"..#3#9.e#3aA#9.e#9.p.p.e.p.p.p#V#j.Y.Y.Y#9.p.p#9.Yaz.Yaz.paz.Y.paz.Y.Y#j#C.p#C.p#C#C.p#V#VbO#VbF#V#j#V#j.p.p.p#C.p#9#C#C#9.e#9..",
+"..#3aA#9aA#9aA.e#9.e#9#9.p.p.p.p#Caz.Y#C.p.p#9.p#C#Caz.p#Caz.Y#C.p#9#j.p#h.p#C#C#C.e.p#9.Y#j.Y.Y.p.p.p#C.p.p#9#9#9#9#9.e#9.e#3..",
+"..#3.e#3.e#3.e#9#9aA#9.e.e.e.p#C.p#h#Caz#9.p.p.p#h.Y#9.p.p#C.paz.p#h.Yaz#9.p#C.e.e.e.p.p#9.p.paz#C.paz.Y#9.p.e#9.e#9#9#9#9aA#9..",
+"......bC..bC..bCbCbCbCbCbCbC..bC....bC..bCbCbCbCbC..bC....bC......bC..bCbCbCbCbCbCbCbCbCbCbC....bC......bCbC..bC..bC..bC........"
+};
--- a/user/wxLayout/README
+++ b/user/wxLayout/README
@@ -0,0 +1,49 @@
+
+README for wxLayout classes
+---------------------------
+
+All the source in this directory is copyrighted under the
+LGPL (GNU LIBRARY PUBLIC LICENSE), by Karsten Ballueder <ballueder@usa.net>.
+
+
+This is still work in progress, so if you want to make any significant
+changes, please get in touch with me before.
+
+There are three building blocks for rich text editing:
+
+wxllist :
+
+The wxLayoutList layout engine. It is a linked list of wxLayoutObjects
+which can arrange and display them on any wxDC. I am trying to keep
+this class as simple as possible, to be just the core layout
+engine. All "convenience" functions should be defined in classes built 
+on top of this.
+The wxLayoutList is derived from kbList, a double-linked list with an
+interface modelled after the STL list. As wxLayoutList depends on the
+way kbList treats iterators (i.e. the iterator value after an insert() 
+or erase() operation), I don't feel like rewriting it for wxList.
+
+wxlwindow :
+
+Contains a class wxLayoutWindow, derived from wxScrolledWindow which
+can directly be used as a rich-text display or editing window. The
+function responsible for keyboard handling is virtual and can be
+overloaded for different keybindings. wxLayoutWindow can sent fake
+menu-events to the application to react to the user clicking on
+objects.
+
+wxlparser:
+
+Contains several high level functions operating on
+wxLayoutList. Currently implemented is inserting of text (including
+linebreaks) and export of objects, text or html.
+Planned for the future is an html parser for importing html.
+
+
+wxLayout.cpp is a simple test program. It will export Text and HTML to
+stdout and demonstrate some of the features and bugs of wxLayoutList.
+
+There are still things to do and I'm working on them. :-)
+
+Karsten Ballueder <Ballueder@usa.ne>          29 June 1998
+
--- a/user/wxLayout/kbList.cpp
+++ b/user/wxLayout/kbList.cpp
@@ -0,0 +1,325 @@
+/*-*- c++ -*-********************************************************
+ * kbList.cc : a double linked list                                 *
+ *                                                                  *
+ * (C) 1998 by Karsten Ball<6C>der (Ballueder@usa.net)                 *
+ *                                                                  *
+ * $Id$          *
+ *                                                                  *
+ * $Log$
+ * Revision 1.2  1998/08/12 08:33:23  KB
+ * Cursor and insert/delete work much better now, code streamlined, still
+ * a minor problem left.
+ *
+ * Revision 1.6  1998/07/08 11:56:56  KB
+ * M compiles and runs on Solaris 2.5/gcc 2.8/c-client gso
+ *
+ * Revision 1.5  1998/06/27 20:07:18  KB
+ * several bug fixes for kbList
+ * started adding my layout stuff
+ *
+ * Revision 1.1.1.1  1998/06/13 21:51:12  karsten
+ * initial code
+ *
+ * Revision 1.4  1998/05/24 14:48:00  KB
+ * lots of progress on Python, but cannot call functions yet
+ * kbList fixes again?
+ *
+ * Revision 1.3  1998/05/18 17:48:34  KB
+ * more list<>->kbList changes, fixes for wxXt, improved makefiles
+ *
+ * Revision 1.2  1998/05/14 16:39:31  VZ
+ *
+ * fixed SIGSEGV in ~kbList if the list is empty
+ *
+ * Revision 1.1  1998/05/13 19:02:11  KB
+ * added kbList, adapted MimeTypes for it, more python, new icons
+ *
+ *******************************************************************/
+
+#ifdef __GNUG__
+#   pragma implementation "kbList.h"
+#endif
+
+#ifdef   M_BASEDIR
+#   include   "Mconfig.h"
+#endif
+
+#include   "kbList.h"
+
+kbListNode::kbListNode( void *ielement,
+                        kbListNode *iprev,
+                        kbListNode *inext)
+{
+   next = inext;
+   prev = iprev;
+   if(prev)
+      prev->next = this;
+   if(next)
+      next->prev = this;
+   element = ielement;
+}
+
+kbListNode::~kbListNode()
+{
+   if(prev)
+      prev->next = next;
+   if(next)
+      next->prev = prev;
+}
+
+
+kbList::iterator::iterator(kbListNode *n)
+{
+   node = n;
+}
+
+void *
+kbList::iterator::operator*() 
+{
+   return node->element;
+}
+
+kbList::iterator &
+kbList::iterator::operator++()
+{
+   node  = node ? node->next : NULL;
+   return *this;
+}
+
+kbList::iterator &
+kbList::iterator::operator--()
+{
+   node = node ? node->prev : NULL; 
+   return *this;
+}
+kbList::iterator &
+kbList::iterator::operator++(int foo)
+{
+   return operator++();
+}
+
+kbList::iterator &
+kbList::iterator::operator--(int bar)
+{
+   return operator--();
+}
+
+
+bool
+kbList::iterator::operator !=(kbList::iterator const & i) const
+{
+   return node != i.node;
+}
+
+bool
+kbList::iterator::operator ==(kbList::iterator const & i) const
+{
+   return node == i.node;
+}
+
+kbList::kbList(bool ownsEntriesFlag)
+{
+   first = NULL;
+   last = NULL;
+   ownsEntries = ownsEntriesFlag;
+}
+
+void
+kbList::push_back(void *element)
+{
+   if(! first) // special case of empty list
+   {
+      first = new kbListNode(element);
+      last = first;
+      return;
+   }
+   else
+      last = new kbListNode(element, last);
+}
+
+void
+kbList::push_front(void *element)
+{
+   if(! first) // special case of empty list
+   {
+      push_back(element);
+      return;
+   }
+   else
+      first = new kbListNode(element, NULL, first);
+}
+
+void *
+kbList::pop_back(void)
+{
+   iterator i;
+   void *data;
+   bool ownsFlagBak = ownsEntries;
+   i = tail();
+   data = *i;
+   ownsEntries = false;
+   erase(i);
+   ownsEntries = ownsFlagBak;
+   return data;
+}
+
+void *
+kbList::pop_front(void)
+{
+   iterator i;
+   void *data;
+   bool ownsFlagBak = ownsEntries;
+   
+   i = begin();
+   data = *i;
+   ownsEntries = false;
+   erase(i);
+   ownsEntries = ownsFlagBak;
+   return data;
+   
+}
+
+void
+kbList::insert(kbList::iterator & i, void *element)
+{   
+   if(! i.Node())
+      return;
+   else if(i.Node() == first)
+   {
+      push_front(element);
+      i = first;
+      return;
+   }
+   i = kbList::iterator(new kbListNode(element, i.Node()->prev, i.Node()));
+}
+
+void
+kbList::erase(kbList::iterator & i)
+{
+   kbListNode
+      *node = i.Node(),
+      *prev, *next;
+   
+   if(! node) // illegal iterator
+      return;
+
+   prev = node->prev;
+   next = node->next;
+   
+   // correct first/last:
+   if(node == first)
+      first = node->next;
+   if(node == last)  // don't put else here!
+      last = node->prev;
+
+   // build new links:
+   if(prev)
+      prev->next = next;
+   if(next)
+      next->prev = prev;
+
+   // delete this node and contents:
+   if(ownsEntries)
+      delete *i;
+   delete i.Node();
+
+   // change the iterator to next element:
+   i = kbList::iterator(next);
+}
+
+kbList::~kbList()
+{
+   kbListNode *next;
+
+   while ( first != NULL )
+   {
+      next = first->next;
+      if(ownsEntries)
+         delete first->element;
+      delete first;
+      first = next;
+   }
+}
+
+kbList::iterator
+kbList::begin(void) const
+{
+   return kbList::iterator(first);
+}
+
+kbList::iterator
+kbList::tail(void) const
+{
+   return kbList::iterator(last);
+}
+
+kbList::iterator
+kbList::end(void) const
+{
+   return kbList::iterator(NULL); // the one after the last
+}
+
+unsigned
+kbList::size(void) const // inefficient
+{
+   unsigned count = 0;
+   kbList::iterator i;
+   for(i = begin(); i != end(); i++, count++)
+      ;
+   return count;
+}
+
+
+
+
+
+
+
+#ifdef   KBLIST_TEST
+
+#include   <iostream.h>
+
+KBLIST_DEFINE(kbListInt,int);
+   
+int main(void)
+{
+   int
+      n, *ptr;
+   kbListInt
+      l;
+   kbListInt::iterator
+      i;
+   
+   for(n = 0; n < 10; n++)
+   {
+      ptr = new int;
+      *ptr = n*n;
+      l.push_back(ptr);
+   }
+
+   i = l.begin(); // first element
+   i++; // 2nd
+   i++; // 3rd
+   i++; // 4th, insert here:
+   ptr = new int;
+   *ptr = 4444;
+   l.insert(i,ptr);
+
+   // this cannot work, because l.end() returns NULL:
+   i = l.end(); // behind last
+   i--;  // still behind last
+   l.erase(i);  // doesn't do anything
+
+   // this works:
+   i = l.tail(); // last element
+   i--;
+   --i;
+   l.erase(i); // erase 3rd last element (49)
+   
+   for(i = l.begin(); i != l.end(); i++)
+      cout << *i << '\t' << *((int *)*i) << endl;
+
+   
+   return 0;
+}
+#endif
--- a/user/wxLayout/kbList.h
+++ b/user/wxLayout/kbList.h
@@ -0,0 +1,298 @@
+/*-*- c++ -*-********************************************************
+ * kbList.h : a double linked list                                  *
+ *                                                                  *
+ * (C) 1998 by Karsten Ball<6C>der (Ballueder@usa.net)                 *
+ *                                                                  *
+ * $Id$
+ *
+ *******************************************************************/
+
+#ifndef   KBLIST_H
+#   define   KBLIST_H
+
+#ifdef __GNUG__
+#   pragma interface "kbList.h"
+#endif
+
+#ifndef   NULL
+#   define   NULL   0
+#endif
+
+/**@name Double linked list implementation. */
+//@{
+
+/** kbListNode is a class used by kbList. It represents a single
+    element in the list. It is not intended for general use outside
+    kbList functions.
+*/
+struct kbListNode
+{
+   /// pointer to next node or NULL
+   struct kbListNode *next;
+   /// pointer to previous node or NULL
+   struct kbListNode *prev;
+   /// pointer to the actual data 
+   void *element;
+   /** Constructor - it automatically links the node into the list, if
+       the iprev, inext parameters are given.
+       @param ielement pointer to the data for this node (i.e. the data itself)
+       @param iprev if not NULL, use this as previous element in list
+       @param inext if not NULL, use this as next element in list
+   */
+   kbListNode( void *ielement,
+               kbListNode *iprev = (kbListNode *) NULL,
+               kbListNode *inext = (kbListNode *) NULL);
+   /// Destructor.
+   ~kbListNode();
+};
+
+/** The main list class, handling void pointers as data.
+  */
+
+class kbList
+{
+public:
+   /// An iterator class for kbList, just like for the STL classes.
+   class iterator
+   {
+   protected:
+      /// the node to which this iterator points
+      kbListNode *node;
+      friend class kbList;
+         public:
+      /** Constructor.
+          @param n if not NULL, the node to which to point
+      */
+      iterator(kbListNode *n = (kbListNode *) NULL);
+      /** Dereference operator.
+          @return the data pointer of the node belonging to this
+          iterator
+      */
+      void * operator*();
+
+      /** Increment operator - prefix, goes to next node in list.
+          @return itself
+      */
+      iterator & operator++();
+
+      /** Decrement operator - prefix, goes to previous node in list.
+          @return itself
+      */
+      iterator & operator--();
+
+      /** Increment operator - prefix, goes to next node in list.
+          @return itself
+      */
+      iterator & operator++(int); //postfix
+
+      /** Decrement operator - prefix, goes to previous node in list.
+          @return itself
+      */
+      iterator & operator--(int); //postfix
+
+      /** Comparison operator.
+          @return true if not equal.
+      */
+      bool operator !=(iterator const &) const; 
+
+      /* Comparison operator.
+         @return true if equal
+      */
+      bool operator ==(iterator const &) const; 
+
+      /** Returns a pointer to the node associated with this iterator.
+          This function is not for general use and should be
+          protected. However, if protected, it cannot be called from
+          derived classes' iterators. (Is this a bug in gcc/egcs?)
+          @return the node pointer
+      */
+      inline kbListNode * Node(void) const
+         { return node; }
+   };
+
+   /** Constructor.
+       @param ownsEntriesFlag if true, the list owns the entries and
+       will issue a delete on each of them when deleting them. If
+       false, the entries themselves will not get deleted. Do not use
+       this with array types!
+   */
+   kbList(bool ownsEntriesFlag = true);
+
+   /** Destructor.
+       If entries are owned, they will all get deleted from here.
+   */
+   ~kbList();
+
+   /** Tell list whether it owns objects. If owned, they can be
+       deleted by list. See the constructor for more details.
+       @param ownsflag if true, list will own entries
+   */
+   void ownsObjects(bool ownsflag = true)
+      { ownsEntries = ownsflag; }
+
+   /** Query whether list owns entries.
+       @return true if list owns entries
+   */
+   bool ownsObjects(void)
+      { return ownsEntries; }
+   
+   /** Add an entry at the end of the list.
+       @param element pointer to data
+   */
+   void push_back(void *element);
+
+   /** Add an entry at the head of the list.
+       @param element pointer to data
+   */
+   void push_front(void *element);
+
+   /** Get element from end of the list and delete it.
+       NOTE: In this case the element's data will not get deleted by
+       the list. It is the responsibility of the caller to free it.
+       @return the element data
+   */
+   void *pop_back(void);
+
+   /** Get element from head of the list and delete it.
+       NOTE: In this case the element's data will not get deleted by
+       the list. It is the responsibility of the caller to free it.
+       @return the element data
+   */
+   void *pop_front(void);
+
+   /** Insert an element into the list.
+       @param i an iterator pointing to the element, before which the new one should be inserted
+       @param element the element data
+   */
+   void insert(iterator & i, void *element);
+
+   /** Erase an element, move iterator to following element.
+       @param i iterator pointing to the element to be deleted
+   */
+   void erase(iterator & i);
+   
+   /* Get head of list.
+      @return iterator pointing to head of list
+   */
+   iterator begin(void) const;
+
+   /* Get end of list.
+   @return iterator pointing after the end of the list. This is an
+   invalid iterator which cannot be dereferenced or decremented. It is
+   only of use in comparisons. NOTE: this is different from STL!
+   @see tail
+   */
+   iterator end(void) const;
+
+   /* Get last element in list.
+      @return iterator pointing to the last element in the list.
+      @see end
+   */
+   iterator tail(void) const;
+
+   /* Get the number of elements in the list.
+      @return number of elements in the list
+   */
+   unsigned size(void) const;
+
+   /* Query whether list is empty.
+      @return true if list is empty
+   */
+   bool empty(void) const
+      { return first == NULL ; }
+
+protected:
+   /// if true, list owns entries
+   bool        ownsEntries;
+   /// pointer to first element in list
+   kbListNode *first;
+   /// pointer to last element in list
+   kbListNode *last;
+
+private:
+   /// forbid copy construction
+   kbList(kbList const &foo);
+   /// forbid assignments
+   kbList& operator=(const kbList& foo);
+};
+
+/// just for backward compatibility, will be removed soon
+typedef kbList::iterator kbListIterator;
+/// cast an iterator to a pointer, compatibility only to be removed
+#define   kbListICast(type, iterator)   ((type *)*iterator)
+/// cast an iterator to a const pointer, compatibility only to be removed
+#define   kbListIcCast(type, iterator)   ((type const *)*iterator)
+
+/** Macro to define a kbList with a given name, having elements of
+    pointer to the given type. I.e. KBLIST_DEFINE(Int,int) would
+    create a kbListInt type holding int pointers.
+*/
+#define   KBLIST_DEFINE(name,type)   \
+class name : public kbList \
+{ \
+public: \
+   class iterator : public kbList::iterator \
+   { \
+   protected: \
+      inline iterator(kbList::iterator const & i) \
+         { node = i.Node(); } \
+      friend class name; \
+   public: \
+      inline iterator(kbListNode *n = (kbListNode *) NULL) \
+         : kbList::iterator(n) {} \
+      inline type * operator*() \
+         /* the cast is needed for MS VC++ 5.0 */ \
+         { return (type *)((kbList::iterator *)this)->operator*() ; } \
+   }; \
+   inline name(bool ownsEntriesFlag = FALSE) \
+      : kbList(ownsEntriesFlag) {} \
+   \
+   inline void push_back(type *element) \
+      { kbList::push_back((void *)element); } \
+   \
+   inline void push_front(type *element) \
+      { kbList::push_front((void *)element); } \
+   \
+   inline type *pop_back(void) \
+      { return (type *) kbList::pop_back(); } \
+   \
+   inline type *pop_front(void) \
+      { return (type *) kbList::pop_front(); } \
+   \
+   inline void insert(iterator & i, type *element) \
+      { kbList::insert(i, (void *) element); } \
+   \
+   inline void erase(iterator & i) \
+      { kbList::erase(i); } \
+   \
+   inline iterator begin(void) const \
+      { return kbList::begin(); } \
+   \
+   inline iterator end(void) const \
+      { return kbList::end(); } \
+   \
+   inline iterator tail(void) const \
+      { return kbList::tail(); } \
+   ~name() \
+   { \
+      kbListNode *next; \
+      while ( first != (kbListNode *) NULL ) \
+      { \
+         next = first->next; \
+         if(ownsEntries) \
+            delete typecast(first->element); \
+         delete first; \
+         first = next; \
+      } \
+   } \
+   private: \
+   inline type * typecast(void *ptr) \
+      { return (type *) ptr; } \
+   }
+
+#ifdef   MCONFIG_H
+/// define the most commonly used list type once:
+KBLIST_DEFINE(kbStringList, String);
+#endif
+
+#endif // KBLIST_H
--- a/user/wxLayout/wxLayout.cpp
+++ b/user/wxLayout/wxLayout.cpp
@@ -0,0 +1,453 @@
+/*
+ * Program: wxLayout
+ * 
+ * Author: Karsten Ball<6C>der
+ *
+ * Copyright: (C) 1998, Karsten Ball<6C>der <Ballueder@usa.net>
+ *
+ */
+
+#ifdef __GNUG__
+#pragma implementation "wxLayout.h"
+#endif
+
+#include "wxLayout.h"
+#include "wx/textfile.h"
+
+
+#include   "Micon.xpm"
+
+// for testing only:
+#include   <stdio.h>
+
+//-----------------------------------------------------------------------------
+// main program
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_APP(MyApp)
+
+//-----------------------------------------------------------------------------
+// MyFrame
+//-----------------------------------------------------------------------------
+
+   enum ids{ ID_EDIT = 1, ID_ADD_SAMPLE, ID_CLEAR, ID_PRINT,
+             ID_PRINT_SETUP, ID_PAGE_SETUP, ID_PREVIEW, ID_PRINT_PS,
+             ID_PRINT_SETUP_PS, ID_PAGE_SETUP_PS,ID_PREVIEW_PS,
+             ID_DPRINT,
+             ID_WXLAYOUT_DEBUG, ID_QUIT, ID_CLICK, ID_HTML, ID_TEXT, ID_TEST };
+
+
+IMPLEMENT_DYNAMIC_CLASS( MyFrame, wxFrame )
+
+   BEGIN_EVENT_TABLE(MyFrame,wxFrame)
+    EVT_MENU(ID_PRINT, MyFrame::OnPrint)
+    EVT_MENU(ID_PREVIEW, MyFrame::OnPrintPreview)
+    EVT_MENU(ID_PRINT_SETUP, MyFrame::OnPrintSetup)
+    EVT_MENU(ID_PAGE_SETUP, MyFrame::OnPageSetup)
+    EVT_MENU(ID_PRINT_PS, MyFrame::OnPrintPS)
+    EVT_MENU(ID_PREVIEW_PS, MyFrame::OnPrintPreviewPS)
+    EVT_MENU(ID_PRINT_SETUP_PS, MyFrame::OnPrintSetupPS)
+    EVT_MENU(ID_PAGE_SETUP_PS, MyFrame::OnPageSetupPS)
+    EVT_MENU    (-1,       MyFrame::OnCommand)
+    EVT_COMMAND (-1,-1,    MyFrame::OnCommand)
+    EVT_CHAR    (  wxLayoutWindow::OnChar  )
+   END_EVENT_TABLE()
+
+
+
+
+
+
+int orientation = wxPORTRAIT;
+
+
+
+
+
+   
+   MyFrame::MyFrame(void) :
+      wxFrame( (wxFrame *) NULL, -1, (char *) "wxLayout", wxPoint(20,20), wxSize(600,360) )
+{
+   CreateStatusBar( 1 );
+  
+   SetStatusText( "wxLayout by Karsten Ball<6C>der." );
+
+   wxMenu *file_menu = new wxMenu( "Menu 1" );
+   file_menu->Append( ID_CLEAR, "Clear");
+   file_menu->Append( ID_ADD_SAMPLE, "Example");
+   file_menu->Append( ID_EDIT, "Edit");
+   file_menu->Append( ID_WXLAYOUT_DEBUG, "Debug");
+
+  file_menu->Append(ID_PRINT, "&Print...", "Print");
+  file_menu->Append(ID_PRINT_SETUP, "Print &Setup...","Setup printer properties");
+  file_menu->Append(ID_PAGE_SETUP, "Page Set&up...", "Page setup");
+  file_menu->Append(ID_PREVIEW, "Print Pre&view", "Preview");
+#ifdef __WXMSW__
+  file_menu->AppendSeparator();
+  file_menu->Append(ID_PRINT_PS, "Print PostScript...", "Print (PostScript)");
+  file_menu->Append(ID_PRINT_SETUP_PS, "Print Setup PostScript...", "Setup printer properties (PostScript)");
+  file_menu->Append(ID_PAGE_SETUP_PS, "Page Setup PostScript...", "Page setup (PostScript)");
+  file_menu->Append(ID_PREVIEW_PS, "Print Preview PostScript", "Preview (PostScript)");
+#endif
+  file_menu->AppendSeparator();
+
+   file_menu->Append( ID_DPRINT, "Direct Print");
+   file_menu->Append( ID_TEXT, "Export Text");
+   file_menu->Append( ID_HTML, "Export HTML");
+   file_menu->Append( ID_TEST, "Test");
+   file_menu->Append( ID_QUIT, "Exit");
+  
+   wxMenuBar *menu_bar = new wxMenuBar();
+   menu_bar->Append(file_menu, "File" );
+   menu_bar->Show( TRUE );
+  
+   SetMenuBar( menu_bar );
+
+   m_lwin = new wxLayoutWindow(this);
+   m_lwin->SetEventId(ID_CLICK);
+   m_lwin->GetLayoutList().SetEditable(true);
+   m_lwin->Clear(wxROMAN,16,wxNORMAL,wxNORMAL, false);
+   m_lwin->SetFocus();
+};
+
+void
+MyFrame::AddSampleText(wxLayoutList &llist)
+{
+   llist.Insert("--");
+   llist.LineBreak();
+
+   llist.Insert("The quick brown fox jumps over the lazy dog.");
+   llist.LineBreak();
+   llist.Insert("Hello ");
+   llist.Insert(new wxLayoutObjectIcon(new wxIcon(Micon_xpm,-1,-1)));
+   llist.LineBreak();
+   llist.SetFontWeight(wxBOLD);
+   llist.Insert("World! ");
+   llist.SetFontWeight(wxNORMAL);
+   llist.Insert("The quick brown fox jumps...");
+   llist.LineBreak();
+
+   llist.Insert("over the lazy dog.");
+   llist.SetFont(-1,-1,-1,-1,true);
+   llist.Insert("underlined");
+   llist.SetFont(-1,-1,-1,-1,false);
+   llist.SetFont(wxROMAN);
+   llist.Insert("This is ");
+   llist.SetFont(-1,-1,-1,wxBOLD);  llist.Insert("BOLD ");  llist.SetFont(-1,-1,-1,wxNORMAL);
+   llist.Insert("and ");
+   llist.SetFont(-1,-1,wxITALIC);
+   llist.Insert("italics ");
+   llist.SetFont(-1,-1,wxNORMAL);
+   llist.LineBreak();
+  
+   llist.Insert("and ");
+   llist.SetFont(-1,-1,wxSLANT);
+   llist.Insert("slanted");
+   llist.SetFont(-1,-1,wxNORMAL);
+   llist.Insert(" text.");
+   llist.LineBreak();
+
+   llist.Insert("and ");
+   llist.SetFont(-1,-1,-1,-1,-1,"blue");
+   llist.Insert("blue");
+   llist.SetFont(-1,-1,-1,-1,-1,"black");
+   llist.Insert(" and ");
+   llist.SetFont(-1,-1,-1,-1,-1,"green","black");
+   llist.Insert("green on black");
+   llist.SetFont(-1,-1,-1,-1,-1,"black","white");
+   llist.Insert(" text.");
+   llist.LineBreak();
+
+   llist.SetFont(-1,-1,wxSLANT);
+   llist.Insert("Slanted");
+   llist.SetFont(-1,-1,wxNORMAL);
+   llist.Insert(" and normal text and ");
+   llist.SetFont(-1,-1,wxSLANT);
+   llist.Insert("slanted");
+   llist.SetFont(-1,-1,wxNORMAL);
+   llist.Insert(" again.");
+   llist.LineBreak();
+
+   // add some more text for testing:
+   llist.Insert("And here the source for the test program:");
+   llist.LineBreak();
+   llist.SetFont(wxTELETYPE,16);
+   char buffer[1024];
+   FILE *in = fopen("wxLayout.cpp","r");
+   if(in)
+   {
+      for(;;)
+      {
+         fgets(buffer,1024,in);
+         if(feof(in))
+            break;
+         llist.Insert(buffer);
+         llist.LineBreak();
+      }
+   }
+   
+   m_lwin->Refresh();
+   m_lwin->UpdateScrollbars();
+   llist.SetEditable();
+   llist.SetCursor(wxPoint(0,0));
+}
+
+void
+MyFrame::Clear(void)
+{
+   m_lwin->Clear(wxROMAN,16,wxNORMAL,wxNORMAL, false);
+   m_lwin->UpdateScrollbars();
+}
+
+/* test the editing */
+void MyFrame::Edit(void)
+{
+   wxLayoutList & llist = m_lwin->GetLayoutList();
+   m_lwin->SetEventId(ID_CLICK);
+  
+   llist.MoveCursor(0);
+   llist.MoveCursor(5);
+   llist.MoveCursor(0,2);
+   llist.Delete(2);
+   llist.MoveCursor(2);
+   llist.Insert("not");
+   llist.LineBreak();
+   m_lwin->Refresh();
+}
+
+void MyFrame::OnCommand( wxCommandEvent &event )
+{
+   cerr << "id:" << event.GetId() << endl;
+   switch (event.GetId())
+   {
+   case ID_QUIT:
+      Close( TRUE );
+      break;
+   case ID_PRINT:
+      m_lwin->Print();
+      break;
+   case ID_DPRINT:
+   {
+      wxLayoutList llist;
+      AddSampleText(llist);
+      wxPostScriptDC   dc("layout.ps",true,this);
+      if (dc.Ok() && dc.StartDoc((char *)_("Printing message...")))
+      {
+         //dc.SetUserScale(1.0, 1.0);
+         llist.Draw(dc); //,false,wxPoint(0,0),true);
+         dc.EndDoc();
+      }
+   }
+   break;
+   case ID_EDIT:
+      Edit();
+      break;
+   case ID_ADD_SAMPLE:
+      AddSampleText(m_lwin->GetLayoutList());
+      break;
+   case ID_CLEAR:
+      Clear();
+      break;
+   case ID_WXLAYOUT_DEBUG:
+      m_lwin->GetLayoutList().Debug();
+      break;
+   case ID_CLICK:
+      cerr << "Received click event." << endl;
+      break;
+   case ID_TEST:
+   {
+      Clear();
+      m_lwin->GetLayoutList().LineBreak();
+      m_lwin->GetLayoutList().Insert("abc");
+      m_lwin->GetLayoutList().LineBreak();
+      m_lwin->GetLayoutList().Insert("def");
+      break;
+   }
+   case ID_HTML:
+   {
+      wxLayoutExportObject *export;
+      wxLayoutList::iterator i = m_lwin->GetLayoutList().begin();
+
+      while((export = wxLayoutExport(m_lwin->GetLayoutList(),
+                                     i,WXLO_EXPORT_AS_HTML)) != NULL)
+      {
+         if(export->type == WXLO_EXPORT_HTML)
+            cout << *(export->content.text);
+         else
+            cout << "<!--UNKNOWN OBJECT>";
+         delete export;
+      }
+   }
+   break;
+   case ID_TEXT:
+   {
+      wxLayoutExportObject *export;
+      wxLayoutList::iterator i = m_lwin->GetLayoutList().begin();
+
+      while((export = wxLayoutExport(m_lwin->GetLayoutList(),
+                                     i,WXLO_EXPORT_AS_TEXT)) != NULL)
+      {
+         if(export->type == WXLO_EXPORT_TEXT)
+            cout << *(export->content.text);
+         else
+            cout << "<!--UNKNOWN OBJECT>";
+         delete export;
+      }
+   }
+   break;
+   }
+};
+
+void MyFrame::OnPrint(wxCommandEvent& WXUNUSED(event))
+{
+#ifdef __WXMSW__
+      wxGetApp().SetPrintMode(wxPRINT_WINDOWS);
+#else
+      wxGetApp().SetPrintMode(wxPRINT_POSTSCRIPT);
+#endif
+      wxPrinter printer;
+      wxLayoutPrintout printout( m_lwin->GetLayoutList(),"My printout");
+      if (!printer.Print(this, &printout, TRUE))
+        wxMessageBox("There was a problem printing.\nPerhaps your current printer is not set correctly?", "Printing", wxOK);
+}
+
+void MyFrame::OnPrintPS(wxCommandEvent& WXUNUSED(event))
+{
+      wxGetApp().SetPrintMode(wxPRINT_POSTSCRIPT);
+
+      wxPostScriptPrinter printer;
+      wxLayoutPrintout printout( m_lwin->GetLayoutList(),"My printout");
+      printer.Print(this, &printout, TRUE);
+}
+
+void MyFrame::OnPrintPreview(wxCommandEvent& WXUNUSED(event))
+{
+#ifdef __WXMSW__
+      wxGetApp().SetPrintMode(wxPRINT_WINDOWS);
+#else
+      wxGetApp().SetPrintMode(wxPRINT_POSTSCRIPT);
+#endif
+      wxPrintData printData;
+      printData.SetOrientation(orientation);
+
+      // Pass two printout objects: for preview, and possible printing.
+      wxPrintPreview *preview = new wxPrintPreview(new wxLayoutPrintout( m_lwin->GetLayoutList()), new wxLayoutPrintout( m_lwin->GetLayoutList()), & printData);
+      if (!preview->Ok())
+      {
+        delete preview;
+        wxMessageBox("There was a problem previewing.\nPerhaps your current printer is not set correctly?", "Previewing", wxOK);
+        return;
+      }
+      
+      wxPreviewFrame *frame = new wxPreviewFrame(preview, this, "Demo Print Preview", wxPoint(100, 100), wxSize(600, 650));
+      frame->Centre(wxBOTH);
+      frame->Initialize();
+      frame->Show(TRUE);
+}
+
+void MyFrame::OnPrintPreviewPS(wxCommandEvent& WXUNUSED(event))
+{
+      wxGetApp().SetPrintMode(wxPRINT_POSTSCRIPT);
+
+      wxPrintData printData;
+      printData.SetOrientation(orientation);
+
+      // Pass two printout objects: for preview, and possible printing.
+      wxPrintPreview *preview = new wxPrintPreview(new wxLayoutPrintout( m_lwin->GetLayoutList()), new wxLayoutPrintout( m_lwin->GetLayoutList()), & printData);
+      wxPreviewFrame *frame = new wxPreviewFrame(preview, this, "Demo Print Preview", wxPoint(100, 100), wxSize(600, 650));
+      frame->Centre(wxBOTH);
+      frame->Initialize();
+      frame->Show(TRUE);
+}
+
+void MyFrame::OnPrintSetup(wxCommandEvent& WXUNUSED(event))
+{
+#ifdef __WXMSW__
+      wxGetApp().SetPrintMode(wxPRINT_WINDOWS);
+#else
+      wxGetApp().SetPrintMode(wxPRINT_POSTSCRIPT);
+#endif
+      wxPrintData data;
+      data.SetOrientation(orientation);
+
+#ifdef __WXMSW__
+      wxPrintDialog printerDialog(this, & data);
+#else
+      wxGenericPrintDialog printerDialog(this, & data);
+#endif
+      printerDialog.GetPrintData().SetSetupDialog(TRUE);
+      printerDialog.ShowModal();
+
+      orientation = printerDialog.GetPrintData().GetOrientation();
+}
+
+void MyFrame::OnPageSetup(wxCommandEvent& WXUNUSED(event))
+{
+#ifdef __WXMSW__
+      wxGetApp().SetPrintMode(wxPRINT_WINDOWS);
+#else
+      wxGetApp().SetPrintMode(wxPRINT_POSTSCRIPT);
+#endif
+      wxPageSetupData data;
+      data.SetOrientation(orientation);
+
+#ifdef __WXMSW__
+      wxPageSetupDialog pageSetupDialog(this, & data);
+#else
+      wxGenericPageSetupDialog pageSetupDialog(this, & data);
+#endif
+      pageSetupDialog.ShowModal();
+
+      data = pageSetupDialog.GetPageSetupData();
+      orientation = data.GetOrientation();
+}
+
+void MyFrame::OnPrintSetupPS(wxCommandEvent& WXUNUSED(event))
+{
+      wxGetApp().SetPrintMode(wxPRINT_POSTSCRIPT);
+
+      wxPrintData data;
+      data.SetOrientation(orientation);
+
+      wxGenericPrintDialog printerDialog(this, & data);
+      printerDialog.GetPrintData().SetSetupDialog(TRUE);
+      printerDialog.ShowModal();
+
+      orientation = printerDialog.GetPrintData().GetOrientation();
+}
+
+void MyFrame::OnPageSetupPS(wxCommandEvent& WXUNUSED(event))
+{
+      wxGetApp().SetPrintMode(wxPRINT_POSTSCRIPT);
+
+      wxPageSetupData data;
+      data.SetOrientation(orientation);
+
+      wxGenericPageSetupDialog pageSetupDialog(this, & data);
+      pageSetupDialog.ShowModal();
+
+      orientation = pageSetupDialog.GetPageSetupData().GetOrientation();
+}
+
+
+//-----------------------------------------------------------------------------
+// MyApp
+//-----------------------------------------------------------------------------
+
+MyApp::MyApp(void) : 
+   wxApp( )
+{
+};
+
+bool MyApp::OnInit(void)
+{
+   wxFrame *frame = new MyFrame();
+   frame->Show( TRUE );
+   wxSetAFMPath("/usr/local/src/wxWindows/misc/afm/");
+   return TRUE;
+};
+
+
+
+
+
--- a/user/wxLayout/wxLayout.h
+++ b/user/wxLayout/wxLayout.h
@@ -0,0 +1,67 @@
+/* -*- c++ -*- */
+
+#ifndef __WXLAYOUTH__
+#define __WXLAYOUTH__
+
+#ifdef __GNUG__
+#pragma interface
+#endif
+
+#include "wx/wx.h"
+
+#include "wxllist.h"
+#include "wxlwindow.h"
+#include "wxlparser.h"
+
+//-----------------------------------------------------------------------------
+// derived classes
+//-----------------------------------------------------------------------------
+
+class MyFrame;
+class MyApp;
+
+//-----------------------------------------------------------------------------
+// MyFrame
+//-----------------------------------------------------------------------------
+
+class MyFrame: public wxFrame
+{
+  DECLARE_DYNAMIC_CLASS(MyFrame)
+
+  public:
+  
+   MyFrame(void);
+   void Edit(void);
+   void AddSampleText(wxLayoutList &llist);
+   void Clear(void);
+   void OnCommand( wxCommandEvent &event );
+
+    void OnPrint(wxCommandEvent& event);
+    void OnPrintPreview(wxCommandEvent& event);
+    void OnPrintSetup(wxCommandEvent& event);
+    void OnPageSetup(wxCommandEvent& event);
+    void OnPrintPS(wxCommandEvent& event);
+    void OnPrintPreviewPS(wxCommandEvent& event);
+    void OnPrintSetupPS(wxCommandEvent& event);
+    void OnPageSetupPS(wxCommandEvent& event);
+
+   DECLARE_EVENT_TABLE()
+
+private:
+   wxLayoutWindow  *m_lwin;
+   
+};
+
+//-----------------------------------------------------------------------------
+// MyApp
+//-----------------------------------------------------------------------------
+
+class MyApp: public wxApp
+{
+  public:
+  
+    MyApp(void);
+    virtual bool OnInit(void);
+};
+
+#endif // __WXCONVERTH__
--- a/user/wxLayout/wxllist.cpp
+++ b/user/wxLayout/wxllist.cpp
--- a/user/wxLayout/wxllist.h
+++ b/user/wxLayout/wxllist.h
@@ -0,0 +1,338 @@
+/*-*- c++ -*-********************************************************
+ * wxLayoutList.h - a formatted text rendering engine for wxWindows *
+ *                                                                  *
+ * (C) 1998 by Karsten Ball<6C>der (Ballueder@usa.net)                 *
+ *                                                                  *
+ * $Id$
+ *******************************************************************/
+#ifndef WXLLIST_H
+#define WXLLIST_H
+
+#ifdef __GNUG__
+#   pragma interface "wxllist.h"
+#endif
+
+#include   "kbList.h"
+
+#include   "wx/wx.h"
+#include "wx/print.h"
+#include "wx/printdlg.h"
+#include "wx/generic/printps.h"
+#include "wx/generic/prntdlgg.h"
+
+// skip the following defines if embedded in M application
+#ifdef   M_BASEDIR
+#   ifdef   DEBUG
+//#      define   WXLAYOUT_DEBUG
+#   endif
+#else
+    // for testing only:
+#   define WXLAYOUT_DEBUG
+    // The wxLayout classes can be compiled with std::string instead of wxString
+    //#   define USE_STD_STRING
+#endif
+
+#ifdef USE_STD_STRING
+#   include   <string>
+    typedef   std::string String;
+#   define    Str(str)(str.c_str())
+#else
+    typedef   wxString String;
+#   define    Str(str) str
+#endif
+
+/// Types of currently supported layout objects.
+enum wxLayoutObjectType
+{ WXLO_TYPE_INVALID = 0, WXLO_TYPE_TEXT, WXLO_TYPE_CMD, WXLO_TYPE_ICON, WXLO_TYPE_LINEBREAK };
+
+/// Type used for coordinates in drawing.
+typedef long CoordType;
+
+class wxLayoutList;
+class wxLayoutObjectBase;
+
+class wxDC;
+class wxColour;
+class wxFont;
+
+/** The base class defining the interface to each object which can be
+    part of the layout. Each object needs to draw itself and calculate 
+    its size.
+*/
+class wxLayoutObjectBase
+{
+public:
+   /// return the type of this object
+   virtual wxLayoutObjectType GetType(void) const { return WXLO_TYPE_INVALID; } ;
+   /** Draws an object.
+       @param dc the wxDC to draw on
+       @param position where to draw the top left corner
+       @param baseLine the baseline for alignment, from top of box
+       @draw if set to false, do not draw but just calculate sizes
+   */
+   virtual void Draw(wxDC &dc, wxPoint position, CoordType baseLine,
+                     bool draw = true) {};
+
+   /** Calculates and returns the size of the object. May need to be
+       called twice to work.
+       @param baseLine pointer where to store the baseline position of 
+       this object (i.e. the height from the top of the box to the
+       baseline)
+       @return the size of the object's box in pixels
+   */
+   virtual wxPoint GetSize(CoordType *baseLine) const { return
+                                                           wxPoint(0,0); };
+   /// returns the number of cursor positions occupied by this object
+   virtual CoordType CountPositions(void) const { return 1; }
+
+   /// constructor
+   wxLayoutObjectBase() { m_UserData = NULL; }
+   /// note: any user data will be freed at the time the object is deleted
+   virtual ~wxLayoutObjectBase() { if(m_UserData) delete m_UserData; }
+#ifdef WXLAYOUT_DEBUG
+   virtual void Debug(void);
+#endif
+
+   /** Tells the object about some user data. This data is associated
+       with the object and will be deleted at destruction time.
+   */
+   void   SetUserData(void *data) { m_UserData = data; }
+   /** Return the user data. */
+   void * GetUserData(void) const { return m_UserData; }
+private:
+   /// optional data for application's use
+   void * m_UserData;
+};
+
+/// Define a list type of wxLayoutObjectBase pointers.
+KBLIST_DEFINE(wxLayoutObjectList, wxLayoutObjectBase);
+
+
+/// object for text block
+class wxLayoutObjectText : public wxLayoutObjectBase
+{
+public:
+   virtual wxLayoutObjectType GetType(void) const { return WXLO_TYPE_TEXT; }
+   virtual void Draw(wxDC &dc, wxPoint position, CoordType baseLine,
+                     bool draw = true);
+   /** This returns the height and in baseLine the position of the
+       text's baseline within it's box. This is needed to properly
+       align text objects.
+   */
+   virtual wxPoint GetSize(CoordType *baseLine) const;
+#ifdef WXLAYOUT_DEBUG
+   virtual void Debug(void);
+#endif
+
+   wxLayoutObjectText(const String &txt);
+   virtual CoordType CountPositions(void) const { return strlen(m_Text.c_str()); }
+
+   // for editing:
+   String & GetText(void) { return m_Text; }
+   void SetText(String const &text) { m_Text = text; }
+private:
+   String m_Text;
+   /// size of the box containing text
+   long   m_Width, m_Height;
+   /// the position of the baseline counted from the top of the box
+   long   m_BaseLine;
+};
+
+/// icon/pictures:
+class wxLayoutObjectIcon : public wxLayoutObjectBase
+{
+public:
+   virtual wxLayoutObjectType GetType(void) const { return WXLO_TYPE_ICON; }
+   virtual void Draw(wxDC &dc, wxPoint position, CoordType baseLine,
+                     bool draw = true);
+   virtual wxPoint GetSize(CoordType *baseLine) const;
+   wxLayoutObjectIcon(wxIcon *icon);
+
+private:
+   wxIcon *m_Icon;
+};
+
+/// for export to html:
+struct wxLayoutStyleInfo
+{
+   int  size, family, style, weight;
+   bool underline;
+   unsigned fg_red, fg_green, fg_blue;
+   unsigned bg_red, bg_green, bg_blue;
+};
+
+/// pseudo-object executing a formatting command in Draw()
+class wxLayoutObjectCmd : public wxLayoutObjectBase
+{
+public:
+   virtual wxLayoutObjectType GetType(void) const { return WXLO_TYPE_CMD; }
+   virtual void Draw(wxDC &dc, wxPoint position, CoordType baseLine,
+                     bool draw = true);
+   wxLayoutObjectCmd(int size, int family, int style, int weight,
+                bool underline,
+                wxColour const *fg, wxColour const *bg);
+   ~wxLayoutObjectCmd();
+   /// caller must free pointer:
+   wxLayoutStyleInfo *GetStyle(void) const ;
+   /// return the background colour for setting colour of window
+   wxColour const *GetBGColour(void) const { return m_ColourBG; }
+private:
+   /// the font to use
+   wxFont *m_font;
+   /// foreground colour
+   wxColour const *m_ColourFG;
+   /// background colour
+   wxColour const *m_ColourBG;
+};
+
+/// this object doesn't do anything at all
+class wxLayoutObjectLineBreak : public wxLayoutObjectBase
+{
+public:
+   virtual wxLayoutObjectType GetType(void) const { return WXLO_TYPE_LINEBREAK; }
+};
+
+
+class wxLayoutPrintout;
+
+/**
+   This class provides a high level abstraction to the wxFText
+   classes.
+   It handles most of the character events with its own callback
+   functions, providing an editing ability. All events which cannot be
+   handled get passed to the parent window's handlers.
+*/
+class wxLayoutList : public wxLayoutObjectList
+{
+public:
+   wxLayoutList();
+   
+   /// Destructor.
+   ~wxLayoutList();
+
+   /// adds an object:
+   void AddObject(wxLayoutObjectBase *obj);
+   void AddText(String const &txt);
+
+   void LineBreak(void);
+   void SetFont(int family, int size, int style,
+                int weight, int underline,
+                wxColour const *fg,
+                wxColour const *bg);
+   void SetFont(int family=-1, int size = -1, int style=-1,
+                int weight=-1, int underline = -1,
+                char const *fg = (const char *) NULL,
+                char const *bg = (const char *) NULL);
+   inline void SetFontFamily(int family) { SetFont(family); }
+   inline void SetFontSize(int size) { SetFont(-1,size); }
+   inline void SetFontStyle(int style) { SetFont(-1,-1,style); }
+   inline void SetFontWeight(int weight) { SetFont(-1,-1,-1,weight); }
+   inline void SetFontUnderline(bool ul) { SetFont(-1,-1,-1,-1,(int)ul); }
+   inline void SetFontColour(char const *fg, char const *bg = (const char *) NULL) { SetFont(-1,-1,-1,-1,-1,fg,bg); }
+      
+   
+   /** Draw the list on a given DC.
+       @param findObject if true, return the object occupying the
+       position specified by coords
+       @param coords position where to find the object
+       @pageNo if > 0, print only that page of a document (for
+       printing)
+       @reallyDraw set this to false if you don't want to draw but just calculate the coordinates
+       @return if findObject == true, the object or NULL
+   */
+   wxLayoutObjectBase *Draw(wxDC &dc, bool findObject = false,
+                            wxPoint const &coords = wxPoint(0,0),
+                            int pageNo = -1, bool reallyDraw = true);
+
+#ifdef WXLAYOUT_DEBUG
+   void Debug(void);
+   void ShowCurrentObject();
+#endif
+
+   
+   /// for access by wxLayoutWindow:
+   void GetSize(CoordType *max_x, CoordType *max_y,
+                CoordType *lineHeight);
+
+   
+   /**@name Functionality for editing */
+   //@{
+   /// set list editable or read only
+   void SetEditable(bool editable = true) { m_Editable = editable; }
+   /// return true if list is editable
+   bool IsEditable(void) const { return m_Editable; }
+   /// move cursor, returns true if it could move to the desired position
+   bool MoveCursor(int dx = 0, int dy = 0);
+   void SetCursor(wxPoint const &p) { m_CursorPosition = p; }
+   wxPoint GetCursor(void) const { return m_CursorPosition; }
+   /// delete one or more cursor positions
+   void Delete(CoordType count = 1);
+   void Insert(String const &text);
+   void Insert(wxLayoutObjectBase *obj);
+   void Clear(int family = wxROMAN, int size=12, int style=wxNORMAL, int weight=wxNORMAL,
+                    int underline=0, char const *fg="black", char const *bg="white");
+
+   /// return a pointer to the default settings:
+   wxLayoutObjectCmd const *GetDefaults(void) const { return m_DefaultSetting ; }
+
+   wxLayoutObjectList::iterator FindCurrentObject(CoordType *offset = (CoordType *) NULL);
+   // get the length of the line with the object pointed to by i, offs 
+   // only used to decide whether we are before or after linebreak
+   CoordType GetLineLength(wxLayoutObjectList::iterator i,
+                           CoordType offs = 0);
+   wxLayoutPrintout *MakePrintout(wxString const &name);
+
+//@}
+protected:
+   /// font parameters:
+   int m_FontFamily, m_FontStyle, m_FontWeight;
+   int m_FontPtSize;
+   bool m_FontUnderline;
+   /// colours:
+   wxColour const * m_ColourFG;
+   wxColour const * m_ColourBG;
+   /// the default setting:
+   wxLayoutObjectCmd *m_DefaultSetting;
+   
+   /// needs recalculation?
+   bool m_dirty;
+
+   // the currently updated line:
+   /// where do we draw next:
+   wxPoint   m_Position;
+   /// the height of the current line:
+   CoordType m_LineHeight;
+   /// maximum drawn x position so far
+   CoordType m_MaxX;
+   /// maximum drawn y position:
+   CoordType m_MaxY;
+
+   //---- this is needed for editing:
+   /// where is the text cursor:
+   wxPoint   m_CursorPosition;
+   /// which is the last line
+   CoordType m_MaxLine;
+   /// can we edit it?
+   bool      m_Editable;
+   /// find the object to the cursor position and returns the offset
+   /// in there
+   wxLayoutObjectList::iterator FindObjectCursor(wxPoint *cpos, CoordType *offset = (CoordType *) NULL);
+   
+};
+
+class wxLayoutPrintout: public wxPrintout
+{
+ public:
+   wxLayoutPrintout(wxLayoutList &llist, wxString const & title = "My printout"):wxPrintout(title)
+      { m_llist = &llist; m_maxPage = 0; }
+  bool OnPrintPage(int page);
+  bool HasPage(int page);
+  bool OnBeginDocument(int startPage, int endPage);
+   void GetPageInfo(int *minPage, int *maxPage, int *selPageFrom, int
+                    *selPageTo);
+private:
+   wxLayoutList *m_llist;
+   int           m_maxPage;
+};
+
+#endif // WXLLIST_H
--- a/user/wxLayout/wxlparser.cpp
+++ b/user/wxLayout/wxlparser.cpp
@@ -0,0 +1,186 @@
+/*-*- c++ -*-********************************************************
+ * wxlparser.h : parsers,  import/export for wxLayoutList           *
+ *                                                                  *
+ * (C) 1998 by Karsten Ball<6C>der (Ballueder@usa.net)                 *
+ *                                                                  *
+ * $Id$
+ *******************************************************************/
+
+#ifdef __GNUG__
+#   pragma implementation "wxlparser.h"
+#endif
+
+#include   "wxllist.h"
+#include   "wxlparser.h"
+
+#define   BASE_SIZE 12
+
+void wxLayoutImportText(wxLayoutList &list, String const &str)
+{
+   char * cptr = (char *)str.c_str(); // string gets changed only temporarily
+   const char * begin = cptr;
+   char  backup;
+   
+   for(;;)
+   {
+      begin = cptr++;
+      while(*cptr && *cptr != '\n')
+         cptr++;
+      backup = *cptr;
+      *cptr = '\0';
+      list.Insert(begin);
+      *cptr = backup;
+      if(backup == '\n')
+         list.LineBreak();
+      else if(backup == '\0') // reached end of string
+         break;
+      cptr++;
+   }
+}
+
+static
+String wxLayoutExportCmdAsHTML(wxLayoutObjectCmd const & cmd,
+                                 wxLayoutStyleInfo **lastStylePtr)
+{
+   static char buffer[20];
+   String html;
+   
+   wxLayoutStyleInfo *si = cmd.GetStyle();
+   wxLayoutStyleInfo *last_si = NULL;
+
+   int size, sizecount;
+   
+   if(lastStylePtr != NULL)
+      last_si = *lastStylePtr;
+   
+   html += "<font ";
+
+   html +="color=";
+   sprintf(buffer,"\"#%02X%02X%02X\"", si->fg_red,si->fg_green,si->fg_blue);
+   html += buffer;
+
+
+   html += " bgcolor=";
+   sprintf(buffer,"\"#%02X%02X%02X\"", si->bg_red,si->bg_green,si->bg_blue);
+   html += buffer;
+
+   switch(si->family)
+   {
+   case wxSWISS:
+   case wxMODERN:
+      html += " face=\"Arial,Helvetica\""; break;
+   case wxROMAN:
+      html += " face=\"Times New Roman, Times\""; break;
+   case wxTELETYPE:
+      html += " face=\"Courier New, Courier\""; break;
+   default:
+      ;
+   }
+
+   size = BASE_SIZE; sizecount = 0;
+   while(size < si->size && sizecount < 5)
+   {
+      sizecount ++;
+      size = (size*12)/10;
+   }
+   while(size > si->size && sizecount > -5)
+   {
+      sizecount --;
+      size = (size*10)/12;
+   }
+   html += "size=";
+   sprintf(buffer,"%+1d", sizecount);
+   html += buffer;
+
+   html +=">";
+
+   if(last_si != NULL)
+      html ="</font>"+html; // terminate any previous font command
+
+   if((si->weight == wxBOLD) && ( (!last_si) || (last_si->weight != wxBOLD)))
+      html += "<b>";
+   else
+      if(si->weight != wxBOLD && ( last_si && (last_si->weight == wxBOLD)))
+         html += "</b>";
+
+   if(si->style == wxSLANT)
+      si->style = wxITALIC; // the same for html
+   
+   if((si->style == wxITALIC) && ( (!last_si) || (last_si->style != wxITALIC)))
+      html += "<i>";
+   else
+      if(si->style != wxITALIC && ( last_si && (last_si->style == wxITALIC)))
+         html += "</i>";
+
+   if(si->underline && ( (!last_si) || ! last_si->underline))
+      html += "<u>";
+   else if(si->underline == false && ( last_si && last_si->underline))
+      html += "</u>";
+   
+   if(last_si)
+      delete last_si;
+   *lastStylePtr = si;
+   return html;
+}
+
+
+
+#define   WXLO_IS_TEXT(type) \
+( (type == WXLO_TYPE_TEXT || type == WXLO_TYPE_LINEBREAK) \
+  || (type == WXLO_TYPE_CMD \
+      && mode == WXLO_EXPORT_AS_HTML))
+
+
+  
+   wxLayoutExportObject *wxLayoutExport(wxLayoutList &list,
+                                        wxLayoutList::iterator &from,
+                                        wxLayoutExportMode mode)
+{
+   if(from == list.end())
+      return NULL;
+   
+   wxLayoutObjectType   type = (*from)->GetType();
+   wxLayoutExportObject     * export = new wxLayoutExportObject();
+
+   static wxLayoutStyleInfo *s_si = NULL;
+   
+   if( mode == WXLO_EXPORT_AS_OBJECTS || ! WXLO_IS_TEXT(type)) // simple case
+   {
+      export->type = WXLO_EXPORT_OBJECT;
+      export->content.object = *from;
+      from++;
+      return export;
+   }
+
+   String *str = new String();
+   
+   // text must be concatenated
+   while(from != list.end() && WXLO_IS_TEXT(type))
+   {
+      switch(type)
+      {
+      case WXLO_TYPE_TEXT:
+         *str += ((wxLayoutObjectText *)*from)->GetText();
+         break;
+      case WXLO_TYPE_LINEBREAK:
+         if(mode == WXLO_EXPORT_AS_HTML)
+            *str += "<br>";
+         *str += '\n';
+         break;
+      case WXLO_TYPE_CMD:
+         //wxASSERT(mode == WXLO_EXPORT_AS_HTML,"reached cmd object in text mode")
+         assert(mode == WXLO_EXPORT_AS_HTML);
+         *str += wxLayoutExportCmdAsHTML(*(wxLayoutObjectCmd const
+                                           *)*from, &s_si);
+         break;
+      default:  // ignore icons
+         ;
+      }
+      from++;
+      if(from != list.end())
+         type = (*from)->GetType();
+   }
+   export->type = (mode == WXLO_EXPORT_AS_HTML) ?  WXLO_EXPORT_HTML : WXLO_EXPORT_TEXT;
+   export->content.text = str;
+   return export;
+}
--- a/user/wxLayout/wxlparser.h
+++ b/user/wxLayout/wxlparser.h
@@ -0,0 +1,57 @@
+/*-*- c++ -*-********************************************************
+ * wxlparser.h : parsers,  import/export for wxLayoutList           *
+ *                                                                  *
+ * (C) 1998 by Karsten Ball<6C>der (Ballueder@usa.net)                 *
+ *                                                                  *
+ * $Id$
+ *******************************************************************/
+#ifndef WXLPARSER_H
+#   define   WXLPARSER_H
+
+#ifdef __GNUG__
+#   pragma interface "wxlparser.h"
+#endif
+
+#ifndef   NULL
+#   define   NULL 0
+#endif
+
+enum wxLayoutExportType
+{
+   WXLO_EXPORT_TEXT,        
+   WXLO_EXPORT_HTML,        
+   WXLO_EXPORT_OBJECT
+};
+
+enum wxLayoutExportMode
+{
+   WXLO_EXPORT_AS_TEXT,
+   WXLO_EXPORT_AS_TEXT_AND_COMMANDS,
+   WXLO_EXPORT_AS_HTML,
+   WXLO_EXPORT_AS_OBJECTS
+};
+
+struct wxLayoutExportObject
+{
+   wxLayoutExportType type;
+   union
+   {
+      String           *text;
+      wxLayoutObjectBase *object;
+   }content;
+   ~wxLayoutExportObject()
+      {
+         if(type == WXLO_EXPORT_TEXT || type == WXLO_EXPORT_HTML)
+            delete content.text;
+      }
+};
+
+/// import text into a wxLayoutList (including linefeeds):
+void wxLayoutImportText(wxLayoutList &list, String const &str);
+
+
+wxLayoutExportObject *wxLayoutExport(wxLayoutList &list,
+                               wxLayoutList::iterator &from,
+                               wxLayoutExportMode WXLO_EXPORT_AS_TEXT);
+
+#endif //WXLPARSER_H
--- a/user/wxLayout/wxlwindow.cpp
+++ b/user/wxLayout/wxlwindow.cpp
@@ -0,0 +1,194 @@
+/*-*- c++ -*-********************************************************
+ * wxLwindow.h : a scrolled Window for displaying/entering rich text*
+ *                                                                  *
+ * (C) 1998 by Karsten Ball<6C>der (Ballueder@usa.net)                 *
+ *                                                                  *
+ * $Id$
+ *******************************************************************/
+
+#ifdef __GNUG__
+#   pragma implementation "wxlwindow.h"
+#endif
+
+#include   "wxlwindow.h"
+
+#define   VAR(x)   cout << #x"=" << x << endl;
+
+BEGIN_EVENT_TABLE(wxLayoutWindow,wxScrolledWindow)
+   EVT_PAINT    (wxLayoutWindow::OnPaint)
+   EVT_CHAR     (wxLayoutWindow::OnChar)
+   EVT_LEFT_DOWN(wxLayoutWindow::OnMouse)
+END_EVENT_TABLE()
+
+wxLayoutWindow::wxLayoutWindow(wxWindow *parent)
+   : wxScrolledWindow(parent, -1, wxDefaultPosition, wxDefaultSize,
+                      wxHSCROLL | wxVSCROLL | wxBORDER)
+
+{
+   m_ScrollbarsSet = false;
+   m_EventId = -1;
+}
+
+#ifdef __WXMSW__
+long
+wxLayoutWindow::MSWGetDlgCode()
+{
+   // if we don't return this, we won't get OnChar() events
+   return DLGC_WANTCHARS | DLGC_WANTARROWS | DLGC_WANTMESSAGE;
+}
+#endif //MSW
+
+
+void
+wxLayoutWindow::OnMouse(wxMouseEvent& event)
+{
+   SetFocus();
+
+   if(m_EventId == -1) // nothing to do
+      return;
+   
+   m_FindPos.x = event.GetX();
+   m_FindPos.y = event.GetY();
+   m_FoundObject = (wxLayoutObjectBase *) NULL;
+
+#ifdef   WXLAYOUT_DEBUG
+   //doesn't work, undefined functions
+   //wxLogTrace("OnMouse: (%d, %d)", m_FindPos.x, m_FindPos.y);
+#endif
+   Refresh();
+   if(m_FoundObject)
+   {
+      if(m_EventId != -1)
+      {
+         wxCommandEvent commandEvent(wxEVENT_TYPE_MENU_COMMAND, m_EventId);
+         commandEvent.SetEventObject( this );
+         commandEvent.SetClientData((char *)m_FoundObject);
+         m_ClickPosition = wxPoint(event.GetX(), event.GetY());
+         GetEventHandler()->ProcessEvent(commandEvent);
+      }
+   }
+}
+
+/*
+ * some simple keyboard handling
+ */
+void
+wxLayoutWindow::OnChar(wxKeyEvent& event)
+{
+   if(! m_llist.IsEditable()) // do nothing
+   {
+      event.Skip();
+      return;
+   }
+   
+   long keyCode = event.KeyCode();
+   wxPoint p;
+   CoordType help;
+   
+   switch(event.KeyCode())
+   {
+      case WXK_RIGHT:
+      m_llist.MoveCursor(1);
+      break;
+   case WXK_LEFT:
+      m_llist.MoveCursor(-1);
+      break;
+   case WXK_UP:
+      m_llist.MoveCursor(0,-1);
+      break;
+   case WXK_DOWN:
+      m_llist.MoveCursor(0,1);
+      break;
+   case WXK_PRIOR:
+      m_llist.MoveCursor(0,-20);
+      break;
+   case WXK_NEXT:
+      m_llist.MoveCursor(0,20);
+      break;
+   case WXK_HOME:
+      p = m_llist.GetCursor();
+      p.x = 0;
+      m_llist.SetCursor(p);
+      break;
+   case WXK_END:
+      p = m_llist.GetCursor();
+      p.x = m_llist.GetLineLength(m_llist.FindCurrentObject((CoordType *) NULL));
+      m_llist.SetCursor(p);
+      break;
+   case WXK_DELETE :
+      if(event.ControlDown()) // delete to end of line
+      {
+         help = m_llist.GetLineLength(
+            m_llist.FindCurrentObject((CoordType *) NULL))
+            - m_llist.GetCursor().x;
+         m_llist.Delete(help ? help : 1);
+      }
+      else
+         m_llist.Delete(1);
+      break;
+   case WXK_BACK: // backspace
+      if(m_llist.MoveCursor(-1))
+         m_llist.Delete(1);
+      break;
+   case WXK_RETURN:
+      m_llist.LineBreak();
+      break;
+#ifdef WXLAYOUT_DEBUG   
+   case WXK_F1:
+      m_llist.Debug();
+      break;
+#endif 
+   default:
+      if(keyCode < 256 && keyCode >= 32)
+      {
+         String tmp;
+         tmp += keyCode;
+         m_llist.Insert(tmp);
+      }
+      break;
+   }
+   Refresh();
+   UpdateScrollbars();
+}
+
+void
+wxLayoutWindow::OnPaint( wxPaintEvent &WXUNUSED(event)w)  // or: OnDraw(wxDC& dc)
+{
+   wxPaintDC dc( this );  // only when used as OnPaint for OnDraw we
+   PrepareDC( dc );       // can skip the first two lines
+
+   if(m_EventId != -1) // look for keyclicks
+      m_FoundObject = m_llist.Draw(dc,true,m_FindPos);
+   else
+      m_llist.Draw(dc);
+   if(! m_ScrollbarsSet)
+   {
+      m_ScrollbarsSet = true; // avoid recursion
+      UpdateScrollbars();
+   }
+}
+
+void
+wxLayoutWindow::UpdateScrollbars(void)
+{
+   CoordType
+      max_x, max_y, lineHeight;
+   
+   m_llist.GetSize(&max_x, &max_y, &lineHeight);
+   SetScrollbars(10, lineHeight, max_x/10+1, max_y/lineHeight+1);
+   EnableScrolling(true,true);
+}
+
+void
+wxLayoutWindow::Print(void)
+{
+   VAR(wxThePrintSetupData);
+
+   wxPostScriptDC   dc("layout.ps",true,this);
+   if (dc.Ok() && dc.StartDoc((char *)_("Printing message...")))
+   {
+      //dc.SetUserScale(1.0, 1.0);
+      m_llist.Draw(dc);
+      dc.EndDoc();
+   }
+}
--- a/user/wxLayout/wxlwindow.h
+++ b/user/wxLayout/wxlwindow.h
@@ -0,0 +1,70 @@
+/*-*- c++ -*-********************************************************
+ * wxLwindow.h : a scrolled Window for displaying/entering rich text*
+ *                                                                  *
+ * (C) 1998 by Karsten Ball<6C>der (Ballueder@usa.net)                 *
+ *                                                                  *
+ * $Id$
+ *******************************************************************/
+#ifndef WXLWINDOW_H
+#define WXLWINDOW_H
+
+#ifdef __GNUG__
+#   pragma interface "wxlwindow.h"
+#endif
+
+#ifndef USE_PCH
+#  include   <wx/wx.h>
+#endif
+
+#include   "wxllist.h"
+
+class wxLayoutWindow : public wxScrolledWindow
+{
+public:
+   wxLayoutWindow(wxWindow *parent);
+
+   wxLayoutList & GetLayoutList(void) { return m_llist; }
+
+   // clears the window and sets default parameters:
+   void Clear(int family = wxROMAN, int size=12, int style=wxNORMAL, int weight=wxNORMAL,
+              int underline=0, char const *fg="black", char const
+              *bg="white")
+      {
+         GetLayoutList().Clear(family,size,style,weight,underline,fg,bg);
+         SetBackgroundColour( *GetLayoutList().GetDefaults()->GetBGColour());
+      }
+
+   // callbacks
+   // NB: these functions are used as event handlers and must not be virtual
+   //void OnDraw(wxDC &dc);
+   void OnPaint(wxPaintEvent &WXUNUSED(event));
+   void OnMouse(wxMouseEvent& event);
+   void OnChar(wxKeyEvent& event);
+
+#ifdef __WXMSW__
+   virtual long MSWGetDlgCode();
+#endif //MSW
+
+   void UpdateScrollbars(void);
+   void Print(void);
+   void SetEventId(int id) { m_EventId = id; }
+   // what for? Caller doesn't even know object's positions in window
+   //wxPoint const &GetClickPosition(void) const { return m_ClickPosition; }
+   virtual ~wxLayoutWindow() {}
+private:
+   /// for sending events
+   wxWindow *m_Parent;
+   int m_EventId;
+   /// the layout list to be displayed
+   wxLayoutList m_llist;
+   /// have we already set the scrollbars?
+   bool m_ScrollbarsSet;
+   /// if we want to find an object:
+   wxPoint m_FindPos;
+   wxLayoutObjectBase *m_FoundObject;
+   wxPoint m_ClickPosition;
+
+   DECLARE_EVENT_TABLE()
+};
+
+#endif