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

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/WX_2_1_14@6885 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-03-20 18:41:55 +00:00
43 changed files with 286 additions and 475 deletions
--- a/contrib/src/mmedia/sndwin.cpp
+++ b/contrib/src/mmedia/sndwin.cpp
@@ -98,11 +98,8 @@ wxSoundStreamWin::wxSoundStreamWin()

  m_waiting_for = FALSE;

-  if (!OpenDevice(wxSOUND_OUTPUT)) {
-    m_snderror = wxSOUND_NOERROR; //next call to OpenDevice won't do this
-    if (!OpenDevice(wxSOUND_INPUT))
-      return;
-  }
+  if (!OpenDevice(wxSOUND_OUTPUT))
+    return;

  CloseDevice();
 }
--- a/descrip.mms
+++ b/descrip.mms
@@ -54,18 +54,12 @@ motif : setup.h
 	$(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1)
 	set default [-.dialogs]
 	$(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1)
-	set default [-.drawing]
-	$(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1)
 	set default [-.image]
 	$(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1)
-	set default [-.mdi]
-	$(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1)
 	set default [-.menu]
 	$(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1)
 	set default [-.minimal]
 	$(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1)
-	set default [-.resource]
-	$(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1)
 	set default [--.utils.dialoged.src]
 	$(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1)
 	set default [--]
--- a/distrib/msw/patch.rsp
+++ b/distrib/msw/patch.rsp
@@ -1,4 +1,16 @@
-include/wx/datetime.inl
-src/msw/treectrl.cpp
-samples/treectrl/TreectrlVC.dsp
+include/wx/wxchar.h
+include/wx/msw/setup.h
+samples/dnd/*.wxr
+src/unix/fontutil.cpp
+src/common/fontmap.cpp
+src/msw/statbox.cpp
+include/wx/msw/statbox.h
+utils/ogl/samples/ogledit/palette.cpp
+utils/ogl/samples/studio/shapes.cpp
+utils/ogl/samples/studio/shapes.h
+utils/ogl/samples/studio/studio.h
+utils/dialoged/src/dialoged.cpp
+utils/dialoged/src/dlghndlr.cpp
+utils/dialoged/src/reseditr.cpp
+utils/dialoged/src/dialoged.h

--- a/distrib/msw/zipdist.bat
+++ b/distrib/msw/zipdist.bat
@@ -89,7 +89,7 @@ zip32 -@ %dest\tiff.zip < %src\distrib\msw\tiff.rsp
 rem Dialog Editor source and binary
 erase %dest\dialoged_source.zip
 zip32 -@ %dest\dialoged_source.zip < %src\distrib\msw\dialoged.rsp
-zip32 -j %dest\dialoged.zip %dest\dialoged_source.zip %src\bin\dialoged.exe %src\docs\winhelp\dialoged.hlp %src\docs\winhelp\dialoged.cnt
+zip32 -j %dest\dialoged.zip %dest\dialoged_source.zip %src\bin\dialoged.exe %src\bin\dialoged.hlp %src\bin\dialoged.cnt
 erase %dest\dialoged_source.zip

 rem Misc. utils not in the main distribution
@@ -143,7 +143,6 @@ erase /Y contrib\docs\winhelp\mmedia.*
 erase /Y contrib\docs\winhelp\stc.*
 erase /Y contrib\docs\pdf\*.*
 deltree /Y contrib\docs\latex\ogl
-erase /Y src\mingegcs.bat

 rem Now copy some binary files to 'bin'
 if not isdir bin mkdir bin
--- a/docs/html/i18n.htm
+++ b/docs/html/i18n.htm
@@ -51,7 +51,7 @@ translations as of wxWindows 2.2.

 <tr>
    <td valign=center>French (standard)</td>
-    <td align=center valign=center><IMG SRC="icons/yes.gif" ALT="Done"></td>
+    <td align=center valign=center><IMG SRC="icons/no.gif" ALT="Not yet"></td>
    <td align=center valign=center><A HREF="mailto:Stephane.Junique@optics.kth.se">Stephane Junique</A>,
                                   <A HREF="mailto:lionel.allorge@lunerouge.com">Lionel Allorge</A>
                                   <A HREF="mailto:Gilles.Guyot@Krypton.be">Gilles Guyot</A>
--- a/docs/html/news.htm
+++ b/docs/html/news.htm
@@ -18,7 +18,7 @@ News
 </tr>
 </table>

-<H3><a name="release2_1_14">March 21st, 2000</H3><P>
+<H3><a name="release2_1_14">March 19th, 2000</H3><P>

 <ul>
 <li><a href="download.htm" target=wxmain>wxWindows 2.1.14</a> is now available for Windows, Motif and GTK.
--- a/docs/html/platform.htm
+++ b/docs/html/platform.htm
@@ -81,7 +81,7 @@ other flavours of BSD, ...

 <tr>
 <td bgcolor="#FFFFFF" align=center valign=center rowspan=3>Solaris</td>
-     <td>wxMotif with Sun CC 4.2</td><td align=center><IMG SRC="icons/yes.gif" ALT=Ok></td><td>VZ</td><td><tt>-mt</tt> should be added to <tt>CFLAGS</tt> for MT compilation</td>
+     <td>wxMotif with Sun CC 4.2</td><td align=center><IMG SRC="icons/yes.gif" ALT=Ok></td><td>VZ</td><td>Thread support must be disabled on system with not MT-safe X11</td>
 <tr> <td>wxMotif with gcc</td><td align=center><IMG SRC="icons/yes.gif" ALT=Ok></td><td><br></td><td><br></td>
 <tr> <td>wxGTK with gcc</td><td align=center><IMG SRC="icons/yes.gif" ALT=Ok></td><td><br></td><td><br></td>
 </tr>
--- a/docs/latex/wx/notebook.tex
+++ b/docs/latex/wx/notebook.tex
@@ -19,16 +19,6 @@ managed by wxNotebook.

 <wx/notebook.h>

-\wxheading{Window styles}
-
-\twocolwidtha{5cm}
-\begin{twocollist}\itemsep=0pt
-\twocolitem{\windowstyle{wxNB\_FIXEDWIDTH}}{Make all tabs of equal width}
-\twocolitem{\windowstyle{wxNB\_LEFT}}{Put the tabs on the left side of the notebook}
-\twocolitem{\windowstyle{wxNB\_RIGHT}}{Put the tabs on the right side of the notebook}
-\twocolitem{\windowstyle{wxNB\_BOTTOM}}{Put the tabs on the bottom of the notebook}
-\end{twocollist}
-
 \wxheading{Event handling}

 To process input from a notebook control, use the following event handler macros to direct input to member
@@ -72,9 +62,7 @@ Note that sometimes you can reduce flicker by passing the wxCLIP\_CHILDREN windo
 \docparam{size}{The window size.}

 \docparam{style}{The window style. Its value is a bit list of zero or more of {\bf wxTC\_MULTILINE},
- {\bf wxTC\_RIGHTJUSTIFY}, {\bf wxTC\_FIXEDWIDTH} and {\bf wxTC\_OWNERDRAW}
- possibly combined with one of {\bf wxNB\_LEFT}, {\bf wxNB\_RIGHT} or 
- {\bf wxNB\_BOTTOM}.}
+ {\bf wxTC\_RIGHTJUSTIFY}, {\bf wxTC\_FIXEDWIDTH} and {\bf wxTC\_OWNERDRAW}.}

 \docparam{name}{The name of the control (used only under Motif).}

--- a/docs/latex/wx/treectrl.tex
+++ b/docs/latex/wx/treectrl.tex
@@ -60,17 +60,6 @@ functions that take a \helpref{wxTreeEvent}{wxtreeevent} argument.
 \helpref{wxTreeItemData}{wxtreeitemdata}, \helpref{wxTreeCtrl overview}{wxtreectrloverview}, \helpref{wxListBox}{wxlistbox}, \helpref{wxListCtrl}{wxlistctrl},\rtfsp
 \helpref{wxImageList}{wximagelist}, \helpref{wxTreeEvent}{wxtreeevent}

-\wxheading{Win32 notes}
-
-wxTreeCtrl class uses the standard common treeview control under Win32
-implemented in the system library {\tt comctl32.dll}. Some versions of this
-library are known to have bugs with handling the tree control colours: the
-usual symptom is that the expanded items leave black (or otherwise incorrectly
-coloured) background behind them, especially for the controls using non
-default background colour. The recommended solution is to upgrade the {\tt comctl32.dll} 
-to a newer version: see 
-\urlref{http://www.microsoft.com/msdownload/ieplatform/ie/comctrlx86.asp}{http://www.microsoft.com/msdownload/ieplatform/ie/comctrlx86.asp}.
-
 \latexignore{\rtfignore{\wxheading{Members}}}

 \membersection{wxTreeCtrl::wxTreeCtrl}\label{wxtreectrlconstr}
--- a/docs/latex/wx/tunicode.tex
+++ b/docs/latex/wx/tunicode.tex
@@ -96,7 +96,7 @@ section.

 \subsection{Unicode support in wxWindows}

-In wxWindows, the code fragment from above should be written instead:
+In wxWindows, the code fragment froim above should be written instead:

 \begin{verbatim}
    wxChar ch = wxT('*');
--- a/docs/readme.txt
+++ b/docs/readme.txt
@@ -15,8 +15,8 @@ tree controls on Unix, they are emulated.
 A detailed 1100-page reference manual is supplied in HTML, PDF and
 Windows Help form: see the docs hierarchy.

-For a quick start, point your Web browser at docs/html/index.htm for a
-list of important documents and samples.
+For a quick start, point your Web browser at docs/html/index.htm for a list of
+important documents and samples.

 Changes in this release
 -----------------------
@@ -109,12 +109,11 @@ wxWindows for Windows distribution
 As well as the core source, the Windows setup contains:

 - Windows Help versions of the documentation (docs/winhelp);
- OGL 3 (Object Graphics Library, in contrib/src/ogl);
+- wxGLCanvas (OpenGL integration, in utils/glcanvas);
+- OGL 3 (Object Graphics Library, in utils/ogl);
+- wxTreeLayout (for tree drawing, in utils/wxtree);
 - a Dialog Editor binary;
- a Tex2RTF binary;
- Life! sample binary;
- the JPEG library source;
- the TIFF library source.
+- the JPEG library.

 setup.exe               Setup file (Windows 95/98, NT)
 setup.*                 Other setup files
--- a/docs/tech/index.txt
+++ b/docs/tech/index.txt
@@ -2,5 +2,4 @@ TN0001   How to add a new sample
 TN0002   wxWindows translator guide
 TN0003   Adding wxWindows class documentation

-
 Version: $Id$
--- a/include/wx/arrimpl.cpp
+++ b/include/wx/arrimpl.cpp
@@ -21,13 +21,7 @@
 *****************************************************************************/

 // needed to resolve the conflict between global T and macro parameter T
-
-// VC++ can't cope with string concatenation in Unicode mode
-#if defined(wxUSE_UNICODE) && wxUSE_UNICODE
-#define _WX_ERROR_REMOVE2(x)     wxT("bad index in ::RemoveAt()")
-#else
 #define _WX_ERROR_REMOVE2(x)     wxT("bad index in " #x "::RemoveAt()")
-#endif

 // macro implements remaining (not inline) methods of template list
 // (it's private to this file)
--- a/include/wx/datetime.inl
+++ b/include/wx/datetime.inl
@@ -40,19 +40,19 @@
    const long wxDateTime::TIME_T_FACTOR = 1000l;
 #endif // wxDEFINE_TIME_CONSTANTS

-WXDLLEXPORT bool wxDateTime::IsInStdRange() const
+bool wxDateTime::IsInStdRange() const
 {
    return m_time >= 0l && (m_time / TIME_T_FACTOR) < LONG_MAX;
 }

 /* static */
-WXDLLEXPORT wxDateTime wxDateTime::Now()
+wxDateTime wxDateTime::Now()
 {
    return wxDateTime(*GetTmNow());
 }

 /* static */
-WXDLLEXPORT wxDateTime wxDateTime::Today()
+wxDateTime wxDateTime::Today()
 {
    struct tm *tm = GetTmNow();
    tm->tm_hour =
@@ -63,7 +63,7 @@ WXDLLEXPORT wxDateTime wxDateTime::Today()
 }

 #if (!(defined(__VISAGECPP__) && __IBMCPP__ >= 400))
-WXDLLEXPORT wxDateTime& wxDateTime::Set(time_t timet)
+wxDateTime& wxDateTime::Set(time_t timet)
 {
    // assign first to avoid long multiplication overflow!
    m_time = timet;
@@ -73,42 +73,42 @@ WXDLLEXPORT wxDateTime& wxDateTime::Set(time_t timet)
 }
 #endif

-WXDLLEXPORT wxDateTime& wxDateTime::SetToCurrent()
+wxDateTime& wxDateTime::SetToCurrent()
 {
    *this = Now();
    return *this;
 }

 #if (!(defined(__VISAGECPP__) && __IBMCPP__ >= 400))
-WXDLLEXPORT wxDateTime::wxDateTime(time_t timet)
+wxDateTime::wxDateTime(time_t timet)
 {
    Set(timet);
 }
 #endif

-WXDLLEXPORT wxDateTime::wxDateTime(const struct tm& tm)
+wxDateTime::wxDateTime(const struct tm& tm)
 {
    Set(tm);
 }

-WXDLLEXPORT wxDateTime::wxDateTime(const Tm& tm)
+wxDateTime::wxDateTime(const Tm& tm)
 {
    Set(tm);
 }

-WXDLLEXPORT wxDateTime::wxDateTime(double jdn)
+wxDateTime::wxDateTime(double jdn)
 {
    Set(jdn);
 }

-WXDLLEXPORT wxDateTime& wxDateTime::Set(const Tm& tm)
+wxDateTime& wxDateTime::Set(const Tm& tm)
 {
    wxASSERT_MSG( tm.IsValid(), _T("invalid broken down date/time") );

    return Set(tm.mday, (Month)tm.mon, tm.year, tm.hour, tm.min, tm.sec);
 }

-WXDLLEXPORT wxDateTime::wxDateTime(wxDateTime_t hour,
+wxDateTime::wxDateTime(wxDateTime_t hour,
                       wxDateTime_t minute,
                       wxDateTime_t second,
                       wxDateTime_t millisec)
@@ -116,7 +116,7 @@ WXDLLEXPORT wxDateTime::wxDateTime(wxDateTime_t hour,
    Set(hour, minute, second, millisec);
 }

-WXDLLEXPORT wxDateTime::wxDateTime(wxDateTime_t day,
+wxDateTime::wxDateTime(wxDateTime_t day,
                       Month        month,
                       int          year,
                       wxDateTime_t hour,
@@ -131,14 +131,14 @@ WXDLLEXPORT wxDateTime::wxDateTime(wxDateTime_t day,
 // wxDateTime accessors
 // ----------------------------------------------------------------------------

-WXDLLEXPORT wxLongLong wxDateTime::GetValue() const
+wxLongLong wxDateTime::GetValue() const
 {
    wxASSERT_MSG( IsValid(), _T("invalid wxDateTime"));

    return m_time;
 }

-WXDLLEXPORT time_t wxDateTime::GetTicks() const
+time_t wxDateTime::GetTicks() const
 {
    wxASSERT_MSG( IsValid(), _T("invalid wxDateTime"));
    if ( !IsInStdRange() )
@@ -149,29 +149,29 @@ WXDLLEXPORT time_t wxDateTime::GetTicks() const
    return (time_t)((m_time / (long)TIME_T_FACTOR).GetLo());
 }

-WXDLLEXPORT bool wxDateTime::SetToLastWeekDay(WeekDay weekday,
+bool wxDateTime::SetToLastWeekDay(WeekDay weekday,
                                  Month month,
                                  int year)
 {
    return SetToWeekDay(weekday, -1, month, year);
 }

-WXDLLEXPORT wxDateTime wxDateTime::GetWeekDayInSameWeek(WeekDay weekday) const
+wxDateTime wxDateTime::GetWeekDayInSameWeek(WeekDay weekday) const
 {
    MODIFY_AND_RETURN( SetToWeekDayInSameWeek(weekday) );
 }

-WXDLLEXPORT wxDateTime wxDateTime::GetNextWeekDay(WeekDay weekday) const
+wxDateTime wxDateTime::GetNextWeekDay(WeekDay weekday) const
 {
    MODIFY_AND_RETURN( SetToNextWeekDay(weekday) );
 }

-WXDLLEXPORT wxDateTime wxDateTime::GetPrevWeekDay(WeekDay weekday) const
+wxDateTime wxDateTime::GetPrevWeekDay(WeekDay weekday) const
 {
    MODIFY_AND_RETURN( SetToPrevWeekDay(weekday) );
 }

-WXDLLEXPORT wxDateTime wxDateTime::GetWeekDay(WeekDay weekday,
+wxDateTime wxDateTime::GetWeekDay(WeekDay weekday,
                                  int n,
                                  Month month,
                                  int year) const
@@ -181,7 +181,7 @@ WXDLLEXPORT wxDateTime wxDateTime::GetWeekDay(WeekDay weekday,
    return dt.SetToWeekDay(weekday, n, month, year) ? dt : wxInvalidDateTime;
 }

-WXDLLEXPORT wxDateTime wxDateTime::GetLastWeekDay(WeekDay weekday,
+wxDateTime wxDateTime::GetLastWeekDay(WeekDay weekday,
                                      Month month,
                                      int year)
 {
@@ -190,19 +190,19 @@ WXDLLEXPORT wxDateTime wxDateTime::GetLastWeekDay(WeekDay weekday,
    return dt.SetToLastWeekDay(weekday, month, year) ? dt : wxInvalidDateTime;
 }

-WXDLLEXPORT wxDateTime wxDateTime::GetWeek(wxDateTime_t numWeek, WeekDay weekday) const
+wxDateTime wxDateTime::GetWeek(wxDateTime_t numWeek, WeekDay weekday) const
 {
    wxDateTime dt(*this);

    return dt.SetToTheWeek(numWeek, weekday) ? dt : wxInvalidDateTime;
 }

-WXDLLEXPORT wxDateTime wxDateTime::GetLastMonthDay(Month month, int year) const
+wxDateTime wxDateTime::GetLastMonthDay(Month month, int year) const
 {
    MODIFY_AND_RETURN( SetToLastMonthDay(month, year) );
 }

-WXDLLEXPORT wxDateTime wxDateTime::GetYearDay(wxDateTime_t yday) const
+wxDateTime wxDateTime::GetYearDay(wxDateTime_t yday) const
 {
    MODIFY_AND_RETURN( SetToYearDay(yday) );
 }
@@ -211,46 +211,46 @@ WXDLLEXPORT wxDateTime wxDateTime::GetYearDay(wxDateTime_t yday) const
 // wxDateTime comparison
 // ----------------------------------------------------------------------------

-WXDLLEXPORT bool wxDateTime::IsEqualTo(const wxDateTime& datetime) const
+bool wxDateTime::IsEqualTo(const wxDateTime& datetime) const
 {
    wxASSERT_MSG( IsValid() && datetime.IsValid(), _T("invalid wxDateTime"));

    return m_time == datetime.m_time;
 }

-WXDLLEXPORT bool wxDateTime::IsEarlierThan(const wxDateTime& datetime) const
+bool wxDateTime::IsEarlierThan(const wxDateTime& datetime) const
 {
    wxASSERT_MSG( IsValid() && datetime.IsValid(), _T("invalid wxDateTime"));

    return m_time < datetime.m_time;
 }

-WXDLLEXPORT bool wxDateTime::IsLaterThan(const wxDateTime& datetime) const
+bool wxDateTime::IsLaterThan(const wxDateTime& datetime) const
 {
    wxASSERT_MSG( IsValid() && datetime.IsValid(), _T("invalid wxDateTime"));

    return m_time > datetime.m_time;
 }

-WXDLLEXPORT bool wxDateTime::IsStrictlyBetween(const wxDateTime& t1,
+bool wxDateTime::IsStrictlyBetween(const wxDateTime& t1,
                                   const wxDateTime& t2) const
 {
    // no need for assert, will be checked by the functions we call
    return IsLaterThan(t1) && IsEarlierThan(t2);
 }

-WXDLLEXPORT bool wxDateTime::IsBetween(const wxDateTime& t1, const wxDateTime& t2) const
+bool wxDateTime::IsBetween(const wxDateTime& t1, const wxDateTime& t2) const
 {
    // no need for assert, will be checked by the functions we call
    return IsEqualTo(t1) || IsEqualTo(t2) || IsStrictlyBetween(t1, t2);
 }

-WXDLLEXPORT bool wxDateTime::IsSameDate(const wxDateTime& dt) const
+bool wxDateTime::IsSameDate(const wxDateTime& dt) const
 {
    return (m_time - dt.m_time).Abs() < MILLISECONDS_PER_DAY;
 }

-WXDLLEXPORT bool wxDateTime::IsSameTime(const wxDateTime& dt) const
+bool wxDateTime::IsSameTime(const wxDateTime& dt) const
 {
    // notice that we can't do something like this:
    //
@@ -266,7 +266,7 @@ WXDLLEXPORT bool wxDateTime::IsSameTime(const wxDateTime& dt) const
           tm1.msec == tm2.msec;
 }

-WXDLLEXPORT bool wxDateTime::IsEqualUpTo(const wxDateTime& dt, const wxTimeSpan& ts) const
+bool wxDateTime::IsEqualUpTo(const wxDateTime& dt, const wxTimeSpan& ts) const
 {
    return IsBetween(dt.Substract(ts), dt.Add(ts));
 }
@@ -275,14 +275,14 @@ WXDLLEXPORT bool wxDateTime::IsEqualUpTo(const wxDateTime& dt, const wxTimeSpan&
 // wxDateTime arithmetics
 // ----------------------------------------------------------------------------

-WXDLLEXPORT wxDateTime wxDateTime::Add(const wxTimeSpan& diff) const
+wxDateTime wxDateTime::Add(const wxTimeSpan& diff) const
 {
    wxASSERT_MSG( IsValid(), _T("invalid wxDateTime"));

    return wxDateTime(m_time + diff.GetValue());
 }

-WXDLLEXPORT wxDateTime& wxDateTime::Add(const wxTimeSpan& diff)
+wxDateTime& wxDateTime::Add(const wxTimeSpan& diff)
 {
    wxASSERT_MSG( IsValid(), _T("invalid wxDateTime"));

@@ -291,19 +291,19 @@ WXDLLEXPORT wxDateTime& wxDateTime::Add(const wxTimeSpan& diff)
    return *this;
 }

-WXDLLEXPORT wxDateTime& wxDateTime::operator+=(const wxTimeSpan& diff)
+wxDateTime& wxDateTime::operator+=(const wxTimeSpan& diff)
 {
    return Add(diff);
 }

-WXDLLEXPORT wxDateTime wxDateTime::Substract(const wxTimeSpan& diff) const
+wxDateTime wxDateTime::Substract(const wxTimeSpan& diff) const
 {
    wxASSERT_MSG( IsValid(), _T("invalid wxDateTime"));

    return wxDateTime(m_time - diff.GetValue());
 }

-WXDLLEXPORT wxDateTime& wxDateTime::Substract(const wxTimeSpan& diff)
+wxDateTime& wxDateTime::Substract(const wxTimeSpan& diff)
 {
    wxASSERT_MSG( IsValid(), _T("invalid wxDateTime"));

@@ -312,39 +312,39 @@ WXDLLEXPORT wxDateTime& wxDateTime::Substract(const wxTimeSpan& diff)
    return *this;
 }

-WXDLLEXPORT wxDateTime& wxDateTime::operator-=(const wxTimeSpan& diff)
+wxDateTime& wxDateTime::operator-=(const wxTimeSpan& diff)
 {
    return Substract(diff);
 }

-WXDLLEXPORT wxTimeSpan wxDateTime::Substract(const wxDateTime& datetime) const
+wxTimeSpan wxDateTime::Substract(const wxDateTime& datetime) const
 {
    wxASSERT_MSG( IsValid() && datetime.IsValid(), _T("invalid wxDateTime"));

    return wxTimeSpan(datetime.GetValue() - GetValue());
 }

-WXDLLEXPORT wxDateTime wxDateTime::Add(const wxDateSpan& diff) const
+wxDateTime wxDateTime::Add(const wxDateSpan& diff) const
 {
    return wxDateTime(*this).Add(diff);
 }

-WXDLLEXPORT wxDateTime& wxDateTime::Substract(const wxDateSpan& diff)
+wxDateTime& wxDateTime::Substract(const wxDateSpan& diff)
 {
    return Add(diff.Negate());
 }

-WXDLLEXPORT wxDateTime wxDateTime::Substract(const wxDateSpan& diff) const
+wxDateTime wxDateTime::Substract(const wxDateSpan& diff) const
 {
    return wxDateTime(*this).Substract(diff);
 }

-WXDLLEXPORT wxDateTime& wxDateTime::operator-=(const wxDateSpan& diff)
+wxDateTime& wxDateTime::operator-=(const wxDateSpan& diff)
 {
    return Substract(diff);
 }

-WXDLLEXPORT wxDateTime& wxDateTime::operator+=(const wxDateSpan& diff)
+wxDateTime& wxDateTime::operator+=(const wxDateSpan& diff)
 {
    return Add(diff);
 }
@@ -353,7 +353,7 @@ WXDLLEXPORT wxDateTime& wxDateTime::operator+=(const wxDateSpan& diff)
 // wxDateTime and timezones
 // ----------------------------------------------------------------------------

-WXDLLEXPORT wxDateTime wxDateTime::ToTimezone(const wxDateTime::TimeZone& tz,
+wxDateTime wxDateTime::ToTimezone(const wxDateTime::TimeZone& tz,
                                  bool noDST) const
 {
    MODIFY_AND_RETURN( MakeTimezone(tz, noDST) );
@@ -363,7 +363,7 @@ WXDLLEXPORT wxDateTime wxDateTime::ToTimezone(const wxDateTime::TimeZone& tz,
 // wxTimeSpan construction
 // ----------------------------------------------------------------------------

-WXDLLEXPORT wxTimeSpan::wxTimeSpan(long hours, long minutes, long seconds, long milliseconds)
+wxTimeSpan::wxTimeSpan(long hours, long minutes, long seconds, long milliseconds)
 {
    // assign first to avoid precision loss
    m_diff = hours;
@@ -379,27 +379,27 @@ WXDLLEXPORT wxTimeSpan::wxTimeSpan(long hours, long minutes, long seconds, long
 // wxTimeSpan accessors
 // ----------------------------------------------------------------------------

-WXDLLEXPORT wxLongLong wxTimeSpan::GetSeconds() const
+wxLongLong wxTimeSpan::GetSeconds() const
 {
    return m_diff / 1000l;
 }

-WXDLLEXPORT int wxTimeSpan::GetMinutes() const
+int wxTimeSpan::GetMinutes() const
 {
    return (GetSeconds() / 60l).GetLo();
 }

-WXDLLEXPORT int wxTimeSpan::GetHours() const
+int wxTimeSpan::GetHours() const
 {
    return GetMinutes() / 60;
 }

-WXDLLEXPORT int wxTimeSpan::GetDays() const
+int wxTimeSpan::GetDays() const
 {
    return GetHours() / 24;
 }

-WXDLLEXPORT int wxTimeSpan::GetWeeks() const
+int wxTimeSpan::GetWeeks() const
 {
    return GetDays() / 7;
 }
@@ -408,53 +408,53 @@ WXDLLEXPORT int wxTimeSpan::GetWeeks() const
 // wxTimeSpan arithmetics
 // ----------------------------------------------------------------------------

-WXDLLEXPORT wxTimeSpan wxTimeSpan::Add(const wxTimeSpan& diff) const
+wxTimeSpan wxTimeSpan::Add(const wxTimeSpan& diff) const
 {
    return wxTimeSpan(m_diff + diff.GetValue());
 }

-WXDLLEXPORT wxTimeSpan& wxTimeSpan::Add(const wxTimeSpan& diff)
+wxTimeSpan& wxTimeSpan::Add(const wxTimeSpan& diff)
 {
    m_diff += diff.GetValue();

    return *this;
 }

-WXDLLEXPORT wxTimeSpan wxTimeSpan::Substract(const wxTimeSpan& diff) const
+wxTimeSpan wxTimeSpan::Substract(const wxTimeSpan& diff) const
 {
    return wxTimeSpan(m_diff - diff.GetValue());
 }

-WXDLLEXPORT wxTimeSpan& wxTimeSpan::Substract(const wxTimeSpan& diff)
+wxTimeSpan& wxTimeSpan::Substract(const wxTimeSpan& diff)
 {
    m_diff -= diff.GetValue();

    return *this;
 }

-WXDLLEXPORT wxTimeSpan& wxTimeSpan::Multiply(int n)
+wxTimeSpan& wxTimeSpan::Multiply(int n)
 {
    m_diff *= (long)n;

    return *this;
 }

-WXDLLEXPORT wxTimeSpan wxTimeSpan::Multiply(int n) const
+wxTimeSpan wxTimeSpan::Multiply(int n) const
 {
    return wxTimeSpan(m_diff * (long)n);
 }

-WXDLLEXPORT wxTimeSpan wxTimeSpan::Abs() const
+wxTimeSpan wxTimeSpan::Abs() const
 {
    return wxTimeSpan(GetValue().Abs());
 }

-WXDLLEXPORT bool wxTimeSpan::IsEqualTo(const wxTimeSpan& ts) const
+bool wxTimeSpan::IsEqualTo(const wxTimeSpan& ts) const
 {
    return GetValue() == ts.GetValue();
 }

-WXDLLEXPORT bool wxTimeSpan::IsLongerThan(const wxTimeSpan& ts) const
+bool wxTimeSpan::IsLongerThan(const wxTimeSpan& ts) const
 {
    return GetValue().Abs() > ts.GetValue().Abs();
 }
@@ -463,7 +463,7 @@ WXDLLEXPORT bool wxTimeSpan::IsLongerThan(const wxTimeSpan& ts) const
 // wxDateSpan
 // ----------------------------------------------------------------------------

-WXDLLEXPORT wxDateSpan& 
+wxDateSpan&
 wxDateSpan::operator+=(const wxDateSpan& other)
 {
    m_years += other.m_years;
@@ -474,7 +474,7 @@ wxDateSpan::operator+=(const wxDateSpan& other)
    return *this;
 }

-WXDLLEXPORT wxDateSpan& wxDateSpan::Multiply(int factor)
+wxDateSpan& wxDateSpan::Multiply(int factor)
 {
    m_years *= factor;
    m_months *= factor;
@@ -484,17 +484,17 @@ WXDLLEXPORT wxDateSpan& wxDateSpan::Multiply(int factor)
    return *this;
 }

-WXDLLEXPORT wxDateSpan wxDateSpan::Multiply(int factor) const
+wxDateSpan wxDateSpan::Multiply(int factor) const
 {
    return wxDateSpan(*this).Multiply(factor);
 }

-WXDLLEXPORT wxDateSpan wxDateSpan::Negate() const
+wxDateSpan wxDateSpan::Negate() const
 {
    return wxDateSpan(-m_years, -m_months, -m_weeks, -m_days);
 }

-WXDLLEXPORT wxDateSpan& wxDateSpan::Neg()
+wxDateSpan& wxDateSpan::Neg()
 {
    m_years = -m_years;
    m_months = -m_months;
--- a/include/wx/dynlib.h
+++ b/include/wx/dynlib.h
@@ -70,7 +70,7 @@
    There are no instances of this class, it simply serves as a
    namespace for its static member functions.
 */
-class WXDLLEXPORT wxDllLoader
+class wxDllLoader
 {
 public:
    /** This function loads a shared library into memory, with libname
@@ -103,7 +103,7 @@ private:
 // wxLibrary
 // ----------------------------------------------------------------------------

-class WXDLLEXPORT wxLibrary : public wxObject
+class wxLibrary : public wxObject
 {
 public:
    wxHashTable classTable;
@@ -130,7 +130,7 @@ protected:
 // wxLibraries
 // ----------------------------------------------------------------------------

-class WXDLLEXPORT wxLibraries
+class wxLibraries
 {
 public:
    wxLibraries();
--- a/include/wx/msw/control.h
+++ b/include/wx/msw/control.h
@@ -120,8 +120,8 @@ private:

 #if WXWIN_COMPATIBILITY
    inline void wxControl::Callback(const wxFunction f) { m_callback = f; };
-    inline wxFont& wxControl::GetLabelFont() const { return (wxFont &)GetFont(); }
-    inline wxFont& wxControl::GetButtonFont() const { return (wxFont &)GetFont(); }
+    inline wxFont& wxControl::GetLabelFont() const { return GetFont(); }
+    inline wxFont& wxControl::GetButtonFont() const { return GetFont(); }
    inline void wxControl::SetLabelFont(const wxFont& font) { SetFont(font); }
    inline void wxControl::SetButtonFont(const wxFont& font) { SetFont(font); }
 #endif // WXWIN_COMPATIBILITY
--- a/include/wx/os2/frame.h
+++ b/include/wx/os2/frame.h
@@ -202,33 +202,6 @@ private:
    WXHWND                          m_hWndToolTip;
 #endif // tooltips

-    //
-    // The main handle of a frame window, that used for message processing
-    // is the client handle under PM.  But we still need the frame handle
-    // as well
-    //
-    WXHWND                          m_hFrame;
-
-    //
-    // Handles to child windows of the Frame that we don't have child objects for
-    //
-    WXHWND                          m_hTitleBar;
-    WXHWND                          m_hHScroll;
-    WXHWND                          m_hVScroll;
-
-    //
-    // Swp structures for various client data 
-    // DW: Better off in attached RefData?
-    //
-    SWP                             m_vSwp;
-    SWP                             m_vSwpClient;
-    SWP                             m_vSwpTitleBar;
-    SWP                             m_vSwpMenuBar;
-    SWP                             m_vSwpHScroll;
-    SWP                             m_vSwpVScroll;
-    SWP                             m_vSwpStatusBar;
-    SWP                             m_vSwpToolBar;
-
    DECLARE_EVENT_TABLE()
    DECLARE_DYNAMIC_CLASS(wxFrame)
 };
--- a/12
+++ b/12
@@ -105,5 +105,15 @@ wxOS2 -a wxWindows wxWindows/docs !wxWindows/docs/latex !wxWindows/docs/motif \
      wxWindows/lib wxWindows/samples wxWindows/misc !wxWindows/misc/implib \
      wxWindows/testconf

+wxPython -a wxWindows wxWindows/utils wxWindows/utils/wxPython \
+	!wxWindows/docs \
+	!wxWindows/distrib !wxWindows/include !wxWindows/lib !wxWindows/locale \
+	!wxWindows/misc !wxWindows/samples !wxWindows/src !wxWindows/tests \
+	!wxWindows/user !wxWindows/utils/HelpGen !wxWindows/utils/HelpHTML \
+	!wxWindows/utils/dialoged  !wxWindows/utils/framelayout  \
+	!wxWindows/utils/nplugin  !wxWindows/utils/projgen !wxWindows/utils/serialize \
+	!wxWindows/utils/tex2rtf  !wxWindows/utils/wxMMedia2 \
+	!wxWindows/utils/wxOLE  !wxWindows/utils/wxtree
+
+

-wxStudio wxStudio
--- a/samples/drawing/descrip.mms
+++ b/samples/drawing/descrip.mms
@@ -1,47 +0,0 @@
-#*****************************************************************************
-#                                                                            *
-# Make file for VMS                                                          *
-# Author : J.Jansen (joukj@hrem.stm.tudelft.nl)                              *
-# Date : 10 November 1999                                                     *
-#                                                                            *
-#*****************************************************************************
-.first
-	define wx [--.include.wx]
-
-.ifdef __WXMOTIF__
-CXX_DEFINE = /define=(__WXMOTIF__=1)
-.else
-.ifdef __WXGTK__
-CXX_DEFINE = /define=(__WXGTK__=1)
-.else
-CXX_DEFINE =
-.endif
-.endif
-
-CXXFLAGS=/list/show=all
-
-.suffixes : .cpp
-
-.cpp.obj :
-	cxx $(CXXFLAGS)$(CXX_DEFINE) $(MMS$TARGET_NAME).cpp
-
-all :
-.ifdef __WXMOTIF__
-	$(MMS)$(MMSQUALIFIERS) drawing.exe
-.else
-.ifdef __WXGTK__
-	$(MMS)$(MMSQUALIFIERS) drawing_gtk.exe
-.endif
-.endif
-
-.ifdef __WXMOTIF__
-drawing.exe : drawing.obj
-	cxxlink drawing,[--.lib]vms/opt
-.else
-.ifdef __WXGTK__
-drawing_gtk.exe : drawing.obj
-	cxxlink/exec=drawing_gtk.exe drawing,[--.lib]vms_gtk/opt
-.endif
-.endif
-
-drawing.obj : drawing.cpp
--- a/samples/mdi/descrip.mms
+++ b/samples/mdi/descrip.mms
@@ -1,47 +0,0 @@
-#*****************************************************************************
-#                                                                            *
-# Make file for VMS                                                          *
-# Author : J.Jansen (joukj@hrem.stm.tudelft.nl)                              *
-# Date : 10 November 1999                                                     *
-#                                                                            *
-#*****************************************************************************
-.first
-	define wx [--.include.wx]
-
-.ifdef __WXMOTIF__
-CXX_DEFINE = /define=(__WXMOTIF__=1)
-.else
-.ifdef __WXGTK__
-CXX_DEFINE = /define=(__WXGTK__=1)
-.else
-CXX_DEFINE =
-.endif
-.endif
-
-CXXFLAGS=/list/show=all
-
-.suffixes : .cpp
-
-.cpp.obj :
-	cxx $(CXXFLAGS)$(CXX_DEFINE) $(MMS$TARGET_NAME).cpp
-
-all :
-.ifdef __WXMOTIF__
-	$(MMS)$(MMSQUALIFIERS) mdi.exe
-.else
-.ifdef __WXGTK__
-	$(MMS)$(MMSQUALIFIERS) mdi_gtk.exe
-.endif
-.endif
-
-.ifdef __WXMOTIF__
-mdi.exe : mdi.obj
-	cxxlink mdi,[--.lib]vms/opt
-.else
-.ifdef __WXGTK__
-mdi_gtk.exe : mdi.obj
-	cxxlink/exec=mdi_gtk.exe mdi,[--.lib]vms_gtk/opt
-.endif
-.endif
-
-mdi.obj : mdi.cpp
--- a/samples/resource/descrip.mms
+++ b/samples/resource/descrip.mms
@@ -1,47 +0,0 @@
-#*****************************************************************************
-#                                                                            *
-# Make file for VMS                                                          *
-# Author : J.Jansen (joukj@hrem.stm.tudelft.nl)                              *
-# Date : 10 November 1999                                                     *
-#                                                                            *
-#*****************************************************************************
-.first
-	define wx [--.include.wx]
-
-.ifdef __WXMOTIF__
-CXX_DEFINE = /define=(__WXMOTIF__=1)
-.else
-.ifdef __WXGTK__
-CXX_DEFINE = /define=(__WXGTK__=1)
-.else
-CXX_DEFINE =
-.endif
-.endif
-
-CXXFLAGS=/list/show=all
-
-.suffixes : .cpp
-
-.cpp.obj :
-	cxx $(CXXFLAGS)$(CXX_DEFINE) $(MMS$TARGET_NAME).cpp
-
-all :
-.ifdef __WXMOTIF__
-	$(MMS)$(MMSQUALIFIERS) resource.exe
-.else
-.ifdef __WXGTK__
-	$(MMS)$(MMSQUALIFIERS) resource_gtk.exe
-.endif
-.endif
-
-.ifdef __WXMOTIF__
-resource.exe : resource.obj
-	cxxlink resource,[--.lib]vms/opt
-.else
-.ifdef __WXGTK__
-resource_gtk.exe : resource.obj
-	cxxlink/exec=resource_gtk.exe resource,[--.lib]vms_gtk/opt
-.endif
-.endif
-
-resource.obj : resource.cpp
--- a/src/common/cmdline.cpp
+++ b/src/common/cmdline.cpp
@@ -348,12 +348,14 @@ void wxCmdLineParser::AddParam(const wxString& desc,
        wxCmdLineParam& param = m_data->m_paramDesc.Last();

        wxASSERT_MSG( !(param.flags & wxCMD_LINE_PARAM_MULTIPLE),
-                      _T("all parameters after the one with wxCMD_LINE_PARAM_MULTIPLE style will be ignored") );
+                      _T("all parameters after the one with "
+                         "wxCMD_LINE_PARAM_MULTIPLE style will be ignored") );

        if ( !(flags & wxCMD_LINE_PARAM_OPTIONAL) )
        {
            wxASSERT_MSG( !(param.flags & wxCMD_LINE_PARAM_OPTIONAL),
-                          _T("a required parameter can't follow an optional one") );
+                          _T("a required parameter can't follow an "
+                             "optional one") );
        }
    }
 #endif // Debug
@@ -587,7 +589,8 @@ int wxCmdLineParser::Parse()

                    if ( *p++ != _T('=') )
                    {
-                        wxLogError(_("Option '%s' requires a value, '=' expected."), name.c_str());
+                        wxLogError(_("Option '%s' requires a value, '=' "
+                                     "expected."), name.c_str());

                        ok = FALSE;
                    }
@@ -646,7 +649,9 @@ int wxCmdLineParser::Parse()
                                }
                                else
                                {
-                                    wxLogError(_("'%s' is not a correct numeric value for option '%s'."),
+                                    wxLogError(_("'%s' is not a correct "
+                                                 "numeric value for option "
+                                                 "'%s'."),
                                               value.c_str(), name.c_str());

                                    ok = FALSE;
@@ -660,7 +665,8 @@ int wxCmdLineParser::Parse()
                                const wxChar *res = dt.ParseDate(value);
                                if ( !res || *res )
                                {
-                                    wxLogError(_("Option '%s': '%s' cannot be converted to a date."),
+                                    wxLogError(_("Option '%s': '%s' cannot "
+                                                  "be converted to a date."),
                                               name.c_str(), value.c_str());

                                    ok = FALSE;
@@ -693,7 +699,9 @@ int wxCmdLineParser::Parse()
                else
                {
                    wxASSERT_MSG( currentParam == countParam - 1,
-                                  _T("all parameters after the one with wxCMD_LINE_PARAM_MULTIPLE style are ignored") );
+                                  _T("all parameters after the one with "
+                                     "wxCMD_LINE_PARAM_MULTIPLE style "
+                                     "are ignored") );

                    // remember that we did have this last repeatable parameter
                    hadRepeatableParam = TRUE;
--- a/src/common/cmndata.cpp
+++ b/src/common/cmndata.cpp
@@ -1435,7 +1435,8 @@ void wxPageSetupDialogData::SetPaperSize(wxPaperSize id)
 void wxPageSetupDialogData::CalculateIdFromPaperSize()
 {
    wxASSERT_MSG( (wxThePrintPaperDatabase != (wxPrintPaperDatabase*) NULL),
-                  wxT("wxThePrintPaperDatabase should not be NULL. Do not create global print dialog data objects.") );
+                  wxT("wxThePrintPaperDatabase should not be NULL. "
+                     "Do not create global print dialog data objects.") );

    wxSize sz = GetPaperSize();

@@ -1450,7 +1451,8 @@ void wxPageSetupDialogData::CalculateIdFromPaperSize()
 void wxPageSetupDialogData::CalculatePaperSizeFromId()
 {
    wxASSERT_MSG( (wxThePrintPaperDatabase != (wxPrintPaperDatabase*) NULL),
-                  wxT("wxThePrintPaperDatabase should not be NULL. Do not create global print dialog data objects.") );
+                  wxT("wxThePrintPaperDatabase should not be NULL. "
+                     "Do not create global print dialog data objects.") );

    wxSize sz = wxThePrintPaperDatabase->GetSize(m_printData.GetPaperId());

--- a/src/common/config.cpp
+++ b/src/common/config.cpp
@@ -339,7 +339,8 @@ wxString wxExpandEnvVars(const wxString& str)
          // check the closing bracket
          if ( bracket != Bracket_None ) {
            if ( m == str.Len() || str[m] != (char)bracket ) {
-              wxLogWarning(_("Environment variables expansion failed: missing '%c' at position %d in '%s'."),
+              wxLogWarning(_("Environment variables expansion failed: "
+			     "missing '%c' at position %d in '%s'."),
                           (char)bracket, m + 1, str.c_str());
            }
            else {
--- a/src/common/db.cpp
+++ b/src/common/db.cpp
@@ -155,7 +155,7 @@ int wxColFor::Format(int Nation,int dbDataType,SWORD sqlDataType,short columnSiz
    i_Nation      = Nation;                                 // 0 = timestamp , 1=EU, 2=UK, 3=International, 4=US
    i_dbDataType  = dbDataType;
    i_sqlDataType = sqlDataType;
-    s_Field.Printf(wxT("%s%d"),s_Menge[1].c_str(),i_Menge[1]);   // OK for VARCHAR, INTEGER and FLOAT
+    s_Field.Printf("%s%d",s_Menge[1].c_str(),i_Menge[1]);   // OK for VARCHAR, INTEGER and FLOAT
    if (i_dbDataType == 0)                                  // Filter unsupported dbDataTypes
    {
        if ((i_sqlDataType == SQL_VARCHAR) || (i_sqlDataType == SQL_LONGVARCHAR))
@@ -185,8 +185,8 @@ int wxColFor::Format(int Nation,int dbDataType,SWORD sqlDataType,short columnSiz
            if (decimalDigits == 0)
                decimalDigits = 2;
            Temp0 = "%";
-            Temp0.Printf(wxT("%s%d.%d"),Temp0.c_str(),columnSize,decimalDigits);
-            s_Field.Printf(wxT("%sf"),Temp0.c_str());        //
+            Temp0.Printf("%s%d.%d",Temp0.c_str(),columnSize,decimalDigits);
+            s_Field.Printf("%sf",Temp0.c_str());        //
            break;
        case DB_DATA_TYPE_DATE:
            if (i_Nation == 0)      // timestamp       YYYY-MM-DD HH:MM:SS.SSS (tested for SYBASE)
@@ -211,7 +211,7 @@ int wxColFor::Format(int Nation,int dbDataType,SWORD sqlDataType,short columnSiz
            }
            break;
        default:
-            s_Field.Printf(wxT("-E-> unknown Format(%d)-sql(%d)"),dbDataType,sqlDataType);        //
+            s_Field.Printf("-E-> unknown Format(%d)-sql(%d)",dbDataType,sqlDataType);        //
            break;
    };
    return TRUE;
@@ -227,32 +227,32 @@ wxDB::wxDB(HENV &aHenv, bool FwdOnlyCursors)
    sqlLogState   = sqlLogOFF;    // By default, logging is turned off
    nTables       = 0;

-    wxStrcpy(sqlState,wxT(""));
-    wxStrcpy(errorMsg,wxT(""));
+    wxStrcpy(sqlState,"");
+    wxStrcpy(errorMsg,"");
    nativeError = cbErrorMsg = 0;
    for (i = 0; i < DB_MAX_ERROR_HISTORY; i++)
-        wxStrcpy(errorList[i], wxT(""));
+        wxStrcpy(errorList[i], "");

    // Init typeInf structures
-    wxStrcpy(typeInfVarchar.TypeName,wxT(""));
+    wxStrcpy(typeInfVarchar.TypeName,"");
    typeInfVarchar.FsqlType      = 0;
    typeInfVarchar.Precision     = 0;
    typeInfVarchar.CaseSensitive = 0;
    typeInfVarchar.MaximumScale  = 0;

-    wxStrcpy(typeInfInteger.TypeName,wxT(""));
+    wxStrcpy(typeInfInteger.TypeName,"");
    typeInfInteger.FsqlType      = 0;
    typeInfInteger.Precision     = 0;
    typeInfInteger.CaseSensitive = 0;
    typeInfInteger.MaximumScale  = 0;

-    wxStrcpy(typeInfFloat.TypeName,wxT(""));
+    wxStrcpy(typeInfFloat.TypeName,"");
    typeInfFloat.FsqlType      = 0;
    typeInfFloat.Precision     = 0;
    typeInfFloat.CaseSensitive = 0;
    typeInfFloat.MaximumScale  = 0;

-    wxStrcpy(typeInfDate.TypeName,wxT(""));
+    wxStrcpy(typeInfDate.TypeName,"");
    typeInfDate.FsqlType      = 0;
    typeInfDate.Precision     = 0;
    typeInfDate.CaseSensitive = 0;
@@ -896,8 +896,8 @@ void wxDB::Close(void)
        tiu = (wxTablesInUse *)pNode->Data();
        if (tiu->pDb == this)
        {
-            s.sprintf(wxT("(%-20s)     tableID:[%6lu]     pDb:[%p]"), tiu->tableName,tiu->tableID,tiu->pDb);
-            s2.sprintf(wxT("Orphaned found using pDb:[%p]"),this);
+            s.sprintf("(%-20s)     tableID:[%6lu]     pDb:[%p]", tiu->tableName,tiu->tableID,tiu->pDb);
+            s2.sprintf("Orphaned found using pDb:[%p]",this);
            wxLogDebug (s.c_str(),s2.c_str());
        }
        pNode = pNode->Next();
--- a/src/common/fontmap.cpp
+++ b/src/common/fontmap.cpp
@@ -208,7 +208,8 @@ wxFontMapper::~wxFontMapper()
 void wxFontMapper::SetConfigPath(const wxString& prefix)
 {
    wxCHECK_RET( !prefix.IsEmpty() && prefix[0] == wxCONFIG_PATH_SEPARATOR,
-                 wxT("an absolute path should be given to wxFontMapper::SetConfigPath()") );
+                 wxT("an absolute path should be given to "
+                     "wxFontMapper::SetConfigPath()") );

    m_configRootPath = prefix;
 }
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -298,7 +298,7 @@ static wxString GetFullSearchPath(const wxChar *lang)

    // then take the current directory
    // FIXME it should be the directory of the executable
-    searchPath << GetAllMsgCatalogSubdirs(wxT("."), lang);
+    searchPath << GetAllMsgCatalogSubdirs(wxT("."), lang) << wxPATH_SEP;

    // and finally add some standard ones
    searchPath
--- a/src/common/textfile.cpp
+++ b/src/common/textfile.cpp
@@ -118,10 +118,6 @@ wxString wxTextFile::Translate(const wxString& text, wxTextFileType type)
                if ( chLast == _T('\r') ) {
                    // Mac line termination
                    result += eol;
-
-                    // reset chLast to avoid inserting another eol before the
-                    // next character
-                    chLast = 0;
                }

                // add to the current line
--- a/src/gtk/joystick.cpp
+++ b/src/gtk/joystick.cpp
@@ -12,7 +12,6 @@
 #ifdef __GNUG__
 #pragma implementation "joystick.h"
 #endif
-#if wxUSE_JOYSTICK

 #include <linux/joystick.h>
 #include <sys/types.h>
@@ -355,5 +354,4 @@ bool wxJoystick::ReleaseCapture(void)
  m_polling = 0;
  return TRUE;
 }
-#endif

--- a/src/gtk/wx_gtk_vmsjackets.c
+++ b/src/gtk/wx_gtk_vmsjackets.c
@@ -2554,17 +2554,6 @@ GSList* G_SLIST_FIND		(GSList		*list,
 				 data);
 }

-void       GTK_WINDOW_SET_GEOMETRY_HINTS       (GtkWindow           *window,
-						GtkWidget           *geometry_widget,
-						GdkGeometry         *geometry,
-						GdkWindowHints       geom_mask)
-{
-   gtk_window_set_geometry_hints       (window,
-					geometry_widget,
-					geometry,
-					geom_mask);
-}
-
 #undef GDK_THREADS_ENTER
 void     GDK_THREADS_ENTER                (void)
 {
--- a/src/gtk1/joystick.cpp
+++ b/src/gtk1/joystick.cpp
@@ -12,7 +12,6 @@
 #ifdef __GNUG__
 #pragma implementation "joystick.h"
 #endif
-#if wxUSE_JOYSTICK

 #include <linux/joystick.h>
 #include <sys/types.h>
@@ -355,5 +354,4 @@ bool wxJoystick::ReleaseCapture(void)
  m_polling = 0;
  return TRUE;
 }
-#endif

--- a/src/gtk1/wx_gtk_vmsjackets.c
+++ b/src/gtk1/wx_gtk_vmsjackets.c
@@ -2554,17 +2554,6 @@ GSList* G_SLIST_FIND		(GSList		*list,
 				 data);
 }

-void       GTK_WINDOW_SET_GEOMETRY_HINTS       (GtkWindow           *window,
-						GtkWidget           *geometry_widget,
-						GdkGeometry         *geometry,
-						GdkWindowHints       geom_mask)
-{
-   gtk_window_set_geometry_hints       (window,
-					geometry_widget,
-					geometry,
-					geom_mask);
-}
-
 #undef GDK_THREADS_ENTER
 void     GDK_THREADS_ENTER                (void)
 {
--- a/src/makevc.env
+++ b/src/makevc.env
@@ -125,9 +125,6 @@ WXLIBNAME=$(NEW_WXLIBNAME)
 !if "$(FINAL)" == "1"
 D=Release
 !else
-guilibsdll=msvcrtd.lib oldnames.lib kernel32.lib \
-  ws2_32.lib mswsock.lib advapi32.lib user32.lib \
-  gdi32.lib comdlg32.lib winspool.lib
 D=Debug
 LIBEXT=d
 WXLIBNAME=$(WXLIBNAME)$(LIBEXT)
--- a/src/msw/control.cpp
+++ b/src/msw/control.cpp
@@ -143,7 +143,7 @@ bool wxControl::ProcessCommand(wxCommandEvent& event)
 #if WXWIN_COMPATIBILITY
    if ( m_callback )
    {
-        (void)(*m_callback)(*this, event);
+        (void)(*m_callback)(this, event);

        return TRUE;
    }
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -27,8 +27,6 @@ LIBTARGET=$(WXLIB)
 DUMMYOBJ=$D\dummy.obj
 !endif

-USE_GLCANVAS=1
-
 # Please set these according to the settings in setup.h, so we can include
 # the appropriate libraries in wx.lib

--- a/src/msw/treectrl.cpp
+++ b/src/msw/treectrl.cpp
@@ -545,16 +545,7 @@ bool wxTreeCtrl::Create(wxWindow *parent,
    if ( !MSWCreateControl(WC_TREEVIEW, wstyle) )
        return FALSE;

-#if 0
    SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW));
-#else
-    // This works around a bug in the Windows tree control whereby for some versions
-    // of comctrl32, setting any colour actually draws the background in black.
-    // This will initialise the background to the system colour.
-    ::SendMessage(GetHwnd(), TVM_SETBKCOLOR, 0,-1);
-    wxWindow::SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW));
-#endif
-
    SetForegroundColour(wxWindow::GetParent()->GetForegroundColour());

    // VZ: this is some experimental code which may be used to get the
--- a/src/os2/app.cpp
+++ b/src/os2/app.cpp
@@ -555,7 +555,7 @@ bool wxApp::DoMessage()
 {
    BOOL                            bRc = ::WinGetMsg(vHabmain, &svCurrentMsg, HWND(NULL), 0, 0);

-    wxUsleep(1000);
+    wxUsleep(10000);
    if (bRc == 0)
    {
        // got WM_QUIT
@@ -658,7 +658,7 @@ int wxApp::MainLoop()
 #endif // wxUSE_THREADS
        while (!Pending() && ProcessIdle())
        {
-//            wxUsleep(10000);
+	  wxUsleep(10000);
        }
        DoMessage();
    }
--- a/src/os2/frame.cpp
+++ b/src/os2/frame.cpp
@@ -90,18 +90,6 @@ void wxFrame::Init()
    m_nFsToolBarHeight   = 0;
    m_bFsIsMaximized     = FALSE;
    m_bFsIsShowing       = FALSE;
-
-    //
-    // Initialize SWP's
-    //
-    memset(&m_vSwp, 0, sizeof(SWP));
-    memset(&m_vSwpClient, 0, sizeof(SWP));
-    memset(&m_vSwpTitleBar, 0, sizeof(SWP));
-    memset(&m_vSwpMenuBar, 0, sizeof(SWP));
-    memset(&m_vSwpHScroll, 0, sizeof(SWP));
-    memset(&m_vSwpVScroll, 0, sizeof(SWP));
-    memset(&m_vSwpStatusBar, 0, sizeof(SWP));
-    memset(&m_vSwpToolBar, 0, sizeof(SWP));
 } // end of wxFrame::Init

 bool wxFrame::Create(
@@ -172,7 +160,7 @@ wxFrame::~wxFrame()

        if (wxTheApp->GetExitOnFrameDelete())
        {
-            ::WinPostMsg(m_hFrame, WM_QUIT, 0, 0);
+            ::WinPostMsg(GetHwnd(), WM_QUIT, 0, 0);
        }
    }
    wxModelessWindows.DeleteObject(this);
@@ -214,12 +202,14 @@ void wxFrame::DoGetClientSize(
    // top-left thus the += instead of the -=
    //
    RECTL                           vRect;
+    HWND                            hWndClient;

    //
    // PM has no GetClientRect that inherantly knows about the client window
    // We have to explicitly go fetch it!
    //
-    ::WinQueryWindowRect(GetHwnd(), &vRect);
+    hWndClient = ::WinWindowFromID(GetHwnd(), FID_CLIENT);
+    ::WinQueryWindowRect(hWndClient, &vRect);

 #if wxUSE_STATUSBAR
    if ( GetStatusBar() )
@@ -255,12 +245,14 @@ void wxFrame::DoSetClientSize(
 )
 {
    HWND                            hWnd = GetHwnd();
+    HWND                            hWndClient;
    RECTL                           vRect;
    RECTL                           vRect2;

-    ::WinQueryWindowRect(GetHwnd(), &vRect);
+    hWndClient = ::WinWindowFromID(GetHwnd(), FID_CLIENT);
+    ::WinQueryWindowRect(hWndClient, &vRect);

-    ::WinQueryWindowRect(m_hFrame, &vRect2);
+    ::WinQueryWindowRect(hWnd, &vRect2);

    //
    // Find the difference between the entire window (title bar and all)
@@ -292,7 +284,7 @@ void wxFrame::DoSetClientSize(
    vPointl.x = vRect2.xLeft;
    vPoint.y  = vRect2.yTop;

-    ::WinSetWindowPos( m_hFrame
+    ::WinSetWindowPos( hWnd
                      ,HWND_TOP
                      ,vPointl.x
                      ,vPointl.y
@@ -317,7 +309,7 @@ void wxFrame::DoGetSize(
 {
    RECTL                           vRect;

-    ::WinQueryWindowRect(m_hFrame, &vRect);
+    ::WinQueryWindowRect(GetHwnd(), &vRect);
    *pWidth = vRect.xRight - vRect.xLeft;
    *pHeight = vRect.yTop - vRect.yBottom;
 } // end of wxFrame::DoGetSize
@@ -330,7 +322,7 @@ void wxFrame::DoGetPosition(
    RECTL                           vRect;
    POINTL                          vPoint;

-    ::WinQueryWindowRect(m_hFrame, &vRect);
+    ::WinQueryWindowRect(GetHwnd(), &vRect);
    vPoint.x = vRect.xLeft;

    //
@@ -356,7 +348,8 @@ void wxFrame::DoShowWindow(
    //
    // Reset the window position
    //
-    WinQueryWindowPos(m_hFrame, &vSwp);
+    hClient = WinWindowFromID(GetHwnd(), FID_CLIENT);
+    WinQueryWindowPos(GetHwnd(), &vSwp);
    WinSetWindowPos( GetHwnd()
                    ,HWND_TOP
                    ,vSwp.x
@@ -365,8 +358,8 @@ void wxFrame::DoShowWindow(
                    ,vSwp.cy
                    ,SWP_SIZE | SWP_MOVE | SWP_ACTIVATE
                   );
-    ::WinShowWindow(m_hFrame, (BOOL)bShowCmd);
    ::WinShowWindow(GetHwnd(), (BOOL)bShowCmd);
+    ::WinShowWindow(hClient, (BOOL)bShowCmd);
 } // end of wxFrame::DoShowWindow

 bool wxFrame::Show(
@@ -381,9 +374,9 @@ bool wxFrame::Show(
    {
        wxActivateEvent             vEvent(wxEVT_ACTIVATE, TRUE, m_windowId);

-        ::WinQueryWindowPos(m_hFrame, &vSwp);
+        ::WinQueryWindowPos(GetHwnd(), &vSwp);
        m_bIconized = vSwp.fl & SWP_MINIMIZE;
-        ::WinEnableWindow(m_hFrame, TRUE);
+        ::WinEnableWindow(GetHwnd(), TRUE);
        vEvent.SetEventObject(this);
        GetEventHandler()->ProcessEvent(vEvent);
    }
@@ -451,7 +444,7 @@ bool wxFrame::IsMaximized() const
    SWP                             vSwp;
    bool                            bIconic;

-    ::WinQueryWindowPos(m_hFrame, &vSwp);
+    ::WinQueryWindowPos(GetHwnd(), &vSwp);
    return (vSwp.fl & SWP_MAXIMIZE);
 } // end of wxFrame::IsMaximized

@@ -463,12 +456,12 @@ void wxFrame::SetIcon(

    if ((m_icon.GetHICON()) != NULLHANDLE)
    {
-        ::WinSendMsg( m_hFrame
+        ::WinSendMsg( GetHwnd()
                     ,WM_SETICON
                     ,(MPARAM)((HPOINTER)m_icon.GetHICON())
                     ,NULL
                    );
-        ::WinSendMsg( m_hFrame
+        ::WinSendMsg( GetHwnd()
                     ,WM_UPDATEFRAME
                     ,(MPARAM)FCF_ICON
                     ,(MPARAM)0
@@ -508,7 +501,8 @@ void wxFrame::PositionStatusBar()
        HWND                        hWndClient;
        RECTL                       vRect;

-        ::WinQueryWindowRect(GetHwnd(), &vRect);
+        hWndClient = ::WinWindowFromID(GetHwnd(), FID_CLIENT);
+        ::WinQueryWindowRect(hWndClient, &vRect);
        nWidth = vRect.xRight - vRect.xLeft;
        nHeight = vRect.yTop - vRect.yBottom;

@@ -585,14 +579,14 @@ void wxFrame::SetMenuBar(
    //
    // Set the parent and owner of the menubar to be the frame
    //
-    if (!::WinSetParent(m_hMenu, m_hFrame, FALSE))
+    if (!::WinSetParent(m_hMenu, GetHwnd(), FALSE))
    {
        vError = ::WinGetLastError(vHabmain);
        sError = wxPMErrorToStr(vError);
        wxLogError("Error setting parent for submenu. Error: %s\n", sError);
    }

-    if (!::WinSetOwner(m_hMenu, m_hFrame))
+    if (!::WinSetOwner(m_hMenu, GetHwnd()))
    {
        vError = ::WinGetLastError(vHabmain);
        sError = wxPMErrorToStr(vError);
@@ -606,16 +600,17 @@ void wxFrame::SetMenuBar(
    //
    // Now resize the client to fit the new frame
    //
-    WinQueryWindowPos(m_hFrame, &vSwp);
-    hTitlebar = WinWindowFromID(m_hFrame, FID_TITLEBAR);
+    WinQueryWindowPos(GetHwnd(), &vSwp);
+    hClient = WinWindowFromID(GetHwnd(), FID_CLIENT);
+    hTitlebar = WinWindowFromID(GetHwnd(), FID_TITLEBAR);
    WinQueryWindowPos(hTitlebar, &vSwpTitlebar);
-    hHScroll = WinWindowFromID(m_hFrame, FID_HORZSCROLL);
+    hHScroll = WinWindowFromID(GetHwnd(), FID_HORZSCROLL);
    WinQueryWindowPos(hHScroll, &vSwpHScroll);
-    hVScroll = WinWindowFromID(m_hFrame, FID_VERTSCROLL);
+    hVScroll = WinWindowFromID(GetHwnd(), FID_VERTSCROLL);
    WinQueryWindowPos(hVScroll, &vSwpVScroll);
-    hMenuBar = WinWindowFromID(m_hFrame, FID_MENU);
+    hMenuBar = WinWindowFromID(GetHwnd(), FID_MENU);
    WinQueryWindowPos(hMenuBar, &vSwpMenu);
-    WinSetWindowPos( GetHwnd()
+    WinSetWindowPos( hClient
                    ,HWND_TOP
                    ,SV_CXSIZEBORDER/2
                    ,(SV_CYSIZEBORDER/2) + vSwpHScroll.cy/2
@@ -627,7 +622,7 @@ void wxFrame::SetMenuBar(

 void wxFrame::InternalSetMenuBar()
 {
-    WinSendMsg((HWND)m_hFrame, WM_UPDATEFRAME, (MPARAM)FCF_MENU, (MPARAM)0);
+    WinSendMsg((HWND)GetHwnd(), WM_UPDATEFRAME, (MPARAM)FCF_MENU, (MPARAM)0);
 } // end of wxFrame::InternalSetMenuBar

 //
@@ -804,9 +799,10 @@ bool wxFrame::OS2Create(
    HWND                            hTitlebar = NULLHANDLE;
    HWND                            hHScroll = NULLHANDLE;
    HWND                            hVScroll = NULLHANDLE;
-    SWP                             vSwp[10];
-    RECTL                           vRect[10];
-    USHORT                          uCtlCount;
+    SWP                             vSwp;
+    SWP                             vSwpTitlebar;
+    SWP                             vSwpVScroll;
+    SWP                             vSwpHScroll;

    m_hDefaultIcon = (WXHICON) (wxSTD_FRAME_ICON ? wxSTD_FRAME_ICON : wxDEFAULT_FRAME_ICON);

@@ -875,43 +871,66 @@ bool wxFrame::OS2Create(
    //
    // Create the frame window
    //
-    if ((m_hFrame = ::WinCreateWindow( hParent               // Frame is parent
-                                      ,WC_FRAME              // standard frame class
-                                      ,(PSZ)zTitle           // Window title
-                                      ,0                     // No styles
-                                      ,0, 0, 0, 0            // Window position
-                                      ,NULLHANDLE            // Owner
-                                      ,HWND_TOP              // Sibling
-                                      ,(ULONG)nId            // ID
-                                      ,(PVOID)&vFrameCtlData // Creation data
-                                     ,NULL                   // Window Pres Params
-                                     )) == 0L)
-    {
-        return FALSE;
-    }
-
-    if (!wxWindow::OS2Create( m_hFrame
-                             ,wxFrameClassName
-                             ,NULL
-                             ,0L
-                             ,0L
-                             ,0L
-                             ,0L
-                             ,0L
+    if (!wxWindow::OS2Create( hParent
+                             ,WC_FRAME
+                             ,zTitle
+                             ,ulStyleFlags
+                             ,(long)nX
+                             ,(long)nY
+                             ,(long)nWidth
+                             ,(long)nHeight
                             ,NULLHANDLE
                             ,HWND_TOP
-                             ,(unsigned long)FID_CLIENT
-                             ,NULL
+                             ,(long)nId
+                             ,(void*)&vFrameCtlData
                             ,NULL
                            ))
    {
        return FALSE;
    }

+    hFrame = GetHwnd();
+
+    //
+    // Since under PM the controling window proc is associated with the client window handle
+    // not the frame's we have to perform the hook here in order to associated the client handle,
+    // not the frame's with the window object !
+    //
+
+    wxWndHook = this;
+    //
+    // Create the client window.  We must call the API from here rather than
+    // the static base class create because we need a separate handle
+    //
+    if ((hClient = ::WinCreateWindow( hFrame   // Frame is parent
+                                     ,wxFrameClassName
+                                     ,NULL        // Window title
+                                     ,0           // No styles
+                                     ,0, 0, 0, 0  // Window position
+                                     ,NULLHANDLE  // Owner
+                                     ,HWND_TOP    // Sibling
+                                     ,FID_CLIENT  // standard client ID
+                                     ,NULL        // Creation data
+                                     ,NULL        // Window Pres Params
+                                     )) == 0L)
+    {
+        return FALSE;
+    }
+
+    wxWndHook = NULL;
+    //
+    // Send anything to initialize the frame
+    //
+    ::WinSendMsg( hFrame
+                 ,WM_UPDATEFRAME
+                 ,(MPARAM)FCF_TASKLIST
+                 ,(MPARAM)0
+                );
+
    //
    // Now size everything.  If adding a menu the client will need to be resized.
    //
-    if (!::WinSetWindowPos( m_hFrame
+    if (!::WinSetWindowPos( hFrame
                           ,HWND_TOP
                           ,nX
                           ,nY
@@ -921,28 +940,20 @@ bool wxFrame::OS2Create(
                          ))
        return FALSE;

-    uCtlCount = SHORT1FROMMP(::WinSendMsg(m_hFrame, WM_FORMATFRAME, (MPARAM)vSwp, (MPARAM)vRect));
-    for (int i = 0; i < uCtlCount; i++)
-    {
-        if (vSwp[i].hwnd == m_hFrame)
-            memcpy(&m_vSwp, &vSwp[i], sizeof(SWP));
-        else if (vSwp[i].hwnd == m_hVScroll)
-            memcpy(&m_vSwpVScroll, &vSwp[i], sizeof(SWP));
-        else if (vSwp[i].hwnd == m_hHScroll)
-            memcpy(&m_vSwpVScroll, &vSwp[i], sizeof(SWP));
-        else if (vSwp[i].hwnd == m_hTitleBar)
-            memcpy(&m_vSwpTitleBar, &vSwp[i], sizeof(SWP));
-    }
-
-    //
-    // Now set the size of the client
-    //
+    WinQueryWindowPos(GetHwnd(), &vSwp);
+    hClient = WinWindowFromID(GetHwnd(), FID_CLIENT);
+    hTitlebar = WinWindowFromID(GetHwnd(), FID_TITLEBAR);
+    WinQueryWindowPos(hTitlebar, &vSwpTitlebar);
+    hHScroll = WinWindowFromID(GetHwnd(), FID_HORZSCROLL);
+    WinQueryWindowPos(hHScroll, &vSwpHScroll);
+    hVScroll = WinWindowFromID(GetHwnd(), FID_VERTSCROLL);
+    WinQueryWindowPos(hVScroll, &vSwpVScroll);
    WinSetWindowPos( hClient
                    ,HWND_TOP
                    ,SV_CXSIZEBORDER/2
-                    ,(SV_CYSIZEBORDER/2) + m_vSwpHScroll.cy/2
-                    ,m_vSwp.cx - ((SV_CXSIZEBORDER + 1) + m_vSwpVScroll.cx)
-                    ,m_vSwp.cy - ((SV_CYSIZEBORDER + 1) + m_vSwpTitleBar.cy + m_vSwpHScroll.cy/2)
+                    ,(SV_CYSIZEBORDER/2) + vSwpHScroll.cy/2
+                    ,vSwp.cx - ((SV_CXSIZEBORDER + 1) + vSwpVScroll.cx)
+                    ,vSwp.cy - ((SV_CYSIZEBORDER + 1) + vSwpTitlebar.cy + vSwpHScroll.cy/2)
                    ,SWP_SIZE | SWP_MOVE
                   );

@@ -1045,7 +1056,8 @@ void wxFrame::PositionToolBar()
    HWND                            hWndClient;
    RECTL                           vRect;

-    ::WinQueryWindowRect(GetHwnd(), &vRect);
+    hWndClient = ::WinWindowFromID(GetHwnd(), FID_CLIENT);
+    ::WinQueryWindowRect(hWndClient, &vRect);

 #if wxUSE_STATUSBAR
    if (GetStatusBar())
@@ -1150,7 +1162,7 @@ bool wxFrame::HandlePaint()
 {
    RECTL                           vRect;

-    if (::WinQueryUpdateRect(m_hFrame, &vRect))
+    if (::WinQueryUpdateRect(GetHwnd(), &vRect))
    {
        if (m_bIconized)
        {
@@ -1160,7 +1172,7 @@ bool wxFrame::HandlePaint()
            HPOINTER                hIcon;

            if (m_icon.Ok())
-                hIcon = (HPOINTER)::WinSendMsg(m_hFrame, WM_QUERYICON, 0L, 0L);
+                hIcon = (HPOINTER)::WinSendMsg(GetHwnd(), WM_QUERYICON, 0L, 0L);
            else
                hIcon = (HPOINTER)m_hDefaultIcon;

@@ -1169,7 +1181,7 @@ bool wxFrame::HandlePaint()
            // is being processed
            //
            RECTL                   vRect2;
-            HPS                     hPs = ::WinBeginPaint(m_hFrame, NULLHANDLE, &vRect2);
+            HPS                     hPs = ::WinBeginPaint(GetHwnd(), NULLHANDLE, &vRect2);

            //
            // Erase background before painting or we get white background
@@ -1181,7 +1193,8 @@ bool wxFrame::HandlePaint()
                HWND                            hWndClient;
                RECTL                           vRect3;

-                ::WinQueryWindowRect(GetHwnd(), &vRect3);
+                hWndClient = ::WinWindowFromID(GetHwnd(), FID_CLIENT);
+                ::WinQueryWindowRect(hWndClient, &vRect3);

                static const int    nIconWidth = 32;
                static const int    nIconHeight = 32;
@@ -1420,21 +1433,12 @@ MRESULT wxFrame::OS2WindowProc(
            bProcessed = HandlePaint();
            break;

-        case WM_ERASEBACKGROUND:
-            //
-            // Return TRUE to request PM to paint the window background
-            // in SYSCLR_WINDOW.
-            //
-            bProcessed = TRUE;
-            mRc = (MRESULT)(TRUE);
-            break;
-
        case CM_QUERYDRAGIMAGE:
            {
                HPOINTER                hIcon;

                if (m_icon.Ok())
-                    hIcon = (HPOINTER)::WinSendMsg(m_hFrame, WM_QUERYICON, 0L, 0L);
+                    hIcon = (HPOINTER)::WinSendMsg(GetHwnd(), WM_QUERYICON, 0L, 0L);
                else
                    hIcon = (HPOINTER)m_hDefaultIcon;
                mRc = (MRESULT)hIcon;
--- a/src/os2/gsocket.c
+++ b/src/os2/gsocket.c
@@ -80,10 +80,19 @@ int _System soclose(int);

 /* Global initialisers */

+#if !defined(__VISAGECPP__)
+
 int GSocket_Init()
 {
  return 1;
 }
+#else
+bool GSocket_Init()
+{
+  return 1;
+}
+
+#endif

 void GSocket_Cleanup()
 {
--- a/src/os2/menu.cpp
+++ b/src/os2/menu.cpp
@@ -324,6 +324,7 @@ bool wxMenu::DoInsertOrAppend(
        //
        // Menu is just a normal string (passed in data parameter)
        //
+        wxSetShortCutKey((wxChar*)pItem->GetText().c_str());
        vItem.afStyle |= MIS_TEXT;
        pData = (char*)pItem->GetText().c_str();
    }
@@ -912,6 +913,8 @@ bool wxMenuBar::Append(

    wxCHECK_MSG(hSubmenu, FALSE, wxT("can't append invalid menu to menubar"));

+    wxSetShortCutKey((wxChar*)rTitle.c_str());
+
    wxString Title = TextToLabel(rTitle);
    if (!wxMenuBarBase::Append(pMenu, Title))
        return FALSE;
@@ -1071,4 +1074,23 @@ wxMenuItem* wxMenuBar::FindItem(
    return pItem;
 } // end of wxMenuBar::FindItem

+//
+// wxWindows' default shortcut identifier is WIN32's "&" but
+// OS2's is "~" so we have to change this and must watch for the
+// sequence, "&&" converting only the first one
+//
+void wxSetShortCutKey(
+  wxChar*                           zText
+)
+{
+    for (int i = 0; zText[i] != '\0'; i++)
+    {
+        if (zText[i] == '&')
+        {
+            zText[i] = '~';
+            if (zText[i+1] == '&')
+                i++;
+        }
+    }
+}

--- a/src/os2/window.cpp
+++ b/src/os2/window.cpp
@@ -2357,7 +2357,7 @@ bool wxWindow::OS2Create(
        (ULONG)zClass == (ULONG)WC_COMBOBOX ||
        (ULONG)zClass == (ULONG)WC_CONTAINER ||
        (ULONG)zClass == (ULONG)WC_ENTRYFIELD ||
-        (ULONG)zClass == (ULONG)WC_FRAME ||
+	(ULONG)zClass == (ULONG)WC_FRAME ||
        (ULONG)zClass == (ULONG)WC_LISTBOX ||
        (ULONG)zClass == (ULONG)WC_MENU ||
        (ULONG)zClass == (ULONG)WC_NOTEBOOK ||
@@ -2796,9 +2796,6 @@ void wxWindow::OnSysColourChanged(
 bool wxWindow::HandlePaint()
 {
    HRGN                            hRgn = NULLHANDLE;
-    wxPaintEvent                    vEvent;
-    HPS                             hPS;
-    RECTL                           vRect;

    if (::WinQueryUpdateRegion(GetHwnd(), hRgn) == RGN_NULL)
    {
@@ -2807,9 +2804,7 @@ bool wxWindow::HandlePaint()
    }
    m_updateRegion = wxRegion(hRgn);

-    hPS = WinBeginPaint(GetHwnd(), 0L, &vRect);
-    WinFillRect(hPS, &vRect, SYSCLR_WINDOW);
-    WinEndPaint(hPS);
+    wxPaintEvent                    vEvent;

    vEvent.SetEventObject(this);
    return (GetEventHandler()->ProcessEvent(vEvent));
--- a/utils/projgen/makeproj.cpp
+++ b/utils/projgen/makeproj.cpp
@@ -293,7 +293,7 @@ void MyApp::GenerateSamples(const wxString& dir)
    GenerateSample("TextVC", "text", dir + wxString("/samples/text"), wxStringList("text.cpp", 0));
    GenerateSample("ThreadVC", "thread", dir + wxString("/samples/thread"), wxStringList("thread.cpp", 0));
    GenerateSample("ToolbarVC", "toolbar", dir + wxString("/samples/toolbar"), wxStringList("toolbar.cpp", 0));
-    GenerateSample("TreectrlVC", "treectrl", dir + wxString("/samples/treectrl"), wxStringList("treectrl.cpp", "treectrl.h", 0));
+    GenerateSample("TreectrlVC", "treectrl", dir + wxString("/samples/treectrl"), wxStringList("treectrl.cpp", "treetest.h", 0));
    GenerateSample("TypetestVC", "typetest", dir + wxString("/samples/typetest"), wxStringList("typetest.cpp", "typetest.h", 0));
    GenerateSample("ValidateVC", "validate", dir + wxString("/samples/validate"), wxStringList("validate.cpp", "validate.h", 0));
    GenerateSample("ClientVC", "client", dir + wxString("/samples/sockets"), wxStringList("client.cpp", 0));
--- a/wxGTK.spec
+++ b/wxGTK.spec
@@ -70,7 +70,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING.LIB INSTALL.txt LICENCE.txt README.txt SYMBOLS.txt TODO.txt
 %dir %{pref}/share/wx
 %{pref}/share/wx/*
-%attr(755, -, -) %{pref}/lib/libwx_gtk.*
+%attr(755, -, -) %{pref}/lib/libwx_gtk*

 %files devel
 %defattr (644, root, root, 755)