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

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/LAST_GOOD@311 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

distrib/msw/gtk.rsp

@@ -0,0 +1,56 @@
+install-sh
+Makefile
+template.mak
+TODO.txt
+
+docs/gtk/*.html
+
+src/mkdirs
+src/Makefile
+src/Makefile.in
+
+src/gtk/*.cpp
+src/gtk/*.c
+src/gtk/*.inc
+src/gtk/*.xbm
+
+src/gtk/setup/*.hin
+src/gtk/setup/*.in
+src/gtk/setup/rules/*
+src/gtk/setup/rules/generic/*
+src/gtk/setup/rules/linux/*
+
+src/gdk_imlib/*.c
+src/gdk_imlib/*.h
+src/gdk_imlib/AUTHORS
+src/gdk_imlib/AUDIT
+src/gdk_imlib/COPYING.LIB
+src/gdk_imlib/README
+src/gdk_imlib/ChangeLog
+
+install/gtk/*
+
+misc/afm/*
+misc/gs_afm/*
+misc/imlib/*
+
+user/Makefile
+
+user/wxConvert/*.cpp
+user/wxConvert/*.h
+user/wxConvert/Makefile
+user/wxConvert/Makefile.in
+
+user/wxFile/*.cpp
+user/wxFile/*.h
+user/wxFile/Makefile
+user/wxFile/Makefile.in
+user/wxFile/*.xpm
+
+user/wxTest/*.cpp
+user/wxTest/*.h
+user/wxTest/Makefile
+user/wxTest/Makefile.in
+user/wxTest/*.xpm
+user/wxTest/*.png
+

distrib/msw/zipdist.bat

@@ -14,9 +14,9 @@ cd %1
 echo Zipping...
 zip32 -@ %2\wx200gen.zip < %1\distrib\msw\generic.rsp
 zip32 -@ %2\wx200msw.zip < %1\distrib\msw\msw.rsp
+zip32 -@ %2\wx200gtk.zip < %1\distrib\msw\gtk.rsp
 zip32 -@ %2\wx200doc.zip < %1\distrib\msw\docsrc.rsp
 
-rem zip32 -@ %2\wx200ps.zip < %1\distrib\msw\wx_ps.rsp
 zip32 -@ %2\wx200hlp.zip < %1\distrib\msw\wx_hlp.rsp
 zip32 -@ %2\wx200htm.zip < %1\distrib\msw\wx_html.rsp
 zip32 -@ %2\wx200pdf.zip < %1\distrib\msw\wx_pdf.rsp

docs/latex/wx/classes.tex

@@ -50,7 +50,7 @@ $$\image{14cm;0cm}{wxclass.ps}$$
 \input cursor.tex
 \input database.tex
 \input date.tex
-\input datstream.tex
+\input datstrm.tex
 \input dc.tex
 \input ddeclint.tex
 \input ddeconn.tex
@@ -172,3 +172,8 @@ $$\image{14cm;0cm}{wxclass.ps}$$
 
 \input function.tex
 
+
+%%% Local Variables: 
+%%% mode: latex
+%%% TeX-master: "referenc"
+%%% End: 

docs/latex/wx/cmdevent.tex

@@ -27,7 +27,7 @@ which is generated by a wxCheckBox control.}
 which is generated by a wxChoice control.}
 \twocolitem{{\bf EVT\_LISTBOX(id, func)}}{Process a wxEVT\_COMMAND\_LISTBOX\_SELECTED command,
 which is generated by a wxListBox control.}
-\twocolitem{{\bf EVT\_LISTBOX_DCLICK(id, func)}}{Process a wxEVT\_COMMAND\_LISTBOX\_DOUBLECLICKED command,
+\twocolitem{{\bf EVT\_LISTBOX\_DCLICK(id, func)}}{Process a wxEVT\_COMMAND\_LISTBOX\_DOUBLECLICKED command,
 which is generated by a wxListBox control.}
 \twocolitem{{\bf EVT\_TEXT(id, func)}}{Process a wxEVT\_COMMAND\_TEXT\_UPDATED command,
 which is generated by a wxTextCtrl control.}
@@ -177,3 +177,8 @@ Sets the {\bf m\_commandInt} member.
 
 Sets the {\bf m\_commandString} member.
 
+
+%%% Local Variables: 
+%%% mode: latex
+%%% TeX-master: "referenc"
+%%% End: 

docs/latex/wx/datstrm.tex

@@ -96,14 +96,19 @@ Writes the double {\it f} to the stream using the IEEE format.
 
 \membersection{wxDataStream::WriteString}
 
-\func{void}{wxDataStream::WriteString}{{\param const wxString& }{string}}
+\func{void}{wxDataStream::WriteString}{{\param const wxString\& }{string}}
 
 Writes {\it string} to the stream. Actually, this method writes the size of
 the string before writing {\it string} itself.
 
 \membersection{wxDataStream::WriteLine}
 
-\func{void}{wxDataStream::WriteLine}{{\param const wxString& }{string}}
+\func{void}{wxDataStream::WriteLine}{{\param const wxString\& }{string}}
 
 Writes {\it string} as a line. Depending on the operating system, it adds
 \\n or \\r\\n.
+
+%%% Local Variables: 
+%%% mode: latex
+%%% TeX-master: "referenc"
+%%% End: 

docs/latex/wx/manual.tex

@@ -1,4 +1,11 @@
-\documentstyle[a4,makeidx,verbatim,texhelp,fancyhea,mysober,mytitle]{report}
+\documentstyle[a4,11pt,makeidx,verbatim,texhelp,fancyheadings,palatino]{thesis}
+%KB:
+\addtolength{\textwidth}{1in}
+\addtolength{\oddsidemargin}{-0.5in}
+\addtolength{\topmargin}{-0.5in}
+\addtolength{\textheight}{1in}
+\sloppy 
+%end of my changes
 \newcommand{\indexit}[1]{#1\index{#1}}%
 \newcommand{\pipe}[0]{$\|$\ }%
 \definecolour{black}{0}{0}{0}%

docs/latex/wx/menuitem.tex

@@ -141,27 +141,27 @@ Returns TRUE if the item is a separator.
 
 \membersection{wxMenuItem::SetBackgroundColour}\label{wxmenuitemsetbackgroundcolour}
 
-\constfunc{void}{SetBackgroundColour}{\param{const wxColour& }{colour}}
+\constfunc{void}{SetBackgroundColour}{\param{const wxColour\& }{colour}}
 
 Sets the background colour associated with the menu item (Windows only).
 
 \membersection{wxMenuItem::SetBitmaps}\label{wxmenuitemsetbitmaps}
 
-\constfunc{void}{SetBitmaps}{\param{const wxBitmap& }{checked},
+\constfunc{void}{SetBitmaps}{\param{const wxBitmap\& }{checked},
- \param{const wxBitmap& }{unchecked = wxNullBitmap}}
+ \param{const wxBitmap\& }{unchecked = wxNullBitmap}}
 
 Sets the checked/unchecked bitmaps for the menu item (Windows only). The first bitmap
 is also used as the single bitmap for uncheckable menu items.
 
 \membersection{wxMenuItem::SetFont}\label{wxmenuitemsetfont}
 
-\constfunc{void}{SetFont}{\param{const wxFont& }{font}}
+\constfunc{void}{SetFont}{\param{const wxFont\& }{font}}
 
 Sets the font associated with the menu item (Windows only).
 
 \membersection{wxMenuItem::SetHelp}\label{wxmenuitemsethelp}
 
-\constfunc{void}{SetHelp}{\param{const wxString& }{helpString}}
+\constfunc{void}{SetHelp}{\param{const wxString\& }{helpString}}
 
 Sets the help string.
 
@@ -173,14 +173,19 @@ Sets the width of the menu item checkmark bitmap (Windows only).
 
 \membersection{wxMenuItem::SetName}\label{wxmenuitemsetname}
 
-\constfunc{void}{SetName}{\param{const wxString& }{text}}
+\constfunc{void}{SetName}{\param{const wxString\& }{text}}
 
 Sets the text associated with the menu item.
 
 \membersection{wxMenuItem::SetTextColour}\label{wxmenuitemsettextcolour}
 
-\constfunc{void}{SetTextColour}{\param{const wxColour& }{colour}}
+\constfunc{void}{SetTextColour}{\param{const wxColour\& }{colour}}
 
 Sets the text colour associated with the menu item (Windows only).
 
 
+
+%%% Local Variables: 
+%%% mode: latex
+%%% TeX-master: "referenc"
+%%% End: 

docs/latex/wx/referenc.tex

@@ -1,4 +1,12 @@
-\documentstyle[a4,makeidx,verbatim,texhelp,fancyhea,mysober,mytitle]{report}
+\documentstyle[a4,11pt,makeidx,verbatim,texhelp,fancyheadings,palatino]{thesis}
+%KB:
+\addtolength{\textwidth}{1in}
+\addtolength{\oddsidemargin}{-0.5in}
+\addtolength{\topmargin}{-0.5in}
+\addtolength{\textheight}{1in}
+\sloppy
+%end of my changes
+%\documentstyle[a4,makeidx,verbatim,texhelp,fancyhea,mysober,mytitle]{report}
 \newcommand{\indexit}[1]{#1\index{#1}}
 \newcommand{\pipe}[0]{$\|$\ }%
 \input psbox.tex

docs/latex/wx/thread.tex

@@ -80,9 +80,9 @@ The following priorities are already defined:
 
 \twocolwidtha{7cm}
 \begin{twocollist}\itemsep=0pt
-\twocolitem{{\bf WXTHREAD_MIN_PRIORITY}}{0}
+\twocolitem{{\bf WXTHREAD\_MIN\_PRIORITY}}{0}
-\twocolitem{{\bf WXTHREAD_DEFAULT_PRIORITY}}{50}
+\twocolitem{{\bf WXTHREAD\_DEFAULT\_PRIORITY}}{50}
-\twocolitem{{\bf WXTHREAD_MAX_PRIORITY}}{100}
+\twocolitem{{\bf WXTHREAD\_MAX\_PRIORITY}}{100}
 \end{twocollist}
 
 \membersection{wxThread::IsAlive}\label{wxthreadisalive}
@@ -119,8 +119,13 @@ The following priorities are already defined:
 
 \twocolwidtha{7cm}
 \begin{twocollist}\itemsep=0pt
-\twocolitem{{\bf WXTHREAD_MIN_PRIORITY}}{0}
+\twocolitem{{\bf WXTHREAD\_MIN\_PRIORITY}}{0}
-\twocolitem{{\bf WXTHREAD_DEFAULT_PRIORITY}}{50}
+\twocolitem{{\bf WXTHREAD\_DEFAULT\_PRIORITY}}{50}
-\twocolitem{{\bf WXTHREAD_MAX_PRIORITY}}{100}
+\twocolitem{{\bf WXTHREAD\_MAX\_PRIORITY}}{100}
 \end{twocollist}
 
+
+%%% Local Variables: 
+%%% mode: latex
+%%% TeX-master: "referenc"
+%%% End: 

docs/symbols.txt

@@ -4,11 +4,11 @@ GUIs:
 -----
 
 __X__           any X, but not GTK
-__MOTIF__       Motif
+__WXMOTIF__       Motif
 __XT__          Xt; mutually exclusive with WX_MOTIF (?)
-__GTK__         GTK
+__WXGTK__         GTK
 __XVIEW__       Obsolete!
-__WINDOWS__     Any Windows
+__WXMSW__     Any Windows
 __MAC__         MacOS
 __UNIX__        any Unix
 __WIN95__       GUI for Windows 95 and above; NT 4.0 and above.
@@ -16,6 +16,10 @@ __WIN32__       WIN32 API
 __NT__          Windows NT
 __CURSES__      CURSES
 
+In fact, they should better all start with __WX instead of __ only. 
+The only GUIs implemented for 2.0 are __WXGTK__, __WXMSW__ and __WXMOTIF__
+yet. Any new ones, please start the define with __WX.
+
 OSes/machines:
 
 __HPUX__
@@ -51,6 +55,6 @@ __XLC__         ?? compiler
 wxWindows modes:
 ----------------
 
-__DEBUG__       usage: #ifdef __DEBUG__ (=> debug mode, else => release)
+__WXDEBUG__       usage: #ifdef __DEBUG__ (=> debug mode, else => release)
 WXDEBUG         usage: #if DEBUG (0: release, 1: minimal debug code, ...)
 

docs/wxQt.html

@@ -0,0 +1,67 @@
+      $Id$
+    <br>
+    <H1>Proposal for a wxQt project</H1>
+    <p>
+      Following the recent discussions
+      and flamewars about KDE vs Gnome, I got worried that we see a
+      repetition of the same damaging infighting from which Unix has
+      suffered before. Competition is a good thing, but the current
+      situation leaves application developers with a difficult decision to
+      make: Write for KDE, using qt/harmony or write for Gnome, using GTK?
+      Whatever happens to these projects, we will end up with a lot of
+      duplicated efforts and a mix of applications written for either of the
+      two environments. The result will not be the consistent look and feel
+      that both projects aim for.
+    <p>
+      
+      The people on the wxWindows developers team thought that we might have
+      a solution for this problem, if we can get some outside help to get it
+      done. Let me explain: wxWindows is a cross-platform development
+      toolkit, a library of C++ classes which provide GUI concepts as well
+      as other cross-platform issues such as container classes, debug
+      features or configuration management. It has been around since 1992G
+      and started by supporting Motif, XView and MS-Windows, with a direct
+      X11/Xt port added later. Last year, a major rewrite was started and we
+      now have a much advanced library, available for MS Windows, with a
+      Motif port under construction. Later last year, Robert Roebling set
+      out on a one-man project to build wxGTK, a gtk-based implementation of
+      wxWindows which in less than a year has become sufficiently stable to
+      use it as the main development platform of rather large
+      applications. The wxWindows license is a variant of the LGPL,
+      which should meet no objections from the free software community. In
+      fact, this has been an open source project long before the term became
+      commonly used.
+    <p>
+      
+      Our idea is, that if this is good enough to work across different
+      operating systems (a MacOS port is under construction, too), it could
+      easily bridge the gap between KDE and Gnome. The quick evolution of
+      wxGTK has shown that a new port based on an existing widget set or
+      toolkit can easily be created by a small team within few
+      months. Therefore, we would like to start a project for a Qt/Harmony
+      based wxWindow library, wxQt. It would then be possible for
+      application developers to write the same source and copile it either
+      for KDE, Gnome or even any of the other supported systems.
+    <p>
+      
+      But for this we need help. The core developers are all pretty busy on
+      the existing ports, but we could provide significant help and support
+      for any such effort. A wxQt port could also recycle lots of existing
+      code from the other ports.
+
+      Please, join us in this effort and, if you feel that you could
+      contribute, join the wxWindows developers mainling list for further
+      discussions. Just send a mail containing "<tt>subscribe</tt>" to
+    <tt>wxwin-developers-request@x.dent.med.uni-muenchen.de</tt>
+    <p>
+      You can find some more information about wxWindows at the following places:
+<ul>
+<li>The <a href="http://web.ukonline.co.uk/julian.smart/wxwin/">wxWindows homepage</a>.
+<li>The <a href="http://www.freiburg.linux.de/~wxxt/">wxGTK homepage</a>
+<li>The <a href="http://Ballueder.home.ml.org/M/">home of <em>M</em></a>, an email client developed using wxGTK, showing several <a href="http://Ballueder.home.ml.org/M/screenshots/">screenshots</a> of how it actually looks like.
+</ul>
+<p>
+    <hr>
+    Karsten Ballueder <tt><a
+	href="mailto:Ballueder@usa.net">Ballueder@usa.net</a> <a
+    href="http://Ballueder.home.ml.org/">http://Ballueder.home.ml.org/</a></tt>

include/wx/app.h

@@ -12,22 +12,22 @@
 #ifndef __APPH_BASE__
 #define __APPH_BASE__
 
-#ifndef __GTK__
+#ifndef __WXGTK__
 class WXDLLEXPORT wxApp;
 typedef wxApp* (*wxAppInitializerFunction) (void);
 #endif
 
 #include "wx/object.h"
 
-#ifdef __GTK__
+#ifdef __WXGTK__
 typedef wxObject* (*wxAppInitializerFunction) (void);  // returning wxApp* won't work with gcc
 #endif
 
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
 #include "wx/msw/app.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
 #include "wx/xt/app.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
 #include "wx/gtk/app.h"
 #endif
 

include/wx/bitmap.h

@@ -1,11 +1,11 @@
 #ifndef __BITMAPH_BASE__
 #define __BITMAPH_BASE__
 
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
 #include "wx/msw/bitmap.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
 #include "wx/xt/bitmap.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
 #include "wx/gtk/bitmap.h"
 #endif
 

include/wx/bmpbuttn.h

@@ -1,11 +1,11 @@
 #ifndef __BMPBUTTONH_BASE__
 #define __BMPBUTTONH_BASE__
 
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
 #include "wx/msw/bmpbuttn.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
 #include "wx/xt/bmpbuttn.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
 #include "wx/gtk/bmpbuttn.h"
 #endif
 

include/wx/brush.h

@@ -1,11 +1,11 @@
 #ifndef __BRUSHH_BASE__
 #define __BRUSHH_BASE__
 
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
 #include "wx/msw/brush.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
 #include "wx/xt/brush.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
 #include "wx/gtk/brush.h"
 #endif
 

include/wx/button.h

@@ -1,11 +1,11 @@
 #ifndef __BUTTONH_BASE__
 #define __BUTTONH_BASE__
 
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
 #include "wx/msw/button.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
 #include "wx/xt/button.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
 #include "wx/gtk/button.h"
 #endif
 

include/wx/checkbox.h

@@ -1,11 +1,11 @@
 #ifndef __CHECKBOXH_BASE__
 #define __CHECKBOXH_BASE__
 
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
 #include "wx/msw/checkbox.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
 #include "wx/xt/checkbox.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
 #include "wx/gtk/checkbox.h"
 #endif
 

include/wx/choice.h

@@ -1,11 +1,11 @@
 #ifndef __CHOICEH_BASE__
 #define __CHOICEH_BASE__
 
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
 #include "wx/msw/choice.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
 #include "wx/xt/choice.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
 #include "wx/gtk/choice.h"
 #endif
 

include/wx/clipbrd.h

@@ -1,11 +1,11 @@
 #ifndef __CLIPBRDH_BASE__
 #define __CLIPBRDH_BASE__
 
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
 #include "wx/msw/clipbrd.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
 #include "wx/xt/clipbrd.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
 #include "wx/gtk/clipbrd.h"
 #endif
 

include/wx/cmndata.h

@@ -82,7 +82,7 @@ class WXDLLEXPORT wxPrintData: public wxObject
   DECLARE_DYNAMIC_CLASS(wxPrintData)
 
  public:
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
   void *printData;
 #endif
   int printFromPage;
@@ -137,7 +137,7 @@ class WXDLLEXPORT wxPrintData: public wxObject
 
   void operator=(const wxPrintData& data);
 
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
   // Convert to/from the PRINTDLG structure
   void ConvertToNative(void);
   void ConvertFromNative(void);

include/wx/colordlg.h

@@ -1,11 +1,11 @@
 #ifndef __COLORDLGH_BASE__
 #define __COLORDLGH_BASE__
 
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
 #include "wx/msw/colordlg.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
 #include "wx/generic/colrdlgg.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
 #include "wx/generic/colrdlgg.h"
 #endif
 

include/wx/combobox.h

@@ -1,11 +1,11 @@
 #ifndef __COMBOBOXH_BASE__
 #define __COMBOBOXH_BASE__
 
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
 #include "wx/msw/combobox.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
 #include "wx/xt/combobox.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
 #include "wx/gtk/combobox.h"
 #endif
 

include/wx/config.h

@@ -60,12 +60,12 @@
   $VARNAME or ${VARNAME} where VARNAME contains alphanumeric characters and
   '_' only. '$' must be escaped ('\$') in order to be taken literally.
  */
-extern wxString ExpandEnvVars(const wxString& str);
+extern wxString wxExpandEnvVars(const char *sz);
 
 /*
   Split path into parts removing '..' in progress
  */
-extern void SplitPath(wxArrayString& aParts, const char *sz);
+extern void wxSplitPath(wxArrayString& aParts, const char *sz);
 
 // ----------------------------------------------------------------------------
 // abstract base class wxConfig which defines the interface for derived classes
@@ -89,7 +89,7 @@ public:
   static void Create();
 
   // ctor & virtual dtor
-  wxConfig() { }
+  wxConfig() { m_bExpandEnvVars = TRUE; }
   virtual ~wxConfig();
 
   // path management
@@ -108,6 +108,10 @@ public:
     // enumerate entries
   virtual bool GetFirstEntry(wxString& str, long& lIndex) = 0;
   virtual bool GetNextEntry (wxString& str, long& lIndex) = 0;
+    // get number of entries/subgroups in the current group, with or without
+    // it's subgroups
+  virtual uint GetNumberOfEntries(bool bRecursive = FALSE) const = 0;
+  virtual uint GetNumberOfGroups(bool bRecursive = FALSE) const = 0;
 
   // tests of existence
     // returns TRUE if the group by this name exists
@@ -150,6 +154,15 @@ public:
     // primarly for use by desinstallation routine.
   virtual bool DeleteAll() = 0;
 
+  // options
+    // we can automatically expand environment variables in the config entries
+    // (this option is on by default, you can turn it on/off at any time)
+  bool IsExpandingEnvVars() const { return m_bExpandEnvVars; }
+  void SetExpandEnvVars(bool bDoIt = TRUE) { m_bExpandEnvVars = bDoIt; }
+    // does expansion only if needed
+  wxString ExpandEnvVars(const wxString& str) const
+    { return IsExpandingEnvVars() ? wxExpandEnvVars(str) : str; }
+
 protected:
   static bool IsImmutable(const char *szKey) 
     { return *szKey == APPCONF_IMMUTABLE_PREFIX; }
@@ -157,7 +170,7 @@ protected:
   // a handy little class which changes current path to the path of given entry
   // and restores it in dtor: so if you declare a local variable of this type,
   // you work in the entry directory and the path is automatically restored
-  // when function returns
+  // when the function returns
   class PathChanger
   {
   public:
@@ -175,6 +188,7 @@ protected:
     bool      m_bChanged;     // was the path changed?
   };
 
+private:
   // are we doing automatic environment variable expansion?
   bool m_bExpandEnvVars;
 

include/wx/control.h

@@ -1,11 +1,11 @@
 #ifndef __CONTROLH_BASE__
 #define __CONTROLH_BASE__
 
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
 #include "wx/msw/control.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
 #include "wx/xt/control.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
 #include "wx/gtk/control.h"
 #endif
 

include/wx/cursor.h

@@ -1,11 +1,11 @@
 #ifndef __CURSORH_BASE__
 #define __CURSORH_BASE__
 
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
 #include "wx/msw/cursor.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
 #include "wx/xt/cursor.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
 #include "wx/gtk/cursor.h"
 #endif
 

include/wx/datstrm.h

@@ -16,15 +16,12 @@
 #pragma interface "datstrm.h"
 #endif
 
-#include "wx/wx.h"
+#include <wx/stream.h>
 
-class wxDataStream {
+class wxDataInputStream: public wxFilterInputStream {
 public:
-  wxDataStream(iostream& s);
+  wxDataInputStream(wxInputStream& s);
-  wxDataStream(istream& s);
+  virtual ~wxDataInputStream();
-  wxDataStream(ostream& s);
-
-  virtual ~wxDataStream();
 
   unsigned long Read32();
   unsigned short Read16();
@@ -32,6 +29,12 @@ public:
   double ReadDouble();
   wxString ReadLine();
   wxString ReadString();
+};
+
+class wxDataOutputStream: public wxFilterOutputStream {
+ public:
+  wxDataOutputStream(wxOutputStream& s);
+  virtual ~wxDataOutputStream();
 
   void Write32(unsigned long i);
   void Write16(unsigned short i);
@@ -39,10 +42,7 @@ public:
   void WriteDouble(double d);
   void WriteLine(const wxString& line);
   void WriteString(const wxString& string);
-protected:
-  istream *m_istream;
-  ostream *m_ostream;
 };
 
 #endif
-    // __HELPBASEH__
+    // __DATSTREAMH__

include/wx/dc.h

@@ -1,11 +1,11 @@
 #ifndef __DCH_BASE__
 #define __DCH_BASE__
 
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
 #include "wx/msw/dc.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
 #include "wx/xt/dc.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
 #include "wx/gtk/dc.h"
 #endif
 

include/wx/dcclient.h

@@ -1,11 +1,11 @@
 #ifndef __DCCLIENTH_BASE__
 #define __DCCLIENTH_BASE__
 
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
 #include "wx/msw/dcclient.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
 #include "wx/xt/dcclient.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
 #include "wx/gtk/dcclient.h"
 #endif
 

include/wx/dcmemory.h

@@ -1,11 +1,11 @@
 #ifndef __DCMEMORYH_BASE__
 #define __DCMEMORYH_BASE__
 
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
 #include "wx/msw/dcmemory.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
 #include "wx/xt/dcmemory.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
 #include "wx/gtk/dcmemory.h"
 #endif
 

include/wx/dcprint.h

@@ -1,7 +1,7 @@
 #ifndef __DCPRINTH_BASE__
 #define __DCPRINTH_BASE__
 
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
 #include "wx/msw/dcprint.h"
 #endif
 

include/wx/dcscreen.h

@@ -1,11 +1,11 @@
 #ifndef __DCSCREENH_BASE__
 #define __DCSCREENH_BASE__
 
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
 #include "wx/msw/dcscreen.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
 #include "wx/xt/dcscreen.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
 #include "wx/gtk/dcscreen.h"
 #endif
 

include/wx/dde.h

@@ -1,11 +1,11 @@
 #ifndef __DDEH_BASE__
 #define __DDEH_BASE__
 
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
 #include "wx/msw/dde.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
 #include "wx/xt/dde.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
 #include "wx/gtk/dde.h"
 #endif
 

include/wx/debug.h

@@ -9,8 +9,8 @@
 // Licence:   	wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef   __DEBUGH__
+#ifndef   __WXDEBUGH__
-#define   __DEBUGH__
+#define   __WXDEBUGH__
 
 #include  <assert.h>
 
@@ -31,7 +31,7 @@
   <BR>
   <BR>
   Extensive use of these macros is recommended! Remember that ASSERTs are
-  disabled in final (without DEBUG defined) build, so they add strictly
+  disabled in final (without WXDEBUG defined) build, so they add strictly
   nothing to your program's code. On the other hand, CHECK macros do stay
   even in release builds, but in general are not much of a burden, while
   a judicious use of them might increase your program's stability.
@@ -43,7 +43,7 @@
 
 /** @name Macros which are completely disabled in 'release' mode */
 //@{
-#ifdef  __DEBUG__
+#ifdef  __WXDEBUG__
   /**
   this function may be redefined to do something non trivial and is called
   whenever one of debugging macros fails (i.e. condition is false in an
@@ -62,7 +62,7 @@
   // no more bugs ;-)
   #define   wxASSERT(cond)
   #define   wxASSERT_MSG(x, m)
-#endif  //DEBUG
+#endif  //WXDEBUG
 
   /// special form of assert: always triggers it (in debug mode)
 #define   wxFAIL                 wxASSERT(0)
@@ -99,5 +99,5 @@
 
 //@}
 
-#endif  // __DEBUGH__
+#endif  // __WXDEBUGH__
 

include/wx/defs.h

@@ -16,7 +16,7 @@
 #pragma interface "defs.h"
 #endif
 
-#ifdef __GTK__
+#ifdef __WXGTK__
 
 #include "glib.h"
 #include "gdk/gdk.h"
@@ -43,14 +43,14 @@
 //////////////////////////////////////////////////////////////////////////////////
 // Currently Only MS-Windows/NT, XView and Motif are supported
 //
-#if defined(__HPUX__) && !defined(__MOTIF__)
+#if defined(__HPUX__) && !defined(__WXMOTIF__)
-# define __MOTIF__
+# define __WXMOTIF__
 #endif
-#if defined(__MOTIF__)
+#if defined(__WXMOTIF__)
 # define __X__
-#elif defined(__WINDOWS__) || defined(__WINDOWS_386__) || defined(__NT__) || defined(__MSDOS__) 
+#elif defined(__WXMSW__) || defined(__WINDOWS_386__) || defined(__NT__) || defined(__MSDOS__) 
-# ifndef __WINDOWS__
+# ifndef __WXMSW__
-#  define __WINDOWS__
+#  define __WXMSW__
 # endif
 #endif
 
@@ -68,13 +68,13 @@
 #endif
 
 // Make sure the environment is set correctly
-#if defined(__WINDOWS__) && defined(__X__)
+#if defined(__WXMSW__) && defined(__X__)
 # error "Target can't be both X and Windows"
-#elif !defined(__MOTIF__) && !defined(__WINDOWS__) && !defined(__GTK__) && !defined(__MAC__) && !defined(__X__)
+#elif !defined(__WXMOTIF__) && !defined(__WXMSW__) && !defined(__WXGTK__) && !defined(__MAC__) && !defined(__X__)
-#error "No Target! Use -D[__MOTIF__|__GTK__|__WINDOWS__|__MAC__]"
+#error "No Target! Use -D[__WXMOTIF__|__WXGTK__|__WXMSW__|__MAC__]"
 #endif
 
-#if defined(__MOTIF__) || defined(__GTK__)
+#if defined(__WXMOTIF__) || defined(__WXGTK__)
 
 // Bool is now obsolete, use bool instead
 // typedef int Bool;
@@ -85,7 +85,7 @@
 # define Bool_DEFINED
 #endif
 
-#elif defined(__WINDOWS__)
+#elif defined(__WXMSW__)
 
 #ifndef TRUE
 # define TRUE  1
@@ -119,7 +119,7 @@ typedef int wxWindowID;
  * Making or using wxWindows as a Windows DLL
  */
 
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
 
 #ifdef __BORLANDC__
 
@@ -230,8 +230,8 @@ enum  ErrCode
 #endif
 
 #ifndef __UNIX__                     // Windows
-  #ifndef __WINDOWS__
+  #ifndef __WXMSW__
-    #define __WINDOWS__
+    #define __WXMSW__
   #endif
 
   #if   defined(_MSC_VER)
@@ -248,7 +248,7 @@ enum  ErrCode
 
 #if     defined(__UNIX__)
   #define FILE_PATH_SEPARATOR   ('/')
-#elif   defined(__WINDOWS__)
+#elif   defined(__WXMSW__)
   #define FILE_PATH_SEPARATOR   ('\\')
 #else
   #error "don't know path separator for this platform"
@@ -833,7 +833,7 @@ enum {
 #define wxID_YES                5103
 #define wxID_NO                 5104
 
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
 // Stand-ins for Windows types, to avoid
 // #including all of windows.h
 

include/wx/dialog.h

@@ -1,11 +1,11 @@
 #ifndef __DIALOGH_BASE__
 #define __DIALOGH_BASE__
 
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
 #include "wx/msw/dialog.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
 #include "wx/xt/dialog.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
 #include "wx/gtk/dialog.h"
 #endif
 

include/wx/dirdlg.h

@@ -1,11 +1,11 @@
 #ifndef __DIRDLGH_BASE__
 #define __DIRDLGH_BASE__
 
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
 #include "wx/msw/dirdlg.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
 #include "wx/xt/dirdlg.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
 #include "wx/gtk/dirdlg.h"
 #endif
 

include/wx/dnd.h

@@ -1,12 +1,12 @@
 #ifndef __DNDH_BASE__
 #define __DNDH_BASE__
 
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
 #include "wx/msw/ole/dropsrc.h"
 #include "wx/msw/ole/droptgt.h"
 #include "wx/msw/ole/dataobj.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
 #include "wx/gtk/dnd.h"
 #endif
 

include/wx/docview.h

@@ -283,9 +283,9 @@ class WXDLLEXPORT wxDocManager: public wxEvtHandler
   void OnUndo(wxCommandEvent& event);
   void OnRedo(wxCommandEvent& event);
 
-#ifdef WXWIN_COMPATIBILITY
+  // Extend event processing to search the view's event table
-  virtual wxDocument *CreateDocument(char *WXUNUSED(path), long WXUNUSED(flags = 0)) { return NULL; };
+  virtual bool ProcessEvent(wxEvent& event);
-#endif
+
   virtual wxDocument *CreateDocument(const wxString& path, long flags = 0);
   virtual wxView *CreateView(wxDocument *doc, long flags = 0);
   virtual void DeleteTemplate(wxDocTemplate *temp, long flags = 0);
@@ -317,7 +317,7 @@ class WXDLLEXPORT wxDocManager: public wxEvtHandler
   // Views or windows should inform the document manager
   // when a view is going in or out of focus
   virtual void ActivateView(wxView *view, bool activate = TRUE, bool deleting = FALSE);
-  virtual inline wxView *GetCurrentView(void) const { return m_currentView; }
+  virtual wxView *GetCurrentView(void) const;
 
   virtual inline wxList& GetDocuments(void) const { return (wxList&) m_docs; }
 

include/wx/dynarray.h

@@ -17,7 +17,7 @@
 #endif
 
 #include "wx/defs.h"
-#include "wx/utils.h"
+#include "wx/debug.h"
 
 /** @name Dynamic arrays and lists
     @memo Arrays which grow on demand and do range checking (only in debug)
@@ -41,7 +41,7 @@
 
 /**
  callback compare function for quick sort
- must return -1, 0 or +1 if pItem1 <, = or > pItem2
+ must return negative value, 0 or positive value if pItem1 <, = or > pItem2
  */
 
 #ifdef  __VISUALC__
@@ -123,10 +123,14 @@ protected:
       @return index of the first item matched or NOT_FOUND
       @see NOT_FOUND
      */
-  int  Index (long lItem, bool bFromEnd = FALSE) const;
+  int Index(long lItem, bool bFromEnd = FALSE) const;
+    /// search for an item using binary search in a sorted array
+  int Index(long lItem, CMPFUNC fnCompare) const;
     /// add new element at the end
-  void Add   (long lItem);
+  void Add(long lItem);
-    /// add new element at given position
+    /// add item assuming the array is sorted with fnCompare function
+  void Add(long lItem, CMPFUNC fnCompare);
+    /// add new element at given position (it becomes Item[uiIndex])
   void Insert(long lItem, uint uiIndex);
     /// remove first item matching this value
   void Remove(long lItem);
@@ -135,7 +139,7 @@ protected:
   //@}
 
   /// sort array elements using given compare function
-  void Sort(CMPFUNC fCmp);
+  void Sort(CMPFUNC fnCompare);
 
 private:
   void    Grow();     // makes array bigger if needed
@@ -193,6 +197,60 @@ public:                                                             \
   void Sort(CMPFUNC##T fCmp) { wxBaseArray::Sort((CMPFUNC)fCmp); }  \
 }
 
+// ----------------------------------------------------------------------------
+// This is the same as the previous macro, but it defines a sorted array.
+// Differences:
+//  1) it must be given a COMPARE function in ctor which takes 2 items of type
+//     T* and should return -1, 0 or +1 if the first one is less/greater
+//     than/equal to the second one.
+//  2) the Add() method inserts the item in such was that the array is always
+//     sorted (it uses the COMPARE function)
+//  3) it has no Sort() method because it's always sorted
+//  4) Index() method is much faster (the sorted arrays use binary search
+//     instead of linear one), but Add() is slower.
+//
+// Summary: use this class when the speed of Index() function is important, use
+// the normal arrays otherwise.
+//
+// NB: it has only inline functions => takes no space at all
+// ----------------------------------------------------------------------------
+#define  _WX_DEFINE_SORTED_ARRAY(T, name)                           \
+typedef int (CMPFUNC_CONV *SCMPFUNC##T)(T pItem1, T pItem2);        \
+class name : public wxBaseArray                                     \
+{                                                                   \
+public:                                                             \
+  name(SCMPFUNC##T fn)                                              \
+    { wxASSERT( sizeof(T) <= sizeof(long) ); m_fnCompare = fn; }    \
+                                                                    \
+  name& operator=(const name& src)                                  \
+    { ((wxBaseArray *)this)->operator=((const wxBaseArray&)src);    \
+      m_fnCompare = src.m_fnCompare;                                \
+      return *this; }                                               \
+                                                                    \
+  T& operator[](uint uiIndex) const                                 \
+    { return (T&)(wxBaseArray::Item(uiIndex)); }                    \
+  T& Item(uint uiIndex) const                                       \
+    { return (T&)(wxBaseArray::Item(uiIndex)); }                    \
+  T& Last() const                                                   \
+    { return (T&)(wxBaseArray::Item(Count() - 1)); }                \
+                                                                    \
+  int Index(T Item) const                                           \
+    { return wxBaseArray::Index((long)Item, (CMPFUNC)m_fnCompare); }\
+                                                                    \
+  void Add(T Item)                                                  \
+    { wxBaseArray::Add((long)Item, (CMPFUNC)m_fnCompare); }         \
+                                                                    \
+  void Remove(uint uiIndex) { wxBaseArray::Remove(uiIndex); }       \
+  void Remove(T Item)                                               \
+    { int iIndex = Index(Item);                                     \
+      wxCHECK2_MSG( iIndex != NOT_FOUND, return,                    \
+        "removing inexisting element in wxArray::Remove" );         \
+      wxBaseArray::Remove((uint)iIndex); }                          \
+                                                                    \
+private:                                                            \
+  SCMPFUNC##T m_fnCompare;                                          \
+}
+
 // ----------------------------------------------------------------------------
 // see WX_DECLARE_LIST and WX_DEFINE_LIST
 // ----------------------------------------------------------------------------
@@ -264,6 +322,14 @@ private:                                                            \
   */
 #define WX_DEFINE_ARRAY(T, name)  typedef T _A##name;                        \
                                   _WX_DEFINE_ARRAY(_A##name, name)
+
+  /**
+   This macro does the same as WX_DEFINE_ARRAY except that the array will be
+   sorted with the specified compare function.
+   */
+#define WX_DEFINE_SORTED_ARRAY(T, name)  typedef T _A##name;                 \
+                                  _WX_DEFINE_SORTED_ARRAY(_A##name, name)
+
   /**
    This macro generates a new list class which owns the objects it contains,
    i.e. it will delete them when it is destroyed. An element is of type T*,

include/wx/event.h

@@ -157,6 +157,8 @@ enum wxEventType {
  wxEVT_COMMAND_TREE_SET_INFO,
  wxEVT_COMMAND_TREE_ITEM_EXPANDED,
  wxEVT_COMMAND_TREE_ITEM_EXPANDING,
+ wxEVT_COMMAND_TREE_ITEM_COLLAPSED,
+ wxEVT_COMMAND_TREE_ITEM_COLLAPSING,
  wxEVT_COMMAND_TREE_SEL_CHANGED,
  wxEVT_COMMAND_TREE_SEL_CHANGING,
  wxEVT_COMMAND_TREE_KEY_DOWN,

include/wx/file.h

@@ -17,20 +17,9 @@
 #pragma interface "file.h"
 #endif
 
-// ----------------------------------------------------------------------------
-// simple types
-// ----------------------------------------------------------------------------
-
 #include  "wx/string.h"
 #include  "wx/filefn.h"
 
-// define off_t
-#include  <sys/types.h>
-
-#ifdef    _MSC_VER
-  #define   off_t       _off_t
-#endif
-
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
@@ -54,8 +43,6 @@ public:
   enum OpenMode { read, write, read_write, write_append };
     // standard values for file descriptor
   enum { fd_invalid = -1, fd_stdin, fd_stdout, fd_stderr };
-    // seek type
-  enum SeekMode { FromStart, FromEnd, FromCurrent };
 
   // static functions
   // ----------------
@@ -73,7 +60,7 @@ public:
   // open/close
   bool Create(const char *szFileName, bool bOverwrite = FALSE);
   bool Open(const char *szFileName, OpenMode mode = read);
-  inline bool Close();  // Close is a NOP if not opened
+  bool Close();  // Close is a NOP if not opened
 
   // assign an existing file descriptor and get it back from wxFile object
   void Attach(int fd) { Close(); m_fd = fd; }
@@ -84,17 +71,17 @@ public:
     // returns number of bytes read or ofsInvalid on error
   off_t Read(void *pBuf, off_t nCount);
     // returns true on success
-  bool Write(const void *pBuf, uint nCount);
+  uint Write(const void *pBuf, uint nCount);
     // returns true on success
-  bool Write(const wxString& str) { return Write(str.c_str(), str.Len()); }
+  bool Write(const wxString& s) { return Write(s.c_str(), s.Len()) != 0; }
     // flush data not yet written
   bool Flush();
 
   // file pointer operations (return ofsInvalid on failure)
     // move ptr ofs bytes related to start/current off_t/end of file
-  off_t Seek(off_t ofs, SeekMode mode = FromStart);
+  off_t Seek(off_t ofs, wxSeekMode mode = wxFromStart);
     // move ptr to ofs bytes before the end
-  off_t SeekEnd(off_t ofs = 0) { return Seek(ofs, FromEnd); }
+  off_t SeekEnd(off_t ofs = 0) { return Seek(ofs, wxFromEnd); }
     // get current off_t
   off_t Tell() const;
     // get current file length
@@ -105,6 +92,8 @@ public:
   bool IsOpened() const { return m_fd != fd_invalid; }
     // is end of file reached?
   bool Eof() const;
+    // is an error occured?
+  bool Error() const { return m_error; }
     
   // dtor closes the file if opened
  ~wxFile();
@@ -117,6 +106,7 @@ private:
   wxFile& operator=(const wxFile&);
 
   int m_fd; // file descriptor or INVALID_FD if not opened
+  bool m_error; // error memory
 };
 
 // ----------------------------------------------------------------------------
@@ -142,7 +132,7 @@ public:
   bool IsOpened() const { return m_file.IsOpened(); }
 
   // I/O (both functions return true on success, false on failure)
-  bool Write(const void *p, uint n) { return m_file.Write(p, n); }
+  bool Write(const void *p, uint n) { return m_file.Write(p, n) != 0; }
   bool Write(const wxString& str)   { return m_file.Write(str); }
 
   // different ways to close the file

include/wx/fileconf.h

@@ -118,6 +118,9 @@ public:
   virtual bool GetFirstEntry(wxString& str, long& lIndex);
   virtual bool GetNextEntry (wxString& str, long& lIndex);
 
+  virtual uint GetNumberOfEntries(bool bRecursive = FALSE) const;
+  virtual uint GetNumberOfGroups(bool bRecursive = FALSE) const;
+
   virtual bool HasGroup(const wxString& strName) const;
   virtual bool HasEntry(const wxString& strName) const;
 
@@ -197,8 +200,8 @@ private:
 //protected: --- if wxFileConfig::ConfigEntry is not public, functions in
 //               ConfigGroup such as Find/AddEntry can't return "ConfigEntry *"
 public:
-  WX_DEFINE_ARRAY(ConfigEntry *, ArrayEntries);
+  WX_DEFINE_SORTED_ARRAY(ConfigEntry *, ArrayEntries);
-  WX_DEFINE_ARRAY(ConfigGroup *, ArrayGroups);
+  WX_DEFINE_SORTED_ARRAY(ConfigGroup *, ArrayGroups);
 
   class ConfigEntry
   {
@@ -231,7 +234,6 @@ public:
     void SetLine(LineList *pLine);
   };
 
-protected:
   class ConfigGroup
   {
   private:

include/wx/filedlg.h

@@ -1,11 +1,11 @@
 #ifndef __FILEDLGH_BASE__
 #define __FILEDLGH_BASE__
 
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
 #include "wx/msw/filedlg.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
 #include "wx/xt/filedlg.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
 #include "wx/gtk/filedlg.h"
 #endif
 

include/wx/filefn.h

@@ -16,8 +16,28 @@
 #pragma interface "filefn.h"
 #endif
 
-#include "wx/list.h"
+#include <wx/list.h>
 
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
+// define off_t
+#include  <sys/types.h>
+
+#ifdef    _MSC_VER
+  #define   off_t       _off_t
+#endif
+
+typedef enum {
+  wxFromStart,
+  wxFromCurrent,
+  wxFromEnd
+} wxSeekMode;
+
+// ----------------------------------------------------------------------------
+// functions
+// ----------------------------------------------------------------------------
 bool WXDLLEXPORT wxFileExists(const wxString& filename);
 #define FileExists wxFileExists
 
@@ -133,6 +153,14 @@ bool WXDLLEXPORT wxRmdir(const wxString& dir, int flags = 0);
   #define PATH_SEP          PATH_SEP_DOS
 #endif  // Unix/Windows
 
+// this is useful for wxString::IsSameAs(): to compare two file names use
+// filename1.IsSameAs(filename2, wxARE_FILENAMES_CASE_SENSITIVE)
+#ifdef  __UNIX__
+  #define wxARE_FILENAMES_CASE_SENSITIVE  TRUE
+#else   // Windows
+  #define wxARE_FILENAMES_CASE_SENSITIVE  FALSE
+#endif  // Unix/Windows
+
 // is the char a path separator?
 inline bool wxIsPathSeparator(char c)
   { return c == FILE_SEP_PATH_DOS || c == FILE_SEP_PATH_UNIX; }
@@ -140,9 +168,20 @@ inline bool wxIsPathSeparator(char c)
 // does the string ends with path separator?
 bool WXDLLEXPORT wxEndsWithPathSeparator(const char *pszFileName);
 
+// split the full path into path (including drive for DOS), name and extension
+// (understands both '/' and '\\')
+void WXDLLEXPORT wxSplitPath(const char *pszFileName,
+                             wxString *pstrPath,
+                             wxString *pstrName,
+                             wxString *pstrExt);
+
 // find a file in a list of directories, returns false if not found
 bool WXDLLEXPORT wxFindFileInPath(wxString *pStr, const char *pszPath, const char *pszFile);
 
+// ----------------------------------------------------------------------------
+// classes
+// ----------------------------------------------------------------------------
+
 // Path searching
 class WXDLLEXPORT wxPathList: public wxStringList
 {

include/wx/font.h

@@ -1,11 +1,11 @@
 #ifndef __FONTH_BASE__
 #define __FONTH_BASE__
 
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
 #include "wx/msw/font.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
 #include "wx/xt/font.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
 #include "wx/gtk/font.h"
 #endif
 

include/wx/fontdlg.h

@@ -1,11 +1,11 @@
 #ifndef __FONTDLGH_BASE__
 #define __FONTDLGH_BASE__
 
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
 #include "wx/msw/fontdlg.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
 #include "wx/generic/fontdlgg.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
 #include "wx/generic/fontdlgg.h"
 #endif
 

include/wx/frame.h

@@ -1,11 +1,11 @@
 #ifndef __FRAMEH_BASE__
 #define __FRAMEH_BASE__
 
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
 #include "wx/msw/frame.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
 #include "wx/xt/frame.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
 #include "wx/gtk/frame.h"
 #endif
 

include/wx/fstream.h

@@ -0,0 +1,72 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        fstream.h
+// Purpose:     File stream classes
+// Author:      Guilhem Lavaux
+// Modified by:
+// Created:     11/07/98
+// RCS-ID:      $Id$
+// Copyright:   (c) Guilhem Lavaux
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+#ifndef __WXFSTREAM_H__
+#define __WXFSTREAM_H__
+
+#include <wx/object.h>
+#include <wx/string.h>
+#include <wx/stream.h>
+#include <wx/file.h>
+
+class wxFileInputStream: virtual public wxFile, public wxInputStream {
+ public:
+  wxFileInputStream(const wxString& fileName);
+  virtual ~wxFileInputStream();
+
+  wxInputStream& Read(void *buffer, size_t size);
+  off_t SeekI(off_t pos, wxSeekMode mode = wxFromStart);
+  off_t TellI() const;
+
+  bool Eof() const { return m_eof; }
+  size_t LastRead() const { return m_lastread; }
+
+  bool Ok() const { return wxFile::IsOpened(); }
+
+ protected:
+  wxFileInputStream() {}
+
+ protected:
+  bool m_eof;
+  bool m_ok_i;
+  size_t m_lastread;
+};
+
+class wxFileOutputStream: virtual wxFile, public wxOutputStream {
+ public:
+  wxFileOutputStream(const wxString& fileName);
+  virtual ~wxFileOutputStream();
+
+  wxOutputStream& Write(const void *buffer, size_t size);
+  off_t SeekO(off_t pos, wxSeekMode mode = wxFromStart);
+  off_t TellO() const;
+
+  bool Bad() const { return m_bad; }
+  size_t LastWrite() const { return m_lastwrite; }
+
+  void Sync();
+
+  bool IsOpened() const { return wxFile::IsOpened(); }
+
+ protected:
+  wxFileOutputStream() {}
+
+ protected:
+  bool m_bad;
+  size_t m_lastwrite;
+};
+
+class wxFileStream: public wxFileInputStream, public wxFileOutputStream {
+ public:
+  wxFileStream(const wxString& fileName);
+  virtual ~wxFileStream();
+};
+
+#endif

include/wx/gauge.h

@@ -1,11 +1,11 @@
 #ifndef __GAUGEH_BASE__
 #define __GAUGEH_BASE__
 
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
 #include "wx/msw/gauge.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
 #include "wx/xt/gauge.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
 #include "wx/gtk/gauge.h"
 #endif
 

include/wx/gdicmn.h

@@ -21,11 +21,11 @@
 #include "wx/hash.h"
 #include "wx/setup.h"
 
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
 #include "wx/msw/colour.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
 #include "wx/xt/colour.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
 #include "wx/gtk/colour.h"
 #endif
 
@@ -98,7 +98,7 @@ class WXDLLEXPORT wxRealPoint
 class WXDLLEXPORT wxPoint
 {
  public:
-#if defined(__WINDOWS__) && !defined(__WIN32__)
+#if defined(__WXMSW__) && !defined(__WIN32__)
   int x;
   int y;
 #else
@@ -330,7 +330,7 @@ extern void WXDLLEXPORT wxSetCursor(const wxCursor& cursor);
 
 // Useful macro for create icons portably
 
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
 # define wxICON(X) wxIcon(X##_icon);
 #elif defined(__X__)
 # define wxICON(X) wxIcon(X##_bits, X##_width, X##_height);

include/wx/gdiobj.h

@@ -1,11 +1,11 @@
 #ifndef __GDIOBJH_BASE__
 #define __GDIOBJH_BASE__
 
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
 #include "wx/msw/gdiobj.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
 #include "wx/xt/gdiobj.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
 #include "wx/gtk/gdiobj.h"
 #endif
 

include/wx/generic/colrdlgg.h

@@ -116,7 +116,7 @@ class WXDLLEXPORT wxGenericColourDialog: public wxDialog
 DECLARE_EVENT_TABLE()
 };
 
-#ifdef __GTK__
+#ifdef __WXGTK__
 typedef wxGenericColourDialog wxColourDialog;
 #endif
 

include/wx/generic/helpxlp.h

@@ -25,7 +25,7 @@
 
 #include "wx/helpbase.h"
 
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
 #include "wx/dde.h"
 #else
 // Or whatever it'll be called
@@ -38,7 +38,7 @@ class WXDLLEXPORT wxXLPHelpController;
 // wxHelp process and the application
 class WXDLLEXPORT wxXLPHelpConnection: public
 
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
  wxDDEConnection
 #else
  wxTCPConnection
@@ -62,7 +62,7 @@ class WXDLLEXPORT wxXLPHelpConnection: public
 // controlling the wxHelp process
 class WXDLLEXPORT wxXLPHelpClient: public
 
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
  wxDDEClient
 #else
  wxTCPClient

include/wx/generic/imaglist.h

@@ -47,7 +47,7 @@ class wxImageList: public wxObject
   public:
 
     wxImageList::wxImageList() { }
-    wxImageList(int width, int height, bool mask = TRUE, int initialCount = 1);
+    wxImageList( int width, int height, bool mask = TRUE, int initialCount = 1 );
     ~wxImageList();
     bool Create();
     int GetImageCount() const;
@@ -62,6 +62,8 @@ class wxImageList: public wxObject
   private:
 
     wxList  m_images;
+    int     m_width;
+    int     m_height;
 };
 
 #endif  // __IMAGELISTH_G__

include/wx/generic/listctrl.h

@@ -594,6 +594,7 @@ class wxListCtrl: public wxControl
     bool GetItemPosition( long item, wxPoint& pos ) const; // not supported in wxGLC
     bool SetItemPosition( long item, const wxPoint& pos ); // not supported in wxGLC
     int GetItemCount(void);
+    void SetItemSpacing( int spacing, bool isSmall = FALSE );
     int GetItemSpacing( bool isSmall );
     int GetSelectedItemCount(void);
 //  wxColour GetTextColour(void) const; // wxGLC has colours for every Item (see wxListItem)

include/wx/generic/msgdlgg.h

@@ -40,7 +40,7 @@ public:
 DECLARE_EVENT_TABLE()
 };
 
-#ifndef __WINDOWS__
+#ifndef __WXMSW__
 #define wxMessageDialog wxGenericMessageDialog
 
 int wxMessageBox(const wxString& message, const wxString& caption = wxMessageBoxCaptionStr, 

include/wx/generic/treectrl.h

@@ -194,6 +194,8 @@ typedef void (wxEvtHandler::*wxTreeEventFunction)(wxTreeEvent&);
 #define EVT_TREE_SET_INFO(id, fn) { wxEVT_COMMAND_TREE_SET_INFO, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
 #define EVT_TREE_ITEM_EXPANDED(id, fn) { wxEVT_COMMAND_TREE_ITEM_EXPANDED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
 #define EVT_TREE_ITEM_EXPANDING(id, fn) { wxEVT_COMMAND_TREE_ITEM_EXPANDING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
+#define EVT_TREE_ITEM_COLLAPSED(id, fn) { wxEVT_COMMAND_TREE_ITEM_COLLAPSED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
+#define EVT_TREE_ITEM_COLLAPSING(id, fn) { wxEVT_COMMAND_TREE_ITEM_COLLAPSING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
 #define EVT_TREE_SEL_CHANGED(id, fn) { wxEVT_COMMAND_TREE_SEL_CHANGED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
 #define EVT_TREE_SEL_CHANGING(id, fn) { wxEVT_COMMAND_TREE_SEL_CHANGING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
 #define EVT_TREE_KEY_DOWN(id, fn) { wxEVT_COMMAND_TREE_KEY_DOWN, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
@@ -272,6 +274,7 @@ public:
   long InsertItem( long parent, wxTreeItem &info,
                    long insertAfter = wxTREE_INSERT_LAST );
   void DeleteItem( long item );
+  void DeleteChildren( long item );
   bool DeleteAllItems();
   bool ExpandItem( long item, int action );
   bool GetItem( wxTreeItem &info ) const;

include/wx/gtk/bitmap.h

@@ -102,6 +102,8 @@ class wxBitmap: public wxObject
     wxMask *GetMask(void) const;
     void SetMask( wxMask *mask );
     
+    void Resize( int height, int width );
+    
     bool SaveFile( const wxString &name, int type, wxPalette *palette = NULL );
     bool LoadFile( const wxString &name, int type );
 
@@ -121,6 +123,10 @@ class wxBitmap: public wxObject
     GdkPixmap *GetPixmap(void) const;
     GdkBitmap *GetBitmap(void) const;
     
+    void DestroyImage(void);
+    void RecreateImage(void);
+    void Render(void);
+    
     // no data :-)
 };
 

include/wx/gtk/colour.h

@@ -20,6 +20,7 @@
 #include "wx/object.h"
 #include "wx/string.h"
 #include "wx/gdiobj.h"
+#include "wx/palette.h"
 
 //-----------------------------------------------------------------------------
 // classes

include/wx/gtk/dcclient.h

@@ -99,6 +99,7 @@ class wxPaintDC: public wxDC
     GdkGC        *m_textGC;
     GdkGC        *m_bgGC;
     GdkColormap  *m_cmap;
+    bool          m_isDrawable;
     
     void SetUpDC(void);
     GdkWindow *GetWindow(void);

include/wx/gtk/dcmemory.h

@@ -38,7 +38,7 @@ class WXDLLEXPORT wxMemoryDC: public wxPaintDC
     wxMemoryDC( wxDC *dc ); // Create compatible DC
     ~wxMemoryDC(void);
     virtual void SelectObject( const wxBitmap& bitmap );
-    void GetSize( int *width, int *height );
+    void GetSize( int *width, int *height ) const;
 
   private: 
     friend wxPaintDC;

include/wx/gtk/frame.h

@@ -70,7 +70,9 @@ class wxFrame: public wxWindow
     wxString GetTitle(void) const;
     void OnActivate( wxActivateEvent &WXUNUSED(event) ) {};
     
-    void GtkOnSize( int width, int height );
+  //private:    
+    
+    void GtkOnSize( int x, int y, int width, int height );
     
   private:
   

include/wx/gtk/icon.h

@@ -40,9 +40,7 @@ public:
 
   inline wxIcon(const wxIcon& icon) { Ref(icon); }
   inline wxIcon(const wxIcon* icon) { if (icon) Ref(*icon); }
-
+  wxIcon( char **bits, int width=-1, int height=-1 );
-  wxIcon( char **bits, int width=-1, int height=-1 ) :
-    wxBitmap( bits ) {};
   
   inline wxIcon& operator = (const wxIcon& icon) { if (*this == icon) return (*this); Ref(icon); return *this; }
   inline bool operator == (const wxIcon& icon) { return m_refData == icon.m_refData; }

include/wx/gtk/notebook.h

@@ -31,6 +31,7 @@ class wxNotebookPage;
 // ----------------------------------------------------------------------------
 // notebook events
 // ----------------------------------------------------------------------------
+
 class wxNotebookEvent : public wxCommandEvent
 {
 public:
@@ -136,12 +137,15 @@ public:
     // get the panel which represents the given page
   wxWindow *GetPage(int nPage) const;
 
+  // implementation
+  // --------------
+    // callbacks
+  void OnSize(wxSizeEvent&);
+
     // base class virtuals
   virtual void AddChild(wxWindow *child);
-
+  virtual void SetConstraintSizes(bool recurse);
-protected:
+  virtual bool DoPhase(int phase);
-  // wxWin callbacks
-  void OnSize(wxSizeEvent& event);
 
 private:
   // common part of all ctors

include/wx/gtk/window.h

@@ -222,6 +222,7 @@ class wxWindow: public wxEvtHandler
     bool            m_hasScrolling;
     bool            m_hasVMT;
     bool            m_sizeSet;
+    bool            m_resizing;
     
   public:  // Layout section
   

include/wx/gtk1/bitmap.h

@@ -102,6 +102,8 @@ class wxBitmap: public wxObject
     wxMask *GetMask(void) const;
     void SetMask( wxMask *mask );
     
+    void Resize( int height, int width );
+    
     bool SaveFile( const wxString &name, int type, wxPalette *palette = NULL );
     bool LoadFile( const wxString &name, int type );
 
@@ -121,6 +123,10 @@ class wxBitmap: public wxObject
     GdkPixmap *GetPixmap(void) const;
     GdkBitmap *GetBitmap(void) const;
     
+    void DestroyImage(void);
+    void RecreateImage(void);
+    void Render(void);
+    
     // no data :-)
 };
 

include/wx/gtk1/colour.h

@@ -20,6 +20,7 @@
 #include "wx/object.h"
 #include "wx/string.h"
 #include "wx/gdiobj.h"
+#include "wx/palette.h"
 
 //-----------------------------------------------------------------------------
 // classes

include/wx/gtk1/dcclient.h

@@ -99,6 +99,7 @@ class wxPaintDC: public wxDC
     GdkGC        *m_textGC;
     GdkGC        *m_bgGC;
     GdkColormap  *m_cmap;
+    bool          m_isDrawable;
     
     void SetUpDC(void);
     GdkWindow *GetWindow(void);

include/wx/gtk1/dcmemory.h

@@ -38,7 +38,7 @@ class WXDLLEXPORT wxMemoryDC: public wxPaintDC
     wxMemoryDC( wxDC *dc ); // Create compatible DC
     ~wxMemoryDC(void);
     virtual void SelectObject( const wxBitmap& bitmap );
-    void GetSize( int *width, int *height );
+    void GetSize( int *width, int *height ) const;
 
   private: 
     friend wxPaintDC;

include/wx/gtk1/frame.h

@@ -70,7 +70,9 @@ class wxFrame: public wxWindow
     wxString GetTitle(void) const;
     void OnActivate( wxActivateEvent &WXUNUSED(event) ) {};
     
-    void GtkOnSize( int width, int height );
+  //private:    
+    
+    void GtkOnSize( int x, int y, int width, int height );
     
   private:
   

include/wx/gtk1/icon.h

@@ -40,9 +40,7 @@ public:
 
   inline wxIcon(const wxIcon& icon) { Ref(icon); }
   inline wxIcon(const wxIcon* icon) { if (icon) Ref(*icon); }
-
+  wxIcon( char **bits, int width=-1, int height=-1 );
-  wxIcon( char **bits, int width=-1, int height=-1 ) :
-    wxBitmap( bits ) {};
   
   inline wxIcon& operator = (const wxIcon& icon) { if (*this == icon) return (*this); Ref(icon); return *this; }
   inline bool operator == (const wxIcon& icon) { return m_refData == icon.m_refData; }

include/wx/gtk1/notebook.h

@@ -31,6 +31,7 @@ class wxNotebookPage;
 // ----------------------------------------------------------------------------
 // notebook events
 // ----------------------------------------------------------------------------
+
 class wxNotebookEvent : public wxCommandEvent
 {
 public:
@@ -136,12 +137,15 @@ public:
     // get the panel which represents the given page
   wxWindow *GetPage(int nPage) const;
 
+  // implementation
+  // --------------
+    // callbacks
+  void OnSize(wxSizeEvent&);
+
     // base class virtuals
   virtual void AddChild(wxWindow *child);
-
+  virtual void SetConstraintSizes(bool recurse);
-protected:
+  virtual bool DoPhase(int phase);
-  // wxWin callbacks
-  void OnSize(wxSizeEvent& event);
 
 private:
   // common part of all ctors

include/wx/gtk1/window.h

@@ -222,6 +222,7 @@ class wxWindow: public wxEvtHandler
     bool            m_hasScrolling;
     bool            m_hasVMT;
     bool            m_sizeSet;
+    bool            m_resizing;
     
   public:  // Layout section
   

include/wx/help.h

@@ -1,18 +1,18 @@
 #ifndef __HELPH_BASE__
 #define __HELPH_BASE__
 
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
 #include "wx/msw/helpwin.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
 #include "wx/generic/helphtml.h"
 #else
 #include "wx/generic/helpxlp.h"
 #endif
 
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
 #define wxHelpController wxWinHelpController
 #define classwxHelpController classwxWinHelpController
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
 #define wxHelpController wxHTMLHelpController
 #define classwxHelpController classwxHTMLHelpController
 #else

include/wx/icon.h

@@ -1,11 +1,11 @@
 #ifndef __ICONH_BASE__
 #define __ICONH_BASE__
 
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
 #include "wx/msw/icon.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
 #include "wx/xt/icon.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
 #include "wx/gtk/icon.h"
 #endif
 

include/wx/imaglist.h

@@ -1,11 +1,11 @@
 #ifndef __IMAGLISTH_BASE__
 #define __IMAGLISTH_BASE__
 
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
 #include "wx/msw/imaglist.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
 #include "wx/generic/imaglist.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
 #include "wx/generic/imaglist.h"
 #endif
 

include/wx/intl.h

@@ -43,12 +43,7 @@ typedef unsigned long uint32;
 // ----------------------------------------------------------------------------
 class WXDLLEXPORT wxLocale;
 class WXDLLEXPORT wxMsgCatalog;
-
+extern WXDLLEXPORT_DATA(wxLocale *) g_pLocale;
-// ----------------------------------------------------------------------------
-// global functions
-// ----------------------------------------------------------------------------
-extern wxLocale* WXDLLEXPORT wxGetLocale();
-inline const char* wxGetTranslation(const char *sz);
 
 // ============================================================================
 // locale support
@@ -110,50 +105,16 @@ private:
 };
 
 // ----------------------------------------------------------------------------
-// inline functions
+// global functions
 // ----------------------------------------------------------------------------
+inline WXDLLEXPORT wxLocale* wxGetLocale() { return g_pLocale; }
 
 // get the translation of the string in the current locale  
-inline const char *wxGetTranslation(const char *sz)
+inline WXDLLEXPORT const char *wxGetTranslation(const char *sz)
 {
   wxLocale *pLoc = wxGetLocale();
   return pLoc == NULL ? sz : pLoc->GetString(sz);
 }
 
-// ============================================================================
-// optional features
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// wxTString: automatically translates strings to current language
-// ----------------------------------------------------------------------------
-
-// this feature should be enabled by defining WX_USE_AUTOTRANS, if it's not
-// done no automatic translation is performed
-#if  USE_AUTOTRANS
-  class WXDLLEXPORT wxTString
-  {
-  public:
-    // NB: different ctors do different things!
-      // does translation
-    wxTString(const char *sz) : m_pcsz(wxGetTranslation(sz)) { }
-      // no translation
-    wxTString(const wxString& s) : m_pcsz(s) { }
-
-    // NB: no copy ctor, it must be a POD so that we can pass it
-    //     to vararg functions (and it's not needed anyhow)
-    
-    // implicit conversion
-    operator const char *() const { return m_pcsz; }
-
-  private:
-    const char *m_pcsz;
-  };
-#else   //!USE_AUTOTRANS
-  #define wxTString   wxString
-#endif  //USE_AUTOTRANS
-
-#define TRANSSTRING_DEFINED
-  
 #endif
 	// __INTLH__

include/wx/joystick.h

@@ -1,10 +1,10 @@
 #ifndef __JOYSTICKH_BASE__
 #define __JOYSTICKH_BASE__
 
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
 #include "wx/msw/joystick.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
 #include "wx/gtk/joystick.h"
 #endif
 

include/wx/listbox.h

@@ -1,11 +1,11 @@
 #ifndef __LISTBOXH_BASE__
 #define __LISTBOXH_BASE__
 
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
 #include "wx/msw/listbox.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
 #include "wx/xt/listbox.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
 #include "wx/gtk/listbox.h"
 #endif
 

include/wx/listctrl.h

@@ -1,11 +1,11 @@
 #ifndef __LISTCTRLH_BASE__
 #define __LISTCTRLH_BASE__
 
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
 #include "wx/msw/listctrl.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
 #include "wx/generic/listctrl.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
 #include "wx/generic/listctrl.h"
 #endif
 

include/wx/log.h

@@ -42,7 +42,7 @@ enum
 #define wxTraceResAlloc 0x0004  // trace GDI resource allocation
 #define wxTraceRefCount 0x0008  // trace various ref counting operations
 
-#ifdef  __WINDOWS__
+#ifdef  __WXMSW__
   #define wxTraceOleCalls 0x0100  // OLE interface calls
 #endif
 
@@ -196,7 +196,7 @@ class wxLogFrame;
 class WXDLLEXPORT wxLogWindow : public wxLog
 {
 public:
-  wxLogWindow(const wxTString& strTitle, bool bShow = TRUE);
+  wxLogWindow(const char *szTitle, bool bShow = TRUE);
   ~wxLogWindow();
   
   // show/hide the log window
@@ -254,16 +254,13 @@ private:
 // define wxLog<level>
 // -------------------
 
-// NB: all these functions take `wxTString' and not
-//     `const wxTString&' because according to C++ standard
-//     the first argument to a vararg function can not be
-//     an array, function or reference :-(
-
-// the most generic log function
-void WXDLLEXPORT wxLogGeneric(wxLogLevel level, wxTString strFormat, ...);
-
 #define DECLARE_LOG_FUNCTION(level)                                 \
-        extern void WXDLLEXPORT wxLog##level(wxTString strFormat, ...)
+        extern void WXDLLEXPORT wxLog##level(const char *szFormat, ...)
+#define DECLARE_LOG_FUNCTION2(level, arg1)                          \
+        extern void WXDLLEXPORT wxLog##level(arg1, const char *szFormat, ...)
+
+// a generic function for all levels (level is passes as parameter)
+DECLARE_LOG_FUNCTION2(Generic, wxLogLevel level);
 
 // one function per each level
 DECLARE_LOG_FUNCTION(FatalError);
@@ -280,22 +277,22 @@ DECLARE_LOG_FUNCTION(SysError);
 
 // and another one which also takes the error code (for those broken APIs
 // that don't set the errno (like registry APIs in Win32))
-void WXDLLEXPORT wxLogSysError(long lErrCode, wxTString strFormat, ...);
+DECLARE_LOG_FUNCTION2(SysError, long lErrCode);
 
 // debug functions do nothing in release mode
-#ifdef  __DEBUG__
+#ifdef  __WXDEBUG__
-  // NB: debug functions don't translate their arguments
+  DECLARE_LOG_FUNCTION(Debug);
-  extern void WXDLLEXPORT wxLogDebug(const char *szFormat, ...);
 
   // first king of LogTrace is uncoditional: it doesn't check the level,
   // while the second one does nothing if all of level bits are not set
   // in wxLog::GetActive()->GetTraceMask().
-  extern void WXDLLEXPORT wxLogTrace(const char *szFormat, ...);
+  DECLARE_LOG_FUNCTION(Trace);
-  extern void WXDLLEXPORT wxLogTrace(wxTraceMask mask,
+  DECLARE_LOG_FUNCTION2(Trace, wxTraceMask mask);
-                                     const char *szFormat, ...);
 #else   //!debug
-  #define wxLogDebug
+  // these functions do nothing
-  #define wxLogTrace
+  inline void wxLogDebug(const char *, ...) { }
+  inline void wxLogTrace(const char *, ...) { }
+  inline void wxLogTrace(wxTraceMask, const char *, ...) { }
 #endif
 
 
@@ -321,15 +318,15 @@ const char* WXDLLEXPORT wxSysErrorMsg(unsigned long nErrCode = 0);
 // debug only logging functions: use them with API name and error code
 // ----------------------------------------------------------------------------
 
-#ifdef  __DEBUG__
+#ifdef  __WXDEBUG__
   #define wxLogApiError(api, rc)                                              \
                     wxLogDebug("At %s(%d) '%s' failed with error %lx (%s).",  \
                                __FILE__, __LINE__, api,                       \
                                rc, wxSysErrorMsg(rc))
   #define wxLogLastError(api) wxLogApiError(api, wxSysErrorCode())
 #else   //!debug
-  #define wxLogApiError(api, rc)
+  inline void wxLogApiError(const char *, long) { }
-  #define wxLogLastError(api)
+  inline void wxLogLastError(const char *) { }
 #endif  //debug/!debug
 
 #endif  //__LOGH__

include/wx/mdi.h

@@ -1,11 +1,11 @@
 #ifndef __MDIH_BASE__
 #define __MDIH_BASE__
 
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
 #include "wx/msw/mdi.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
 #include "wx/xt/mdi.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
 #include "wx/gtk/mdi.h"
 #endif
 

include/wx/memory.h

@@ -23,7 +23,7 @@
   info, or to be a straight call to the new operator.
 */
 
-#if (DEBUG && USE_MEMORY_TRACING) || USE_DEBUG_CONTEXT
+#if (WXDEBUG && USE_MEMORY_TRACING) || USE_DEBUG_CONTEXT
 
 #include <stddef.h>
 
@@ -39,7 +39,7 @@
 #define WXDEBUG_NEW new(__FILE__,__LINE__)
 #endif
 
-#if DEBUG
+#if WXDEBUG
 void * wxDebugAlloc(size_t size, char * fileName, int lineNum, bool isObject, bool isVect = FALSE);
 void wxDebugFree(void * buf, bool isVect = FALSE);
 
@@ -263,7 +263,7 @@ void WXDLLEXPORT wxTraceLevel(int level, const char *fmt ...);
 #define WXTRACE wxTrace
 #define WXTRACELEVEL wxTraceLevel
 
-#else // else part for the #if DEBUG
+#else // else part for the #if WXDEBUG
 
 inline void wxTrace(const char *WXUNUSED(fmt)) {}
 inline void wxTraceLevel(int WXUNUSED(level), const char *WXUNUSED(fmt)) {}
@@ -272,7 +272,7 @@ inline void wxTraceLevel(int WXUNUSED(level), const char *WXUNUSED(fmt)) {}
 #define WXTRACELEVEL TRUE ? (void)0 : wxTraceLevel
 #define WXDEBUG_NEW new
 
-#endif // DEBUG
+#endif // WXDEBUG
 
 #endif
     // __MEMORYH__

include/wx/menu.h

@@ -1,11 +1,11 @@
 #ifndef __MENUH_BASE__
 #define __MENUH_BASE__
 
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
 #include "wx/msw/menu.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
 #include "wx/xt/menu.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
 #include "wx/gtk/menu.h"
 #endif
 

include/wx/menuitem.h

@@ -49,7 +49,7 @@ DECLARE_DYNAMIC_CLASS(wxMenuItem)
 public:
   // ctor & dtor
   wxMenuItem(wxMenu *pParentMenu = NULL, int id = ID_SEPARATOR,
-             const wxTString& strName = "", const wxTString& wxHelp = "",
+             const wxString& strName = "", const wxString& wxHelp = "",
              bool bCheckable = FALSE, wxMenu *pSubMenu = NULL);
   virtual ~wxMenuItem();
 

include/wx/metafile.h

@@ -1,7 +1,7 @@
 #ifndef __METAFILEH_BASE__
 #define __METAFILEH_BASE__
 
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
 #include "wx/msw/metafile.h"
 #endif
 

include/wx/minifram.h

@@ -1,11 +1,11 @@
 #ifndef __MINIFRAMH_BASE__
 #define __MINIFRAMH_BASE_
 
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
 #include "wx/msw/minifram.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
 #include "wx/xt/minifram.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
 #include "wx/gtk/minifram.h"
 #endif
 

include/wx/msgdlg.h

@@ -1,11 +1,11 @@
 #ifndef __MSGDLGH_BASE__
 #define __MSGDLGH_BASE__
 
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
 #include "wx/msw/msgdlg.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
 #include "wx/generic/msgdlgg.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
 #include "wx/generic/msgdlgg.h"
 #endif
 

include/wx/mstream.h

@@ -0,0 +1,75 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        mstream.h
+// Purpose:     Memory stream classes
+// Author:      Guilhem Lavaux
+// Modified by:
+// Created:     11/07/98
+// RCS-ID:      $Id$
+// Copyright:   (c) Guilhem Lavaux
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+#ifndef __WXMMSTREAM_H__
+#define __WXMMSTREAM_H__
+
+#include <wx/stream.h>
+
+class wxMemoryStreamBase {
+ protected:
+  wxMemoryStreamBase();
+  virtual ~wxMemoryStreamBase();
+
+  bool ChangeBufferSize(size_t new_length);
+
+ protected:
+  bool m_persistent;
+  size_t m_length;
+  char *m_buffer;
+  int m_iolimit;
+};
+
+class wxMemoryInputStream: virtual public wxMemoryStreamBase, public wxInputStream {
+ public:
+  wxMemoryInputStream(const char *data, size_t length);
+  virtual ~wxMemoryInputStream();
+ 
+  wxInputStream& Read(void *buffer, size_t size);
+  off_t SeekI(off_t pos, wxSeekMode mode);
+  off_t TellI() const { return m_position_i; }
+
+  bool Eof() const { return m_eof; }
+  size_t LastRead() const { return m_lastread; }
+
+ protected:
+  bool m_eof;
+  off_t m_position_i;
+  size_t m_lastread;
+};
+
+class wxMemoryOutputStream: virtual public wxMemoryStreamBase, public wxOutputStream {
+ public:
+  wxMemoryOutputStream(char *data = NULL, size_t length = 0);
+  virtual ~wxMemoryOutputStream();
+
+  wxOutputStream& Write(const void *buffer, size_t size);
+  off_t SeekO(off_t pos, wxSeekMode mode);
+  off_t TellO() const { return m_position_o; }
+
+  bool Bad() const { return m_bad; }
+  size_t LastWrite() const { return m_lastwrite; }
+
+  char *GetData() { return m_buffer; }
+  size_t GetLength() { return m_length; }
+
+ protected:
+  bool m_bad;
+  off_t m_position_o;
+  size_t m_lastwrite;
+};
+
+class wxMemoryStream: public wxMemoryInputStream, public wxMemoryOutputStream {
+ public:
+  wxMemoryStream(char *data = NULL, size_t length = 0);
+  virtual ~wxMemoryStream();
+};
+
+#endif

include/wx/msw/bitmap.h

@@ -79,7 +79,7 @@ public:
   wxPalette     m_bitmapPalette;
   int           m_quality;
 
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
   WXHBITMAP     m_hBitmap;
   wxDC *        m_selectedInto; // So bitmap knows whether it's been selected into
                       // a device context (for error checking)

include/wx/msw/filedlg.h

@@ -61,10 +61,11 @@ public:
     int ShowModal(void);
 };
 
-#define wxOPEN 1
+#define wxOPEN              0x0001
-#define wxSAVE 2
+#define wxSAVE              0x0002
-#define wxOVERWRITE_PROMPT 4
+#define wxOVERWRITE_PROMPT  0x0004
-#define wxHIDE_READONLY 8
+#define wxHIDE_READONLY     0x0008
+#define wxFILE_MUST_EXIST   0x0010
 
 // File selector - backward compatibility
 char* WXDLLEXPORT wxFileSelector(const char *message = wxFileSelectorPromptStr, const char *default_path = NULL,

include/wx/msw/notebook.h

@@ -160,6 +160,8 @@ public:
   // -------------------
   virtual void Command(wxCommandEvent& event);
   virtual bool MSWNotify(WXWPARAM wParam, WXLPARAM lParam);
+  virtual void SetConstraintSizes(bool recurse = TRUE);
+  virtual bool DoPhase(int nPhase);
 
 protected:
   // common part of all ctors
@@ -167,7 +169,6 @@ protected:
 
   // helper functions
   void ChangePage(int nOldSel, int nSel); // change pages
-  void FitPage(wxNotebookPage *pPage);    // fit a page in the tab control
 
   wxImageList  *m_pImageList; // we can have an associated image list
   wxArrayPages  m_aPages;     // array of pages

include/wx/msw/ole/oleutils.h

@@ -121,7 +121,7 @@ bool IsIidFromList(REFIID riid, const IID *aIids[], size_t nCount);
 // Debugging support
 // ============================================================================
 
-#if defined(__DEBUG__) && defined(_MSC_VER) && (_MSC_VER > 1000)
+#if defined(__WXDEBUG__) && defined(_MSC_VER) && (_MSC_VER > 1000)
 // ----------------------------------------------------------------------------
 // 
 // ----------------------------------------------------------------------------
@@ -137,10 +137,10 @@ void wxLogQueryInterface(const char *szInterface, REFIID riid);
 void wxLogAddRef (const char *szInterface, ULONG cRef);
 void wxLogRelease(const char *szInterface, ULONG cRef);
 
-#else   //!DEBUG
+#else   //!WXDEBUG
   #define   wxLogQueryInterface(szInterface, riid)
   #define   wxLogAddRef(szInterface, cRef)
   #define   wxLogRelease(szInterface, cRef)
-#endif  //DEBUG
+#endif  //WXDEBUG
 
 #endif  //_OLEUTILS_H

include/wx/msw/private.h

@@ -38,9 +38,14 @@ void WXDLLEXPORT wxFillLogFont(LOGFONT *logFont, wxFont *font);
 wxFont WXDLLEXPORT wxCreateFontFromLogFont(LOGFONT *logFont); // , bool createNew = TRUE);
 
 #ifdef __GNUWIN32__
-#define CASTWNDPROC (long unsigned)
+#  define CASTWNDPROC (long unsigned)
 #else
-#define CASTWNDPROC
+#  ifdef __BORLANDC__
+#    define CASTWNDPROC
+#  else
+     typedef long (_stdcall * WndProcCast) (HWND, unsigned int, unsigned int, long);
+#    define CASTWNDPROC (WndProcCast)
+#  endif
 #endif
 
 #if !defined(APIENTRY)	// NT defines APIENTRY, 3.x not

include/wx/msw/setup.h

@@ -116,13 +116,13 @@
                                   // NOW MANDATORY: don't change.
 #define USE_MEMORY_TRACING      1
                                   // If 1, enables debugging versions of wxObject::new and
-                                  // wxObject::delete *IF* DEBUG is also defined.
+                                  // wxObject::delete *IF* WXDEBUG is also defined.
                                   // WARNING: this code may not work with all architectures, especially
                                   // if alignment is an issue.
 #define USE_DEBUG_CONTEXT       1
                                   // If 1, enables wxDebugContext, for
                                   // writing error messages to file, etc. 
-                                  // If DEBUG is not defined, will still use
+                                  // If WXDEBUG is not defined, will still use
                                   // normal memory operators.
                                   // It's recommended to set this to 1,
                                   // since you may well need to output

include/wx/msw/textctrl.h

@@ -45,10 +45,10 @@ class WXDLLEXPORT wxTextCtrl: public wxControl
 {
   DECLARE_DYNAMIC_CLASS(wxTextCtrl)
     
- protected:
+public:
-  wxString fileName;
+  // creation
- public:
+  // --------
-  wxTextCtrl(void);
+  wxTextCtrl();
   inline wxTextCtrl(wxWindow *parent, wxWindowID id,
                     const wxString& value = wxEmptyString,
                     const wxPoint& pos = wxDefaultPosition,
@@ -69,35 +69,40 @@ class WXDLLEXPORT wxTextCtrl: public wxControl
               const wxValidator& validator = wxDefaultValidator,
               const wxString& name = wxTextCtrlNameStr);
   
-  virtual wxString GetValue(void) const ;
+  // accessors
+  // ---------
+  virtual wxString GetValue() const ;
   virtual void SetValue(const wxString& value);
+
+  virtual int GetLineLength(long lineNo) const;
+  virtual wxString GetLineText(long lineNo) const;
+  virtual int GetNumberOfLines() const;
+
+  // operations
+  // ----------
   virtual void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
   
   // Clipboard operations
-  virtual void Copy(void);
+  virtual void Copy();
-  virtual void Cut(void);
+  virtual void Cut();
-  virtual void Paste(void);
+  virtual void Paste();
   
   virtual void SetInsertionPoint(long pos);
-  virtual void SetInsertionPointEnd(void);
+  virtual void SetInsertionPointEnd();
-  virtual long GetInsertionPoint(void) const ;
+  virtual long GetInsertionPoint() const ;
-  virtual long GetLastPosition(void) const ;
+  virtual long GetLastPosition() const ;
   virtual void Replace(long from, long to, const wxString& value);
   virtual void Remove(long from, long to);
   virtual void SetSelection(long from, long to);
-
-  virtual void Command(wxCommandEvent& event);
-
   virtual void SetEditable(bool editable);
   
+  // streambuf implementation
 #ifndef NO_TEXT_WINDOW_STREAM
   int overflow(int i);
-  int sync(void);
+  int sync();
-  int underflow(void);
+  int underflow();
 #endif
   
-  void OnDropFiles(wxDropFilesEvent& event);
-
   wxTextCtrl& operator<<(const wxString& s);
   wxTextCtrl& operator<<(int i);
   wxTextCtrl& operator<<(long i);
@@ -108,41 +113,43 @@ class WXDLLEXPORT wxTextCtrl: public wxControl
   virtual bool LoadFile(const wxString& file);
   virtual bool SaveFile(const wxString& file);
   virtual void WriteText(const wxString& text);
-  virtual void DiscardEdits(void);
+  virtual void DiscardEdits();
-  virtual bool IsModified(void) const;
+  virtual bool IsModified() const;
   
 #if WXWIN_COMPATIBILITY
-  inline bool Modified(void) const { return IsModified(); }
+  inline bool Modified() const { return IsModified(); }
 #endif
   
   virtual long XYToPosition(long x, long y) const ;
   virtual void PositionToXY(long pos, long *x, long *y) const ;
   virtual void ShowPosition(long pos);
-  virtual int GetLineLength(long lineNo) const ;
+  virtual void Clear();
-  virtual wxString GetLineText(long lineNo) const ;
-  virtual int GetNumberOfLines(void) const ;
-  virtual void Clear(void);
-
-  // Process special keys e.g. 'enter' and process as if it were a command, if required
-  void OnChar(wxKeyEvent& event);
   
+  // callbacks
+  // ---------
+  void OnDropFiles(wxDropFilesEvent& event);
+  void OnChar(wxKeyEvent& event); // Process 'enter' if required
   void OnEraseBackground(wxEraseEvent& event);
   
   // Implementation
+  // --------------
+  virtual void Command(wxCommandEvent& event);
   virtual bool MSWCommand(WXUINT param, WXWORD id);
-  inline bool IsRich(void) { return m_isRich; }
+  inline bool IsRich() const { return m_isRich; }
   inline void SetRichEdit(bool isRich) { m_isRich = isRich; }
   virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
-			WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
+                              WXUINT message, WXWPARAM wParam,
+                              WXLPARAM lParam);
   
-  virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
+  virtual void AdoptAttributesFromHWND();
-  virtual void AdoptAttributesFromHWND(void);
+  virtual void SetupColours();
-  virtual void SetupColours(void);
+  virtual long MSWGetDlgCode();
   
 protected:
   bool      m_isRich; // Are we using rich text edit to implement this?
+  wxString  fileName;
   
-DECLARE_EVENT_TABLE()
+  DECLARE_EVENT_TABLE()
 };
 
 #endif

include/wx/msw/treectrl.h

@@ -95,7 +95,7 @@ public:
     int             m_children;
     long            m_data;
 
-    wxTreeItem(void);
+    wxTreeItem();
 
 // Accessors
     inline long GetMask() const { return m_mask; }
@@ -110,7 +110,7 @@ public:
 
     inline void SetMask(long mask) { m_mask = mask; }
     inline void SetItemId(long id) { m_itemId = m_itemId = id; }
-    inline void GetState(long state) { m_state = state; }
+    inline void SetState(long state) { m_state = state; }
     inline void SetStateMask(long stateMask) { m_stateMask = stateMask; }
     inline void GetText(const wxString& text) { m_text = text; }
     inline void SetImage(int image) { m_image = image; }
@@ -121,13 +121,14 @@ public:
 
 class WXDLLEXPORT wxTreeCtrl: public wxControl
 {
-  DECLARE_DYNAMIC_CLASS(wxTreeCtrl)
+public:
- public:
    /*
     * Public interface
     */
     
-  wxTreeCtrl(void);
+    // creation
+    // --------
+    wxTreeCtrl();
     
     inline wxTreeCtrl(wxWindow *parent, wxWindowID id = -1,
         const wxPoint& pos = wxDefaultPosition,
@@ -138,7 +139,7 @@ class WXDLLEXPORT wxTreeCtrl: public wxControl
     {
         Create(parent, id, pos, size, style, validator, name);
     }
-  ~wxTreeCtrl(void);
+    ~wxTreeCtrl();
     
     bool Create(wxWindow *parent, wxWindowID id = -1,
                 const wxPoint& pos = wxDefaultPosition,
@@ -147,52 +148,85 @@ class WXDLLEXPORT wxTreeCtrl: public wxControl
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = "wxTreeCtrl");
     
-  // Attributes
+    // accessors
-  int GetCount(void) const ;
+    // ---------
-  int GetIndent(void) const ;
+      //
-  void SetIndent(int indent) ;
+    int GetCount() const;
-  wxImageList *GetImageList(int which = wxIMAGE_LIST_NORMAL) const ;
+
-  void SetImageList(wxImageList *imageList, int which = wxIMAGE_LIST_NORMAL) ;
+      // indent
-  long GetNextItem(long item, int code) const ;
+    int GetIndent() const;
-  bool ItemHasChildren(long item) const ;
+    void SetIndent(int indent);
-  long GetChild(long item) const ;
+      // image list
-  long GetParent(long item) const ;
+    wxImageList *GetImageList(int which = wxIMAGE_LIST_NORMAL) const;
-  long GetFirstVisibleItem(void) const ;
+    void SetImageList(wxImageList *imageList, int which = wxIMAGE_LIST_NORMAL);
-  long GetNextVisibleItem(long item) const ;
+
-  long GetSelection(void) const ;
+      // navigation inside the tree
-  long GetRootItem(void) const ;
+    long GetNextItem(long item, int code) const;
-  bool GetItem(wxTreeItem& info) const ;
+    bool ItemHasChildren(long item) const;
-  bool SetItem(wxTreeItem& info) ;
+    long GetChild(long item) const;
-  int  GetItemState(long item, long stateMask) const ;
+    long GetParent(long item) const;
-  bool SetItemState(long item, long state, long stateMask) ;
+    long GetFirstVisibleItem() const;
-  bool SetItemImage(long item, int image, int selImage) ;
+    long GetNextVisibleItem(long item) const;
-  wxString GetItemText(long item) const ;
+    long GetSelection() const;
-  void SetItemText(long item, const wxString& str) ;
+    long GetRootItem() const;
-  long GetItemData(long item) const ;
+
-  bool SetItemData(long item, long data) ;
+      // generic function for (g|s)etting item attributes
+    bool GetItem(wxTreeItem& info) const;
+    bool SetItem(wxTreeItem& info);
+      // item state
+    int  GetItemState(long item, long stateMask) const;
+    bool SetItemState(long item, long state, long stateMask);
+      // item image
+    bool SetItemImage(long item, int image, int selImage);
+      // item text
+    wxString GetItemText(long item) const;
+    void SetItemText(long item, const wxString& str);
+      // custom data associated with the item
+    long GetItemData(long item) const;
+    bool SetItemData(long item, long data);
+      // convenience function
+    bool IsItemExpanded(long item) 
+    { 
+      return (GetItemState(item, wxTREE_STATE_EXPANDED) & 
+                           wxTREE_STATE_EXPANDED) != 0;
+    }
+
+      // bounding rect
     bool GetItemRect(long item, wxRectangle& rect, bool textOnly = FALSE) const;
-  wxTextCtrl& GetEditControl(void) const;
+      //
+    wxTextCtrl& GetEditControl() const;
     
-  // Operations
+    // operations
+    // ----------
+      // adding/deleting items
     bool DeleteItem(long item);
-  bool ExpandItem(long item, int action);
+    long InsertItem(long parent, wxTreeItem& info,
-  long InsertItem(long parent, wxTreeItem& info, long insertAfter = wxTREE_INSERT_LAST);
+                    long insertAfter = wxTREE_INSERT_LAST);
-
       // If image > -1 and selImage == -1, the same image is used for
       // both selected and unselected items.
-  long InsertItem(long parent, const wxString& label, int image = -1, int selImage = -1, long insertAfter = wxTREE_INSERT_LAST);
+    long InsertItem(long parent, const wxString& label,
+                    int image = -1, int selImage = -1, 
+                    long insertAfter = wxTREE_INSERT_LAST);
+
+      // changing item state
+    bool ExpandItem(long item)   { return ExpandItem(item, wxTREE_EXPAND_EXPAND);   }
+    bool CollapseItem(long item) { return ExpandItem(item, wxTREE_EXPAND_COLLAPSE); }
+    bool ToggleItem(long item)   { return ExpandItem(item, wxTREE_EXPAND_TOGGLE);   }
+      // common interface for {Expand|Collapse|Toggle}Item
+    bool ExpandItem(long item, int action);
+    
+      // 
     bool SelectItem(long item);
     bool ScrollTo(long item);
-  bool DeleteAllItems(void) ;
+    bool DeleteAllItems();
-  wxTextCtrl& Edit(long item) ;
+    wxTextCtrl& Edit(long item);
     long HitTest(const wxPoint& point, int& flags);
-//  wxImageList *CreateDragImage(long item) ;
+    //  wxImageList *CreateDragImage(long item);
-  bool SortChildren(long item) ;
+    bool SortChildren(long item);
-  bool EnsureVisible(long item) ;
+    bool EnsureVisible(long item);
-
-  void Command(wxCommandEvent& event) { ProcessCommand(event); };
     
     // IMPLEMENTATION
+    void Command(wxCommandEvent& event) { ProcessCommand(event); };
     bool MSWCommand(WXUINT param, WXWORD id);
     bool MSWNotify(WXWPARAM wParam, WXLPARAM lParam);
     
@@ -200,6 +234,8 @@ protected:
     wxTextCtrl m_textCtrl;
     wxImageList *m_imageListNormal;
     wxImageList *m_imageListState;
+
+    DECLARE_DYNAMIC_CLASS(wxTreeCtrl)
 };
 
 /*
@@ -212,6 +248,8 @@ protected:
  wxEVT_COMMAND_TREE_SET_INFO,
  wxEVT_COMMAND_TREE_ITEM_EXPANDED,
  wxEVT_COMMAND_TREE_ITEM_EXPANDING,
+ wxEVT_COMMAND_TREE_ITEM_COLLAPSED,
+ wxEVT_COMMAND_TREE_ITEM_COLLAPSING,
  wxEVT_COMMAND_TREE_SEL_CHANGED,
  wxEVT_COMMAND_TREE_SEL_CHANGING,
  wxEVT_COMMAND_TREE_KEY_DOWN
@@ -246,6 +284,8 @@ typedef void (wxEvtHandler::*wxTreeEventFunction)(wxTreeEvent&);
 #define EVT_TREE_SET_INFO(id, fn) { wxEVT_COMMAND_TREE_SET_INFO, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
 #define EVT_TREE_ITEM_EXPANDED(id, fn) { wxEVT_COMMAND_TREE_ITEM_EXPANDED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
 #define EVT_TREE_ITEM_EXPANDING(id, fn) { wxEVT_COMMAND_TREE_ITEM_EXPANDING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
+#define EVT_TREE_ITEM_COLLAPSED(id, fn) { wxEVT_COMMAND_TREE_ITEM_COLLAPSED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
+#define EVT_TREE_ITEM_COLLAPSING(id, fn) { wxEVT_COMMAND_TREE_ITEM_COLLAPSING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
 #define EVT_TREE_SEL_CHANGED(id, fn) { wxEVT_COMMAND_TREE_SEL_CHANGED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
 #define EVT_TREE_SEL_CHANGING(id, fn) { wxEVT_COMMAND_TREE_SEL_CHANGING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
 #define EVT_TREE_KEY_DOWN(id, fn) { wxEVT_COMMAND_TREE_KEY_DOWN, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },

include/wx/msw/window.h

@@ -386,7 +386,6 @@ public:
   // Do Update UI processing for controls
   void UpdateWindowUI(void);
 
-  void OnSize(wxSizeEvent& event);
   void OnEraseBackground(wxEraseEvent& event);
   void OnChar(wxKeyEvent& event);
   void OnPaint(wxPaintEvent& event);

include/wx/notebook.h

@@ -1,11 +1,11 @@
 #ifndef __NOTEBOOKH_BASE__
 #define __NOTEBOOKH_BASE__
 
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
   #include  "wx/msw/notebook.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
   #error "wxNotebook not implemented under Motif"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
   #include  "wx/gtk/notebook.h"
 #endif
 

include/wx/object.h

@@ -206,7 +206,7 @@ class WXDLLEXPORT wxObject
 
   bool IsKindOf(wxClassInfo *info);
 
-#if DEBUG && USE_MEMORY_TRACING
+#if WXDEBUG && USE_MEMORY_TRACING
   void * operator new (size_t size, char * fileName = NULL, int lineNum = 0);
   void operator delete (void * buf);
   
@@ -218,7 +218,7 @@ class WXDLLEXPORT wxObject
 
 #endif
 
-#if DEBUG || USE_DEBUG_CONTEXT
+#if WXDEBUG || USE_DEBUG_CONTEXT
   virtual void Dump(ostream& str);
 #endif
 
@@ -256,7 +256,7 @@ private:
     int m_count;
 };
 
-#if DEBUG && USE_GLOBAL_MEMORY_OPERATORS
+#if WXDEBUG && USE_GLOBAL_MEMORY_OPERATORS
 #ifndef WXDEBUG_NEW
 #define WXDEBUG_NEW new(__FILE__,__LINE__)
 #endif