diff --git a/include/wx/ffile.h b/include/wx/ffile.h
new file mode 100644
index 0000000000..6a3f6fdb9e
--- /dev/null
+++ b/include/wx/ffile.h
@@ -0,0 +1,114 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        ffile.h
+// Purpose:     wxFFile - encapsulates "FILE *" stream
+// Author:      Vadim Zeitlin
+// Modified by:
+// Created:     14.07.99
+// RCS-ID:      $Id$
+// Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
+// Licence:     wxWindows license
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef   _WX_FFILE_H_
+#define   _WX_FFILE_H_
+
+#ifdef __GNUG__
+    #pragma interface "ffile.h"
+#endif
+
+#if wxUSE_FILE
+
+#ifndef WX_PRECOMP
+  #include  "wx/string.h"
+  #include  "wx/filefn.h"
+#endif
+
+#include <stdio.h>
+
+// ----------------------------------------------------------------------------
+// class wxFFile: standard C stream library IO
+//
+// NB: for space efficiency this class has no virtual functions, including
+//     dtor which is _not_ virtual, so it shouldn't be used as a base class.
+// ----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxFFile
+{
+public:
+  // ctors
+  // -----
+    // def ctor
+  wxFFile() { m_fp = NULL; }
+    // open specified file (may fail, use IsOpened())
+  wxFFile(const wxChar *filename, const char *mode = "r");
+    // attach to (already opened) file
+  wxFFile(FILE *fp) { m_fp = fp; }
+
+  // open/close
+    // open a file (existing or not - the mode controls what happens)
+  bool Open(const wxChar *filename, const char *mode = "r");
+    // closes the opened file (this is a NOP if not opened)
+  bool Close();
+
+  // assign an existing file descriptor and get it back from wxFFile object
+  void Attach(FILE *fp, const wxString& name = _T(""))
+    { Close(); m_fp = fp; m_name = name; }
+  void Detach() { m_fp = NULL; }
+  FILE *fp() const { return m_fp; }
+
+  // read/write (unbuffered)
+    // read all data from the file into a string (useful for text files)
+  bool ReadAll(wxString *str);
+    // returns number of bytes read - use Eof() and Error() to see if an error
+    // occured or not
+  size_t Read(void *pBuf, size_t nCount);
+    // returns the number of bytes written
+  size_t Write(const void *pBuf, size_t nCount);
+    // returns true on success
+  bool Write(const wxString& s)
+  {
+      size_t size = s.Len()*sizeof(wxChar);
+      return Write(s.c_str(), size) == size;
+  }
+    // flush data not yet written
+  bool Flush();
+
+  // file pointer operations (return ofsInvalid on failure)
+    // move ptr ofs bytes related to start/current pos/end of file
+  bool Seek(long ofs, wxSeekMode mode = wxFromStart);
+    // move ptr to ofs bytes before the end
+  bool SeekEnd(long ofs = 0) { return Seek(ofs, wxFromEnd); }
+    // get current position in the file
+  size_t Tell() const;
+    // get current file length
+  size_t Length() const;
+
+  // simple accessors
+    // is file opened?
+  bool IsOpened() const { return m_fp != NULL; }
+    // is end of file reached?
+  bool Eof() const { return feof(m_fp) != 0; }
+    // is an error occured?
+  bool Error() const { return ferror(m_fp) != 0; }
+    // get the file name
+  const wxString& GetName() const { return m_name; }
+
+  // dtor closes the file if opened
+  ~wxFFile() { Close(); }
+
+private:
+  // copy ctor and assignment operator are private because it doesn't make
+  // sense to copy files this way: attempt to do it will provoke a compile-time
+  // error.
+  wxFFile(const wxFFile&);
+  wxFFile& operator=(const wxFFile&);
+
+  FILE *m_fp;       // IO stream or NULL if not opened
+
+  wxString m_name;  // the name of the file (for diagnostic messages)
+};
+
+#endif // wxUSE_FILE
+
+#endif // _WX_FFILE_H_
+
diff --git a/include/wx/file.h b/include/wx/file.h
index 73deef73cb..89718b6120 100644
--- a/include/wx/file.h
+++ b/include/wx/file.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        file.cpp
+// Name:        file.h
 // Purpose:     wxFile - encapsulates low-level "file descriptor"
 //              wxTempFile - safely replace the old file
 // Author:      Vadim Zeitlin
@@ -10,8 +10,8 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef   __FILEH__
-#define   __FILEH__
+#ifndef _WX_FILEH__
+#define _WX_FILEH__
 
 #ifdef __GNUG__
 #pragma interface "file.h"
@@ -96,10 +96,14 @@ public:
   // read/write (unbuffered)
     // returns number of bytes read or ofsInvalid on error
   off_t Read(void *pBuf, off_t nCount);
-    // returns true on success
+    // returns the number of bytes written
   size_t Write(const void *pBuf, size_t nCount);
     // returns true on success
-  bool Write(const wxString& s) { return Write(s.c_str(), s.Len()*sizeof(wxChar)) != 0; }
+  bool Write(const wxString& s)
+  {
+      size_t size = s.Len()*sizeof(wxChar);
+      return Write(s.c_str(), size) == size;
+  }
     // flush data not yet written
   bool Flush();
 
@@ -118,11 +122,11 @@ public:
   bool IsOpened() const { return m_fd != fd_invalid; }
     // is end of file reached?
   bool Eof() const;
-    // is an error occured?
+    // has an error occured?
   bool Error() const { return m_error; }
 
   // dtor closes the file if opened
-  ~wxFile();
+  ~wxFile() { Close(); }
 
 private:
   // copy ctor and assignment operator are private because
@@ -180,7 +184,6 @@ private:
   wxFile    m_file;     // the temporary file
 };
 
-#endif
+#endif // wxUSE_FILE
 
-#endif
-        // _WX_FILEH__
+#endif // _WX_FILEH__
diff --git a/include/wx/gtk/textctrl.h b/include/wx/gtk/textctrl.h
index a930d772d4..b480306b08 100644
--- a/include/wx/gtk/textctrl.h
+++ b/include/wx/gtk/textctrl.h
@@ -8,27 +8,11 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-
 #ifndef __GTKTEXTCTRLH__
 #define __GTKTEXTCTRLH__
 
 #ifdef __GNUG__
-#pragma interface
-#endif
-
-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/string.h"
-#include "wx/control.h"
-
-#if wxUSE_STD_IOSTREAM
-
-#if wxUSE_IOSTREAMH
-#include <iostream.h>
-#else
-#include <iostream>
-#endif
-
+    #pragma interface
 #endif
 
 //-----------------------------------------------------------------------------
@@ -38,25 +22,12 @@
 class wxTextCtrl;
 
 //-----------------------------------------------------------------------------
-// global data
+// wxTextCtrl
 //-----------------------------------------------------------------------------
 
-extern const char *wxTextCtrlNameStr;
-
-//-----------------------------------------------------------------------------
-//  wxTextCtrl
-//-----------------------------------------------------------------------------
-
-#if wxUSE_STD_IOSTREAM
-class wxTextCtrl: public wxControl, public streambuf
-#else
-class wxTextCtrl: public wxControl
-#endif
+class wxTextCtrl: public wxTextCtrlBase
 {
-  DECLARE_EVENT_TABLE()
-  DECLARE_DYNAMIC_CLASS(wxTextCtrl);
-
-  public:
+public:
     wxTextCtrl();
     wxTextCtrl( wxWindow *parent, wxWindowID id, const wxString &value = "",
       const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
@@ -66,35 +37,55 @@ class wxTextCtrl: public wxControl
       const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
       int style = 0, const wxValidator& validator = wxDefaultValidator,
       const wxString &name = wxTextCtrlNameStr );
-    wxString GetValue() const;
-    void SetValue( const wxString &value );
-    void WriteText( const wxString &text );
-    void AppendText( const wxString &text );
 
-    bool LoadFile( const wxString &file );
-    bool SaveFile( const wxString &file );
-    bool IsModified() const { return m_modified; }
-    void SetModified() { m_modified = TRUE; }
-    void DiscardEdits() { m_modified = FALSE; }
-    wxString GetLineText( long lineNo ) const;
-    void OnDropFiles( wxDropFilesEvent &event );
-    long PositionToXY( long pos, long *x, long *y ) const;
-    long XYToPosition( long x, long y ) const;
-    int GetLineLength(long lineNo) const;
-    int GetNumberOfLines() const;
-    virtual void SetInsertionPoint( long pos );
-    virtual void SetInsertionPointEnd();
-    virtual void SetEditable( bool editable );
-    virtual void SetSelection( long from, long to );
-    void ShowPosition( long pos );
-    virtual long GetInsertionPoint() const;
-    virtual long GetLastPosition() const;
-    virtual void Remove( long from, long to );
-    virtual void Replace( long from, long to, const wxString &value );
-    void Cut();
-    void Copy();
-    void Paste();
-    void Clear();
+    // implement base class pure virtuals
+    // ----------------------------------
+
+    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;
+
+    virtual bool IsModified() const;
+    virtual bool IsEditable() const;
+
+    // If the return values from and to are the same, there is no selection.
+    virtual void GetSelection(long* from, long* to) const;
+
+    // operations
+    // ----------
+
+    // editing
+    virtual void Clear();
+    virtual void Replace(long from, long to, const wxString& value);
+    virtual void Remove(long from, long to);
+
+    // load/save the controls contents from/to the file
+    virtual bool LoadFile(const wxString& file);
+    virtual bool SaveFile(const wxString& file);
+
+    // clears the dirty flag
+    virtual void DiscardEdits();
+
+    // writing text inserts it at the current position, appending always
+    // inserts it at the end
+    virtual void WriteText(const wxString& text);
+    virtual void AppendText(const wxString& text);
+
+    // translate between the position (which is just an index in the text ctrl
+    // considering all its contents as a single strings) and (x, y) coordinates
+    // which represent column and line.
+    virtual long XYToPosition(long x, long y) const;
+    virtual void PositionToXY(long pos, long *x, long *y) const;
+
+    virtual void ShowPosition(long pos);
+
+    // Clipboard operations
+    virtual void Copy();
+    virtual void Cut();
+    virtual void Paste();
 
     virtual bool CanCopy() const;
     virtual bool CanCut() const;
@@ -107,11 +98,17 @@ class wxTextCtrl: public wxControl
     virtual bool CanUndo() const;
     virtual bool CanRedo() const;
 
-    // If the return values from and to are the same, there is no
-    // selection.
-    virtual void GetSelection(long* from, long* to) const;
-    virtual bool IsEditable() const ;
+    // Insertion point
+    virtual void SetInsertionPoint(long pos);
+    virtual void SetInsertionPointEnd();
+    virtual long GetInsertionPoint() const;
+    virtual long GetLastPosition() const;
 
+    virtual void SetSelection(long from, long to);
+    virtual void SetEditable(bool editable);
+
+    // Implementation from now on
+    void OnDropFiles( wxDropFilesEvent &event );
     void OnChar( wxKeyEvent &event );
 
     void OnCut(wxCommandEvent& event);
@@ -126,38 +123,24 @@ class wxTextCtrl: public wxControl
     void OnUpdateUndo(wxUpdateUIEvent& event);
     void OnUpdateRedo(wxUpdateUIEvent& event);
 
-#if wxUSE_STD_IOSTREAM
-    int overflow(int i);
-    int sync();
-    int underflow();
-#endif
-
-    wxTextCtrl& operator<<(const wxString& s);
-    wxTextCtrl& operator<<(int i);
-    wxTextCtrl& operator<<(long i);
-    wxTextCtrl& operator<<(float f);
-    wxTextCtrl& operator<<(double d);
-    wxTextCtrl& operator<<(const char c);
-
     bool SetFont( const wxFont &font );
     bool SetForegroundColour(const wxColour &colour);
     bool SetBackgroundColour(const wxColour &colour);
 
-  // implementation    
-    
     GtkWidget* GetConnectWidget();
     bool IsOwnGtkWindow( GdkWindow *window );
     void ApplyWidgetStyle();
     void CalculateScrollbar();
-    
-  private:
-  
+
+private:
     bool        m_modified;
     GtkWidget  *m_text;
     GtkWidget  *m_vScrollbar;
     bool        m_vScrollbarVisible;
+
+    DECLARE_EVENT_TABLE()
+    DECLARE_DYNAMIC_CLASS(wxTextCtrl);
 };
 
 #endif // __GTKTEXTCTRLH__
 
-
diff --git a/include/wx/gtk1/textctrl.h b/include/wx/gtk1/textctrl.h
index a930d772d4..b480306b08 100644
--- a/include/wx/gtk1/textctrl.h
+++ b/include/wx/gtk1/textctrl.h
@@ -8,27 +8,11 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-
 #ifndef __GTKTEXTCTRLH__
 #define __GTKTEXTCTRLH__
 
 #ifdef __GNUG__
-#pragma interface
-#endif
-
-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/string.h"
-#include "wx/control.h"
-
-#if wxUSE_STD_IOSTREAM
-
-#if wxUSE_IOSTREAMH
-#include <iostream.h>
-#else
-#include <iostream>
-#endif
-
+    #pragma interface
 #endif
 
 //-----------------------------------------------------------------------------
@@ -38,25 +22,12 @@
 class wxTextCtrl;
 
 //-----------------------------------------------------------------------------
-// global data
+// wxTextCtrl
 //-----------------------------------------------------------------------------
 
-extern const char *wxTextCtrlNameStr;
-
-//-----------------------------------------------------------------------------
-//  wxTextCtrl
-//-----------------------------------------------------------------------------
-
-#if wxUSE_STD_IOSTREAM
-class wxTextCtrl: public wxControl, public streambuf
-#else
-class wxTextCtrl: public wxControl
-#endif
+class wxTextCtrl: public wxTextCtrlBase
 {
-  DECLARE_EVENT_TABLE()
-  DECLARE_DYNAMIC_CLASS(wxTextCtrl);
-
-  public:
+public:
     wxTextCtrl();
     wxTextCtrl( wxWindow *parent, wxWindowID id, const wxString &value = "",
       const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
@@ -66,35 +37,55 @@ class wxTextCtrl: public wxControl
       const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
       int style = 0, const wxValidator& validator = wxDefaultValidator,
       const wxString &name = wxTextCtrlNameStr );
-    wxString GetValue() const;
-    void SetValue( const wxString &value );
-    void WriteText( const wxString &text );
-    void AppendText( const wxString &text );
 
-    bool LoadFile( const wxString &file );
-    bool SaveFile( const wxString &file );
-    bool IsModified() const { return m_modified; }
-    void SetModified() { m_modified = TRUE; }
-    void DiscardEdits() { m_modified = FALSE; }
-    wxString GetLineText( long lineNo ) const;
-    void OnDropFiles( wxDropFilesEvent &event );
-    long PositionToXY( long pos, long *x, long *y ) const;
-    long XYToPosition( long x, long y ) const;
-    int GetLineLength(long lineNo) const;
-    int GetNumberOfLines() const;
-    virtual void SetInsertionPoint( long pos );
-    virtual void SetInsertionPointEnd();
-    virtual void SetEditable( bool editable );
-    virtual void SetSelection( long from, long to );
-    void ShowPosition( long pos );
-    virtual long GetInsertionPoint() const;
-    virtual long GetLastPosition() const;
-    virtual void Remove( long from, long to );
-    virtual void Replace( long from, long to, const wxString &value );
-    void Cut();
-    void Copy();
-    void Paste();
-    void Clear();
+    // implement base class pure virtuals
+    // ----------------------------------
+
+    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;
+
+    virtual bool IsModified() const;
+    virtual bool IsEditable() const;
+
+    // If the return values from and to are the same, there is no selection.
+    virtual void GetSelection(long* from, long* to) const;
+
+    // operations
+    // ----------
+
+    // editing
+    virtual void Clear();
+    virtual void Replace(long from, long to, const wxString& value);
+    virtual void Remove(long from, long to);
+
+    // load/save the controls contents from/to the file
+    virtual bool LoadFile(const wxString& file);
+    virtual bool SaveFile(const wxString& file);
+
+    // clears the dirty flag
+    virtual void DiscardEdits();
+
+    // writing text inserts it at the current position, appending always
+    // inserts it at the end
+    virtual void WriteText(const wxString& text);
+    virtual void AppendText(const wxString& text);
+
+    // translate between the position (which is just an index in the text ctrl
+    // considering all its contents as a single strings) and (x, y) coordinates
+    // which represent column and line.
+    virtual long XYToPosition(long x, long y) const;
+    virtual void PositionToXY(long pos, long *x, long *y) const;
+
+    virtual void ShowPosition(long pos);
+
+    // Clipboard operations
+    virtual void Copy();
+    virtual void Cut();
+    virtual void Paste();
 
     virtual bool CanCopy() const;
     virtual bool CanCut() const;
@@ -107,11 +98,17 @@ class wxTextCtrl: public wxControl
     virtual bool CanUndo() const;
     virtual bool CanRedo() const;
 
-    // If the return values from and to are the same, there is no
-    // selection.
-    virtual void GetSelection(long* from, long* to) const;
-    virtual bool IsEditable() const ;
+    // Insertion point
+    virtual void SetInsertionPoint(long pos);
+    virtual void SetInsertionPointEnd();
+    virtual long GetInsertionPoint() const;
+    virtual long GetLastPosition() const;
 
+    virtual void SetSelection(long from, long to);
+    virtual void SetEditable(bool editable);
+
+    // Implementation from now on
+    void OnDropFiles( wxDropFilesEvent &event );
     void OnChar( wxKeyEvent &event );
 
     void OnCut(wxCommandEvent& event);
@@ -126,38 +123,24 @@ class wxTextCtrl: public wxControl
     void OnUpdateUndo(wxUpdateUIEvent& event);
     void OnUpdateRedo(wxUpdateUIEvent& event);
 
-#if wxUSE_STD_IOSTREAM
-    int overflow(int i);
-    int sync();
-    int underflow();
-#endif
-
-    wxTextCtrl& operator<<(const wxString& s);
-    wxTextCtrl& operator<<(int i);
-    wxTextCtrl& operator<<(long i);
-    wxTextCtrl& operator<<(float f);
-    wxTextCtrl& operator<<(double d);
-    wxTextCtrl& operator<<(const char c);
-
     bool SetFont( const wxFont &font );
     bool SetForegroundColour(const wxColour &colour);
     bool SetBackgroundColour(const wxColour &colour);
 
-  // implementation    
-    
     GtkWidget* GetConnectWidget();
     bool IsOwnGtkWindow( GdkWindow *window );
     void ApplyWidgetStyle();
     void CalculateScrollbar();
-    
-  private:
-  
+
+private:
     bool        m_modified;
     GtkWidget  *m_text;
     GtkWidget  *m_vScrollbar;
     bool        m_vScrollbarVisible;
+
+    DECLARE_EVENT_TABLE()
+    DECLARE_DYNAMIC_CLASS(wxTextCtrl);
 };
 
 #endif // __GTKTEXTCTRLH__
 
-
diff --git a/include/wx/msw/clipbrd.h b/include/wx/msw/clipbrd.h
index 223801a6a6..c1afb26016 100644
--- a/include/wx/msw/clipbrd.h
+++ b/include/wx/msw/clipbrd.h
@@ -85,7 +85,7 @@ public:
     virtual void Clear();
     
     /// X11 has two clipboards which get selected by this call. Empty on MSW.
-    inline void UsePrimarySelection( bool WXUNUSED(primary) ) { }
+    void UsePrimarySelection( bool WXUNUSED(primary) = FALSE ) { }
     
 };
 
diff --git a/include/wx/msw/textctrl.h b/include/wx/msw/textctrl.h
index af31bad26f..3e66b4a49e 100644
--- a/include/wx/msw/textctrl.h
+++ b/include/wx/msw/textctrl.h
@@ -16,70 +16,41 @@
     #pragma interface "textctrl.h"
 #endif
 
-#include "wx/setup.h"
-#include "wx/control.h"
-
-#if wxUSE_IOSTREAMH
-    #include <iostream.h>
-#else
-    #include <iostream>
-#endif
-
+// can we use RICHEDIT class for wxTextCtrl implementation?
 #if defined(__WIN95__) && !defined(__TWIN32__) && !defined(__WXWINE__)
     #define wxUSE_RICHEDIT 1
 #else
     #define wxUSE_RICHEDIT 0
 #endif
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxTextCtrlNameStr;
-WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
-
-// Single-line text item
-class WXDLLEXPORT wxTextCtrl : public wxControl
-
-// 16-bit Borland 4.0 doesn't seem to allow multiple inheritance with wxWindow and streambuf:
-// it complains about deriving a huge class from the huge class streambuf. !!
-// Also, can't use streambuf if making or using a DLL :-(
-
-#if (defined(__BORLANDC__)) || defined(__MWERKS__) || defined(_WINDLL) || defined(WXUSINGDLL) || defined(WXMAKINGDLL)
-#define NO_TEXT_WINDOW_STREAM
-#endif
-
-#ifndef NO_TEXT_WINDOW_STREAM
-, public streambuf
-#endif
-
+class WXDLLEXPORT wxTextCtrl : public wxTextCtrlBase
 {
-  DECLARE_DYNAMIC_CLASS(wxTextCtrl)
-
 public:
     // creation
     // --------
+
     wxTextCtrl();
     wxTextCtrl(wxWindow *parent, wxWindowID id,
-            const wxString& value = wxEmptyString,
-            const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize,
-            long style = 0,
-            const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxTextCtrlNameStr)
-#ifndef NO_TEXT_WINDOW_STREAM
-        :streambuf()
-#endif
-        {
-            Create(parent, id, value, pos, size, style, validator, name);
-        }
+               const wxString& value = wxEmptyString,
+               const wxPoint& pos = wxDefaultPosition,
+               const wxSize& size = wxDefaultSize,
+               long style = 0,
+               const wxValidator& validator = wxDefaultValidator,
+               const wxString& name = wxTextCtrlNameStr)
+    {
+        Create(parent, id, value, pos, size, style, validator, name);
+    }
 
     bool Create(wxWindow *parent, wxWindowID id,
-            const wxString& value = wxEmptyString,
-            const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize,
-            long style = 0,
-            const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxTextCtrlNameStr);
+                const wxString& value = wxEmptyString,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = 0,
+                const wxValidator& validator = wxDefaultValidator,
+                const wxString& name = wxTextCtrlNameStr);
 
-    // accessors
-    // ---------
+    // implement base class pure virtuals
+    // ----------------------------------
 
     virtual wxString GetValue() const;
     virtual void SetValue(const wxString& value);
@@ -88,9 +59,39 @@ public:
     virtual wxString GetLineText(long lineNo) const;
     virtual int GetNumberOfLines() const;
 
+    virtual bool IsModified() const;
+    virtual bool IsEditable() const;
+
+    // If the return values from and to are the same, there is no selection.
+    virtual void GetSelection(long* from, long* to) const;
+
     // operations
     // ----------
 
+    // editing
+    virtual void Clear();
+    virtual void Replace(long from, long to, const wxString& value);
+    virtual void Remove(long from, long to);
+
+    // load the controls contents from the file
+    virtual bool LoadFile(const wxString& file);
+
+    // clears the dirty flag
+    virtual void DiscardEdits();
+
+    // writing text inserts it at the current position, appending always
+    // inserts it at the end
+    virtual void WriteText(const wxString& text);
+    virtual void AppendText(const wxString& text);
+
+    // translate between the position (which is just an index in the text ctrl
+    // considering all its contents as a single strings) and (x, y) coordinates
+    // which represent column and line.
+    virtual long XYToPosition(long x, long y) const;
+    virtual void PositionToXY(long pos, long *x, long *y) const;
+
+    virtual void ShowPosition(long pos);
+
     // Clipboard operations
     virtual void Copy();
     virtual void Cut();
@@ -107,50 +108,15 @@ public:
     virtual bool CanUndo() const;
     virtual bool CanRedo() const;
 
+    // Insertion point
     virtual void SetInsertionPoint(long pos);
     virtual void SetInsertionPointEnd();
-    virtual long GetInsertionPoint() const ;
-    virtual long GetLastPosition() const ;
-    virtual void Replace(long from, long to, const wxString& value);
-    virtual void Remove(long from, long to);
+    virtual long GetInsertionPoint() const;
+    virtual long GetLastPosition() const;
+
     virtual void SetSelection(long from, long to);
     virtual void SetEditable(bool editable);
 
-    // If the return values from and to are the same, there is no
-    // selection.
-    virtual void GetSelection(long* from, long* to) const;
-    virtual bool IsEditable() const ;
-
-    // streambuf implementation
-#ifndef NO_TEXT_WINDOW_STREAM
-    int overflow(int i);
-    int sync();
-    int underflow();
-#endif
-
-    wxTextCtrl& operator<<(const wxString& s);
-    wxTextCtrl& operator<<(int i);
-    wxTextCtrl& operator<<(long i);
-    wxTextCtrl& operator<<(float f);
-    wxTextCtrl& operator<<(double d);
-    wxTextCtrl& operator<<(const char c);
-
-    virtual bool LoadFile(const wxString& file);
-    virtual bool SaveFile(const wxString& file);
-    virtual void WriteText(const wxString& text);
-    virtual void AppendText(const wxString& text);
-    virtual void DiscardEdits();
-    virtual bool IsModified() const;
-
-#if WXWIN_COMPATIBILITY
-    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 void Clear();
-
     // Implementation from now on
     // --------------------------
 
@@ -160,11 +126,11 @@ public:
 #if wxUSE_RICHEDIT
     bool IsRich() const { return m_isRich; }
     void SetRichEdit(bool isRich) { m_isRich = isRich; }
-#endif
+#endif // wxUSE_RICHEDIT
 
     virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
-            WXUINT message, WXWPARAM wParam,
-            WXLPARAM lParam);
+                                WXUINT message, WXWPARAM wParam,
+                                WXLPARAM lParam);
 
     virtual void AdoptAttributesFromHWND();
     virtual void SetupColours();
@@ -172,7 +138,6 @@ public:
     virtual bool AcceptsFocus() const;
 
     // callbacks
-    // ---------
     void OnDropFiles(wxDropFilesEvent& event);
     void OnChar(wxKeyEvent& event); // Process 'enter' if required
 
@@ -193,8 +158,6 @@ protected:
     bool      m_isRich; // Are we using rich text edit to implement this?
 #endif
 
-    wxString  m_fileName;
-
     // call this to increase the size limit (will do nothing if the current
     // limit is big enough)
     void AdjustSpaceLimit();
@@ -203,6 +166,7 @@ protected:
 
 private:
     DECLARE_EVENT_TABLE()
+    DECLARE_DYNAMIC_CLASS(wxTextCtrl)
 };
 
 #endif
diff --git a/include/wx/textctrl.h b/include/wx/textctrl.h
index 4123afeb1f..77500f4a5d 100644
--- a/include/wx/textctrl.h
+++ b/include/wx/textctrl.h
@@ -1,18 +1,177 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        textctrl.h
+// Purpose:     wxTextCtrlBase class - the interface of wxTextCtrl
+// Author:      Vadim Zeitlin
+// Modified by:
+// Created:     13.07.99
+// RCS-ID:      $Id$
+// Copyright:   (c) wxWindows team
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
 #ifndef _WX_TEXTCTRL_H_BASE_
 #define _WX_TEXTCTRL_H_BASE_
 
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+#include "wx/defs.h"
+#include "wx/control.h"         // the base class
+
+// 16-bit Borland 4.0 doesn't seem to allow multiple inheritance with wxWindow
+// and streambuf: it complains about deriving a huge class from the huge class
+// streambuf. !! Also, can't use streambuf if making or using a DLL :-(
+
+#if (defined(__BORLANDC__)) || defined(__MWERKS__) || defined(_WINDLL) || defined(WXUSINGDLL) || defined(WXMAKINGDLL)
+    #define NO_TEXT_WINDOW_STREAM
+#endif
+
+#ifndef NO_TEXT_WINDOW_STREAM
+    #ifdef wxUSE_STD_IOSTREAM
+        #include "ioswrap.h"    // for iostream classes if we need them
+    #else // !wxUSE_STD_IOSTREAM
+        // can't compile this feature in if we don't use streams at all
+        #define NO_TEXT_WINDOW_STREAM
+    #endif // wxUSE_STD_IOSTREAM/!wxUSE_STD_IOSTREAM
+#endif
+
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
+WXDLLEXPORT_DATA(extern const wxChar*) wxTextCtrlNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
+
+// ----------------------------------------------------------------------------
+// wxTextCtrl: a single or multiple line text zone where user can enter and
+// edit text
+// ----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxTextCtrlBase : public wxControl
+#ifndef NO_TEXT_WINDOW_STREAM
+                                 , public streambuf
+#endif
+
+{
+public:
+    // creation
+    // --------
+
+    wxTextCtrlBase();
+
+    // accessors
+    // ---------
+
+    virtual wxString GetValue() const = 0;
+    virtual void SetValue(const wxString& value) = 0;
+
+    virtual int GetLineLength(long lineNo) const = 0;
+    virtual wxString GetLineText(long lineNo) const = 0;
+    virtual int GetNumberOfLines() const = 0;
+
+    virtual bool IsModified() const = 0;
+    virtual bool IsEditable() const = 0;
+
+    // If the return values from and to are the same, there is no selection.
+    virtual void GetSelection(long* from, long* to) const = 0;
+
+    // operations
+    // ----------
+
+    // editing
+    virtual void Clear() = 0;
+    virtual void Replace(long from, long to, const wxString& value) = 0;
+    virtual void Remove(long from, long to) = 0;
+
+    // load/save the controls contents from/to the file
+    virtual bool LoadFile(const wxString& file);
+    virtual bool SaveFile(const wxString& file = wxEmptyString);
+
+    // clears the dirty flag
+    virtual void DiscardEdits() = 0;
+
+    // writing text inserts it at the current position, appending always
+    // inserts it at the end
+    virtual void WriteText(const wxString& text) = 0;
+    virtual void AppendText(const wxString& text) = 0;
+
+    // translate between the position (which is just an index in the text ctrl
+    // considering all its contents as a single strings) and (x, y) coordinates
+    // which represent column and line.
+    virtual long XYToPosition(long x, long y) const = 0;
+    virtual void PositionToXY(long pos, long *x, long *y) const = 0;
+
+    virtual void ShowPosition(long pos) = 0;
+
+    // Clipboard operations
+    virtual void Copy() = 0;
+    virtual void Cut() = 0;
+    virtual void Paste() = 0;
+
+    virtual bool CanCopy() const = 0;
+    virtual bool CanCut() const = 0;
+    virtual bool CanPaste() const = 0;
+
+    // Undo/redo
+    virtual void Undo() = 0;
+    virtual void Redo() = 0;
+
+    virtual bool CanUndo() const = 0;
+    virtual bool CanRedo() const = 0;
+
+    // Insertion point
+    virtual void SetInsertionPoint(long pos) = 0;
+    virtual void SetInsertionPointEnd() = 0;
+    virtual long GetInsertionPoint() const = 0;
+    virtual long GetLastPosition() const = 0;
+
+    virtual void SetSelection(long from, long to) = 0;
+    virtual void SetEditable(bool editable) = 0;
+
+    // streambuf methods
+#ifndef NO_TEXT_WINDOW_STREAM
+    int overflow(int i);
+    int sync();
+    int underflow();
+#endif // NO_TEXT_WINDOW_STREAM
+
+    // stream-like insertion operators: these are always available, whether we
+    // were, or not, compiled with streambuf support
+    wxTextCtrl& operator<<(const wxString& s);
+    wxTextCtrl& operator<<(int i);
+    wxTextCtrl& operator<<(long i);
+    wxTextCtrl& operator<<(float f);
+    wxTextCtrl& operator<<(double d);
+    wxTextCtrl& operator<<(const char c);
+
+    // obsolete functions
+#if WXWIN_COMPATIBILITY
+    bool Modified() const { return IsModified(); }
+#endif
+
+private:
+    // the name of the last file loaded with LoadFile() which will be used by
+    // SaveFile() by default
+    wxString m_filename;
+};
+
+// ----------------------------------------------------------------------------
+// include the platform-dependent class definition
+// ----------------------------------------------------------------------------
+
 #if defined(__WXMSW__)
-#include "wx/msw/textctrl.h"
+    #include "wx/msw/textctrl.h"
 #elif defined(__WXMOTIF__)
-#include "wx/motif/textctrl.h"
+    #include "wx/motif/textctrl.h"
 #elif defined(__WXGTK__)
-#include "wx/gtk/textctrl.h"
+    #include "wx/gtk/textctrl.h"
 #elif defined(__WXQT__)
-#include "wx/qt/textctrl.h"
+    #include "wx/qt/textctrl.h"
 #elif defined(__WXMAC__)
-#include "wx/mac/textctrl.h"
+    #include "wx/mac/textctrl.h"
 #elif defined(__WXSTUBS__)
-#include "wx/stubs/textctrl.h"
+    #include "wx/stubs/textctrl.h"
 #endif
 
 #endif
diff --git a/include/wx/textfile.h b/include/wx/textfile.h
index a7b213d177..a078a518bf 100644
--- a/include/wx/textfile.h
+++ b/include/wx/textfile.h
@@ -11,16 +11,21 @@
 // Licence:     wxWindows license
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifndef _TEXTFILE_H
-#define _TEXTFILE_H
+#ifndef _WX_TEXTFILE_H
+#define _WX_TEXTFILE_H
 
 #ifdef __GNUG__
-#pragma interface "textfile.h"
+    #pragma interface "textfile.h"
 #endif
 
 #include "wx/defs.h"
 
-#if wxUSE_TEXTFILE && wxUSE_FILE
+#if !wxUSE_FILE
+    #undef wxUSE_TEXTFILE
+    #define wxUSE_TEXTFILE 0
+#endif // wxUSE_FILE
+
+#if wxUSE_TEXTFILE
 
 #include "wx/string.h"
 #include "wx/file.h"
@@ -44,9 +49,20 @@ WX_DEFINE_ARRAY(wxTextFileType, ArrayFileType);
 class WXDLLEXPORT wxTextFile
 {
 public:
-  // default type for current platform (determined at compile time)
+  // constants and static functions
+    // default type for current platform (determined at compile time)
   static const wxTextFileType typeDefault;
 
+    // this function returns a string which is identical to "text" passed in
+    // except that the line terminator characters are changed to correspond the
+    // given type. Called with the default argument, the function translates
+    // the string to the native format (Unix for Unix, DOS for Windows, ...).
+  static wxString Translate(const wxString& text,
+                            wxTextFileType type = typeDefault);
+
+    // get the file termination string
+  static const wxChar *GetEOL(wxTextFileType type = typeDefault);
+
   // ctors
     // def ctor, use Open(string)
   wxTextFile() { }
@@ -115,10 +131,6 @@ public:
   // possibly in another format
   bool Write(wxTextFileType typeNew = wxTextFileType_None);
 
-  // get the file termination string
-  // Note: implementation moved to textfile to prevent warning due to switch.
-  static const wxChar *GetEOL(wxTextFileType type = typeDefault);
-
   // dtor
   ~wxTextFile();
 
@@ -142,9 +154,34 @@ private:
   wxString      m_strFile;  // name of the file
 };
 
-#endif
-  // wxUSE_TEXTFILE && wxUSE_FILE
+#else // !wxUSE_TEXTFILE
 
-#endif
-  // _TEXTFILE_H
+// these static wxTextFile methods are used internally by wxWindows, so should
+// be defined even if we're compiling without wxTextFile at all.
+
+class WXDLLEXPORT wxTextFile
+{
+public:
+    // default type for current platform (determined at compile time)
+    static const wxTextFileType typeDefault;
+
+    // this function returns a string which is identical to "text" passed in
+    // except that the line terminator characters are changed to correspond the
+    // given type. Called with the default argument, the function translates
+    // the string to the native format (Unix for Unix, DOS for Windows, ...).
+    static wxString Translate(const wxString& text,
+                              wxTextFileType type = typeDefault);
+
+    // get the file termination string
+    static const wxChar *GetEOL(wxTextFileType type = typeDefault);
+
+private:
+    // copy ctor/assignment operator not implemented
+    wxTextFile(const wxTextFile&);
+    wxTextFile& operator=(const wxTextFile&);
+};
+
+#endif // wxUSE_TEXTFILE
+
+#endif // _WX_TEXTFILE_H
 
diff --git a/src/common/ffile.cpp b/src/common/ffile.cpp
new file mode 100644
index 0000000000..69d1c04af8
--- /dev/null
+++ b/src/common/ffile.cpp
@@ -0,0 +1,235 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        ffile.cpp
+// Purpose:     wxFFile - encapsulates "FILE *" IO stream
+// Author:      Vadim Zeitlin
+// Modified by:
+// Created:     14.07.99
+// RCS-ID:      $Id$
+// Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
+// Licence:     wxWindows license
+/////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+#ifdef __GNUG__
+    #pragma implementation "ffile.h"
+#endif
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+  #pragma hdrstop
+#endif
+
+#if wxUSE_FILE
+
+#ifndef WX_PRECOMP
+#endif
+
+#include "wx/ffile.h"
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// opening the file
+// ----------------------------------------------------------------------------
+
+wxFFile::wxFFile(const wxChar *filename, const char *mode)
+{
+    Detach();
+
+    (void)Open(filename, mode);
+}
+
+bool wxFFile::Open(const wxChar *filename, const char *mode)
+{
+    wxASSERT_MSG( !m_fp, _T("should close or detach the old file first") );
+
+    m_fp = fopen(filename, mode);
+
+    if ( !m_fp )
+    {
+        wxLogSysError(_("can't open file '%s'"), filename);
+
+        return FALSE;
+    }
+
+    m_name = filename;
+
+    return TRUE;
+}
+
+bool wxFFile::Close()
+{
+    if ( IsOpened() )
+    {
+        if ( !fclose(m_fp) )
+        {
+            wxLogSysError(_("can't close file '%s'"), m_name.c_str());
+
+            return FALSE;
+        }
+
+        Detach();
+    }
+
+    return TRUE;
+}
+
+// ----------------------------------------------------------------------------
+// read/write
+// ----------------------------------------------------------------------------
+
+bool wxFFile::ReadAll(wxString *str)
+{
+    wxCHECK_MSG( str, FALSE, _T("invalid parameter") );
+    wxCHECK_MSG( IsOpened(), FALSE, _T("can't read from closed file") );
+
+    clearerr(m_fp);
+
+    str->Empty();
+    str->Alloc(Length());
+
+    wxChar buf[1024];
+    static const size_t nSize = WXSIZEOF(buf) - 1; // -1 for trailing '\0'
+    while ( !Eof() )
+    {
+        size_t nRead = fread(buf, sizeof(wxChar), nSize, m_fp);
+        if ( (nRead < nSize) && Error() )
+        {
+            wxLogSysError(_("Read error on file '%s'"), m_name.c_str());
+
+            return FALSE;
+        }
+        //else: just EOF
+
+        buf[nRead] = 0;
+        *str += buf;
+    }
+
+    return TRUE;
+}
+
+size_t wxFFile::Read(void *pBuf, size_t nCount)
+{
+    wxCHECK_MSG( pBuf, FALSE, _T("invalid parameter") );
+    wxCHECK_MSG( IsOpened(), FALSE, _T("can't read from closed file") );
+
+    size_t nRead = fread(pBuf, 1, nCount, m_fp);
+    if ( (nRead < nCount) && Error() )
+    {
+        wxLogSysError(_("Read error on file '%s'"), m_name.c_str());
+    }
+
+    return nRead;
+}
+
+size_t wxFFile::Write(const void *pBuf, size_t nCount)
+{
+    wxCHECK_MSG( pBuf, FALSE, _T("invalid parameter") );
+    wxCHECK_MSG( IsOpened(), FALSE, _T("can't write to closed file") );
+
+    size_t nWritten = fwrite(pBuf, 1, nCount, m_fp);
+    if ( nWritten < nCount )
+    {
+        wxLogSysError(_("Write error on file '%s'"), m_name.c_str());
+    }
+
+    return nWritten;
+}
+
+bool wxFFile::Flush()
+{
+    if ( IsOpened() )
+    {
+        if ( !fflush(m_fp) )
+        {
+            wxLogSysError(_("failed to flush the file '%s'"), m_name.c_str());
+
+            return FALSE;
+        }
+    }
+
+    return TRUE;
+}
+
+// ----------------------------------------------------------------------------
+// seeking
+// ----------------------------------------------------------------------------
+
+bool wxFFile::Seek(long ofs, wxSeekMode mode)
+{
+    wxCHECK_MSG( IsOpened(), FALSE, _T("can't seek on closed file") );
+
+    int origin;
+    switch ( mode )
+    {
+        default:
+            wxFAIL_MSG(_T("unknown seek mode"));
+            // still fall through
+
+        case wxFromStart:
+            origin = SEEK_SET;
+            break;
+
+        case wxFromCurrent:
+            origin = SEEK_CUR;
+            break;
+
+        case wxFromEnd:
+            origin = SEEK_END;
+            break;
+    }
+
+    if ( fseek(m_fp, ofs, origin) != 0 )
+    {
+        wxLogSysError(_("Seek error on file '%s'"), m_name.c_str());
+
+        return FALSE;
+    }
+
+    return TRUE;
+}
+
+size_t wxFFile::Tell() const
+{
+    long rc = ftell(m_fp);
+    if ( rc == -1 )
+    {
+        wxLogSysError(_("Can't find current position in file '%s'"),
+                      m_name.c_str());
+    }
+
+    return (size_t)rc;
+}
+
+size_t wxFFile::Length() const
+{
+    wxFFile& self = *(wxFFile *)this;   // const_cast
+
+    size_t posOld = Tell();
+    if ( posOld != (size_t)-1 )
+    {
+        if ( self.SeekEnd() )
+        {
+            size_t len = Tell();
+
+            (void)self.Seek(posOld);
+
+            return len;
+        }
+    }
+
+    return (size_t)-1;
+}
+
+#endif // wxUSE_FILE
diff --git a/src/common/file.cpp b/src/common/file.cpp
index 55e153dee4..2cdd6e8e7c 100644
--- a/src/common/file.cpp
+++ b/src/common/file.cpp
@@ -206,12 +206,6 @@ wxFile::wxFile(const wxChar *szFileName, OpenMode mode)
     Open(szFileName, mode);
 }
 
-// dtor
-wxFile::~wxFile()
-{
-    Close();
-}
-
 // create the file, fail if it already exists and bOverwrite
 bool wxFile::Create(const wxChar *szFileName, bool bOverwrite, int accessMode)
 {
@@ -350,25 +344,25 @@ off_t wxFile::Seek(off_t ofs, wxSeekMode mode)
 {
     wxASSERT( IsOpened() );
 
-    int flag = -1;
+    int origin;
     switch ( mode ) {
+        default:
+            wxFAIL_MSG(_("unknown seek origin"));
+
         case wxFromStart:
-            flag = SEEK_SET;
+            origin = SEEK_SET;
             break;
 
         case wxFromCurrent:
-            flag = SEEK_CUR;
+            origin = SEEK_CUR;
             break;
 
         case wxFromEnd:
-            flag = SEEK_END;
+            origin = SEEK_END;
             break;
-
-        default:
-            wxFAIL_MSG(_("unknown seek origin"));
     }
 
-    int iRc = lseek(m_fd, ofs, flag);
+    int iRc = lseek(m_fd, ofs, origin);
     if ( iRc == -1 ) {
         wxLogSysError(_("can't seek on file descriptor %d"), m_fd);
         return wxInvalidOffset;
diff --git a/src/common/textcmn.cpp b/src/common/textcmn.cpp
new file mode 100644
index 0000000000..33796a5371
--- /dev/null
+++ b/src/common/textcmn.cpp
@@ -0,0 +1,186 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        common/textcmn.cpp
+// Purpose:     implementation of platform-independent functions of wxTextCtrl
+// Author:      Julian Smart
+// Modified by:
+// Created:     13.07.99
+// RCS-ID:      $Id$
+// Copyright:   (c) wxWindows team
+// Licence:     wxWindows license
+///////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// for compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+    #include "wx/textctrl.h"
+#endif // WX_PRECOMP
+
+#include "wx/ffile.h"
+
+// ----------------------------------------------------------------------------
+// macros
+// ----------------------------------------------------------------------------
+
+// we don't have any objects of type wxTextCtrlBase in the program, only
+// wxTextCtrl, so this cast is safe
+#define TEXTCTRL(ptr)   ((wxTextCtrl *)(ptr))
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// ctor
+// ----------------------------------------------------------------------------
+
+wxTextCtrlBase::wxTextCtrlBase()
+{
+}
+
+// ----------------------------------------------------------------------------
+// file IO functions
+// ----------------------------------------------------------------------------
+
+bool wxTextCtrlBase::LoadFile(const wxString& filename)
+{
+    wxFFile file(filename);
+    if ( file.IsOpened() )
+    {
+        wxString text;
+        if ( file.ReadAll(&text) )
+        {
+            SetValue(text);
+
+            DiscardEdits();
+
+            m_filename = filename;
+
+            return TRUE;
+        }
+    }
+
+    wxLogError(_("File couldn't be loaded."));
+
+    return FALSE;
+}
+
+bool wxTextCtrlBase::SaveFile(const wxString& filename)
+{
+    wxString filenameToUse = filename.IsEmpty() ? m_filename : filename;
+    if ( !filenameToUse )
+    {
+        // what kind of message to give? is it an error or a program bug?
+        wxLogDebug(_T("Can't save textctrl to file without filename."));
+
+        return FALSE;
+    }
+
+    wxFFile file(filename, "w");
+    if ( file.IsOpened() && file.Write(GetValue()) )
+    {
+        // it's not modified any longer
+        DiscardEdits();
+
+        m_filename = filename;
+
+        return TRUE;
+    }
+
+    wxLogError(_("The text couldn't be saved."));
+
+    return FALSE;
+}
+
+// ----------------------------------------------------------------------------
+// stream-like insertion operator
+// ----------------------------------------------------------------------------
+
+wxTextCtrl& wxTextCtrlBase::operator<<(const wxString& s)
+{
+    AppendText(s);
+    return *TEXTCTRL(this);
+}
+
+wxTextCtrl& wxTextCtrlBase::operator<<(float f)
+{
+    wxString str;
+    str.Printf(_T("%.2f"), f);
+    AppendText(str);
+    return *TEXTCTRL(this);
+}
+
+wxTextCtrl& wxTextCtrlBase::operator<<(double d)
+{
+    wxString str;
+    str.Printf(_T("%.2f"), d);
+    AppendText(str);
+    return *TEXTCTRL(this);
+}
+
+wxTextCtrl& wxTextCtrlBase::operator<<(int i)
+{
+    wxString str;
+    str.Printf(_T("%d"), i);
+    AppendText(str);
+    return *TEXTCTRL(this);
+}
+
+wxTextCtrl& wxTextCtrlBase::operator<<(long i)
+{
+    wxString str;
+    str.Printf(_T("%ld"), i);
+    AppendText(str);
+    return *TEXTCTRL(this);
+}
+
+wxTextCtrl& wxTextCtrlBase::operator<<(const char c)
+{
+    return operator<<(wxString(c));
+}
+
+// ----------------------------------------------------------------------------
+// streambuf methods implementation
+// ----------------------------------------------------------------------------
+
+#ifndef NO_TEXT_WINDOW_STREAM
+
+int wxTextCtrlBase::overflow( int WXUNUSED(c) )
+{
+    int len = pptr() - pbase();
+    char *txt = new char[len+1];
+    strncpy(txt, pbase(), len);
+    txt[len] = '\0';
+    (*this) << txt;
+    setp(pbase(), epptr());
+    delete[] txt;
+    return EOF;
+}
+
+int wxTextCtrlBase::sync()
+{
+    int len = pptr() - pbase();
+    char *txt = new char[len+1];
+    strncpy(txt, pbase(), len);
+    txt[len] = '\0';
+    (*this) << txt;
+    setp(pbase(), epptr());
+    delete[] txt;
+    return 0;
+}
+
+int wxTextCtrlBase::underflow()
+{
+    return EOF;
+}
+
+#endif // NO_TEXT_WINDOW_STREAM
+
diff --git a/src/common/textfile.cpp b/src/common/textfile.cpp
index 2311dc2144..b2a1c2afa7 100644
--- a/src/common/textfile.cpp
+++ b/src/common/textfile.cpp
@@ -14,33 +14,35 @@
 // ============================================================================
 
 #ifdef __GNUG__
-#pragma implementation "textfile.h"
+    #pragma implementation "textfile.h"
 #endif
 
 #include  "wx/wxprec.h"
 
 #ifdef    __BORLANDC__
-  #pragma hdrstop
+    #pragma hdrstop
 #endif  //__BORLANDC__
 
+#if !wxUSE_FILE
+    #undef wxUSE_TEXTFILE
+    #define wxUSE_TEXTFILE 0
+#endif // wxUSE_FILE
+
 #ifndef WX_PRECOMP
-#include "wx/defs.h"
+    #include  "wx/string.h"
+    #include  "wx/intl.h"
+    #include  "wx/file.h"
+    #include  "wx/log.h"
 #endif
 
-#if wxUSE_TEXTFILE && wxUSE_FILE
-
-#include  <wx/string.h>
-#include  <wx/intl.h>
-#include  <wx/file.h>
-#include  <wx/log.h>
-#include  <wx/textfile.h>
+#include  "wx/textfile.h"
 
 // ============================================================================
 // wxTextFile class implementation
 // ============================================================================
 
 // ----------------------------------------------------------------------------
-// static variables
+// static methods (always compiled in)
 // ----------------------------------------------------------------------------
 
 // default type is the native one
@@ -56,6 +58,71 @@ const wxTextFileType wxTextFile::typeDefault =
   #error  "wxTextFile: unsupported platform."
 #endif
 
+const wxChar *wxTextFile::GetEOL(wxTextFileType type)
+{
+    switch ( type ) {
+      default:
+        wxFAIL_MSG(_T("bad file type in wxTextFile::GetEOL."));
+        // fall through nevertheless - we must return something...
+
+      case wxTextFileType_None: return _T("");
+      case wxTextFileType_Unix: return _T("\n");
+      case wxTextFileType_Dos:  return _T("\r\n");
+      case wxTextFileType_Mac:  return _T("\r");
+    }
+}
+
+
+wxString wxTextFile::Translate(const wxString& text, wxTextFileType type)
+{
+    // don't do anything if there is nothing to do
+    if ( type == wxTextFileType_None )
+        return text;
+
+    wxString eol = GetEOL(type), result;
+
+    // optimization: we know that the length of the new string will be about
+    // the same as the length of the old one, so prealloc memory to aviod
+    // unnecessary relocations
+    result.Alloc(text.Len());
+
+    wxChar chLast = 0;
+    for ( const wxChar *pc = text.c_str(); *pc; pc++ )
+    {
+        wxChar ch = *pc;
+        switch ( ch ) {
+            case '\n':
+                // Dos/Unix line termination
+                result += eol;
+                chLast = '\n';
+                break;
+
+            case '\r':
+                if ( chLast == '\r' ) {
+                    // Mac empty line
+                    result += eol;
+                }
+                else
+                    chLast = '\r';
+                break;
+
+            default:
+                if ( chLast == '\r' ) {
+                    // Mac line termination
+                    result += eol;
+                    chLast = ch;
+                }
+                else {
+                    // add to the current line
+                    result += ch;
+                }
+        }
+    }
+
+    return result;
+}
+
+#if wxUSE_TEXTFILE
 
 // ----------------------------------------------------------------------------
 // ctors & dtor
@@ -135,7 +202,7 @@ wxTextFileType wxTextFile::GuessType() const
 
   #undef   AnalyseLine
 
-  // interpret the results (@@ far from being even 50% fool proof)
+  // interpret the results (FIXME far from being even 50% fool proof)
   if ( nDos + nUnix + nMac == 0 ) {
     // no newlines at all
     wxLogWarning(_("'%s' is probably a binary file."), m_strFile.c_str());
@@ -257,18 +324,5 @@ bool wxTextFile::Write(wxTextFileType typeNew)
   return fileTmp.Commit();
 }
 
-const wxChar *wxTextFile::GetEOL(wxTextFileType type)
-{
-    switch ( type ) {
-      case wxTextFileType_None: return _T("");
-      case wxTextFileType_Unix: return _T("\n");
-      case wxTextFileType_Dos:  return _T("\r\n");
-      case wxTextFileType_Mac:  return _T("\r");
+#endif // wxUSE_TEXTFILE
 
-      default:
-        wxFAIL_MSG(_T("bad file type in wxTextFile::GetEOL."));
-        return (const wxChar *) NULL;
-    }
-}
-
-#endif
diff --git a/src/common/unzip.c b/src/common/unzip.c
index ce2260231c..71f4ed2b97 100644
--- a/src/common/unzip.c
+++ b/src/common/unzip.c
@@ -1296,4 +1296,9 @@ extern int ZEXPORT unzGetGlobalComment (file, szComment, uSizeBuf)
 	return (int)uReadThis;
 }
 
-#endif
+#else
+
+// the file shouldn't be empty, som compilers don't like it
+static const int dummyVariableInUnzip = 17;
+
+#endif // wxUSE_ZLIB && wxUSE_ZIPSTREAM
diff --git a/src/common/variant.cpp b/src/common/variant.cpp
index 17a9980397..5b7126fd5e 100644
--- a/src/common/variant.cpp
+++ b/src/common/variant.cpp
@@ -588,7 +588,7 @@ bool wxVariantDataBool::Read(wxInputStream& str)
 {
     wxTextInputStream s(str);
 
-    m_value = s.Read8();
+    m_value = s.Read8() != 0;
     return TRUE;
 }
 #endif // wxUSE_STREAMS
diff --git a/src/generic/sashwin.cpp b/src/generic/sashwin.cpp
index 50d70f984b..9b9b7a1156 100644
--- a/src/generic/sashwin.cpp
+++ b/src/generic/sashwin.cpp
@@ -122,13 +122,13 @@ void wxSashWindow::OnMouseEvent(wxMouseEvent& event)
     SetCursor(wxCursor());
 #endif
 
-	if (event.LeftDown())
-	{
+    if (event.LeftDown())
+    {
         if ( sashHit != wxSASH_NONE )
         {
             CaptureMouse();
 
-    	    // Required for X to specify that
+            // Required for X to specify that
             // that we wish to draw on top of all windows
             // - and we optimise by specifying the area
             // for creating the overlap window.
@@ -150,7 +150,7 @@ void wxSashWindow::OnMouseEvent(wxMouseEvent& event)
             m_firstX = x;
             m_firstY = y;
         }
-	}
+    }
     else if ( event.LeftUp() && m_dragMode == wxSASH_DRAG_LEFT_DOWN )
     {
         // Wasn't a proper drag
@@ -159,11 +159,11 @@ void wxSashWindow::OnMouseEvent(wxMouseEvent& event)
         m_dragMode = wxSASH_DRAG_NONE;
         m_draggingEdge = wxSASH_NONE;
     }
-	else if (event.LeftUp() && m_dragMode == wxSASH_DRAG_DRAGGING)
-	{
+    else if (event.LeftUp() && m_dragMode == wxSASH_DRAG_DRAGGING)
+    {
         // We can stop dragging now and see what we've got.
         m_dragMode = wxSASH_DRAG_NONE;
-		ReleaseMouse();
+        ReleaseMouse();
         // Erase old tracker
         DrawSashTracker(m_draggingEdge, m_oldX, m_oldY);
 
@@ -172,98 +172,142 @@ void wxSashWindow::OnMouseEvent(wxMouseEvent& event)
         wxScreenDC::EndDrawingOnTop();
 
         int w, h;
-		GetSize(&w, &h);
+        GetSize(&w, &h);
         int xp, yp;
-		GetPosition(&xp, &yp);
+        GetPosition(&xp, &yp);
 
         wxSashEdgePosition edge = m_draggingEdge;
         m_draggingEdge = wxSASH_NONE;
 
-        y = abs((short)y);
-
         wxRect dragRect;
         wxSashDragStatus status = wxSASH_STATUS_OK;
+
+        // the new height and width of the window - if -1, it didn't change
+        int newHeight = -1,
+            newWidth = -1;
+
+        // NB: x and y may be negative and they're relative to the sash window
+        //     upper left corner, while xp and yp are expressed in the parent
+        //     window system of coordinates, so adjust them! After this
+        //     adjustment, all coordinates are relative to the parent window.
+        y += yp;
+        x += xp;
+
         switch (edge)
         {
             case wxSASH_TOP:
-            {
-                if ( y > (yp + h))
+                if ( y > yp + h )
+                {
+                    // top sash shouldn't get below the bottom one
                     status = wxSASH_STATUS_OUT_OF_RANGE;
-                int newHeight = (yp + h - y);
-		newHeight=wxMax(newHeight,m_minimumPaneSizeY);
-		newHeight=wxMin(newHeight,m_maximumPaneSizeY);
-                dragRect = wxRect(xp, (yp + h) - newHeight, w, newHeight);
+                }
+                else
+                {
+                    newHeight = h - (y - yp);
+                }
                 break;
-            }
+
             case wxSASH_BOTTOM:
-            {
-                if (y < 0)
+                if ( y < yp )
+                {
+                    // bottom sash shouldn't get above the top one
                     status = wxSASH_STATUS_OUT_OF_RANGE;
-                int newHeight = y;
-		newHeight=wxMax(newHeight,m_minimumPaneSizeY);
-		newHeight=wxMin(newHeight,m_maximumPaneSizeY);
-                dragRect = wxRect(xp, yp, w, newHeight);
+                }
+                else
+                {
+                    newHeight = y - yp;
+                }
                 break;
-            }
+
             case wxSASH_LEFT:
-            {
-                if (x > (xp + w))
+                if ( x > xp + w )
+                {
+                    // left sash shouldn't get beyond the right one
                     status = wxSASH_STATUS_OUT_OF_RANGE;
-                int newWidth = (w - x);
-		newWidth=wxMax(newWidth,m_minimumPaneSizeX);
-		newWidth=wxMin(newWidth,m_maximumPaneSizeX);
-                dragRect = wxRect((xp + w) - newWidth, yp, newWidth, h);
+                }
+                else
+                {
+                    newWidth = w - (x - xp);
+                }
                 break;
-            }
+
             case wxSASH_RIGHT:
-            {
-                if (x < 0)
+                if ( x < xp )
+                {
+                    // and the right sash, finally, shouldn't be beyond the
+                    // left one
                     status = wxSASH_STATUS_OUT_OF_RANGE;
-                int newWidth = x;
-		newWidth=wxMax(newWidth,m_minimumPaneSizeX);
-		newWidth=wxMin(newWidth,m_maximumPaneSizeX);
-                dragRect = wxRect(xp, yp, newWidth, h);
+                }
+                else
+                {
+                    newWidth = x - xp;
+                }
+                break;
+
+            case wxSASH_NONE:
+                // can this happen at all?
                 break;
-            }
-	    case wxSASH_NONE:
-	    {
-	        break;
-	    }
         }
 
+        if ( newHeight == -1 )
+        {
+            // didn't change
+            newHeight = h;
+        }
+        else
+        {
+            // make sure it's in m_minimumPaneSizeY..m_maximumPaneSizeY range
+            newHeight = wxMax(newHeight, m_minimumPaneSizeY);
+            newHeight = wxMin(newHeight, m_maximumPaneSizeY);
+        }
+
+        if ( newWidth == -1 )
+        {
+            // didn't change
+            newWidth = w;
+        }
+        else
+        {
+            // make sure it's in m_minimumPaneSizeY..m_maximumPaneSizeY range
+            newWidth = wxMax(newWidth, m_minimumPaneSizeX);
+            newWidth = wxMin(newWidth, m_maximumPaneSizeX);
+        }
+
+        dragRect = wxRect(x, y, newWidth, newHeight);
+
         wxSashEvent event(GetId(), edge);
         event.SetEventObject(this);
         event.SetDragStatus(status);
         event.SetDragRect(dragRect);
         GetEventHandler()->ProcessEvent(event);
-	}
-	else if (event.Moving() && !event.Dragging())
-	{
+    }
+    else if (event.Moving() && !event.Dragging())
+    {
         // Just change the cursor if required
         if ( sashHit != wxSASH_NONE )
         {
-            	if ( (sashHit == wxSASH_LEFT) || (sashHit == wxSASH_RIGHT) )
-                {
-	                SetCursor(*m_sashCursorWE);
-                }
-                else
-                {
-	                SetCursor(*m_sashCursorNS);
-                }
+            if ( (sashHit == wxSASH_LEFT) || (sashHit == wxSASH_RIGHT) )
+            {
+                SetCursor(*m_sashCursorWE);
+            }
+            else
+            {
+                SetCursor(*m_sashCursorNS);
+            }
+        }
+    }
+    else if ( event.Dragging() &&
+              ((m_dragMode == wxSASH_DRAG_DRAGGING) ||
+               (m_dragMode == wxSASH_DRAG_LEFT_DOWN)) )
+    {
+        if ( (m_draggingEdge == wxSASH_LEFT) || (m_draggingEdge == wxSASH_RIGHT) )
+        {
+            SetCursor(*m_sashCursorWE);
+        }
+        else
+        {
+            SetCursor(*m_sashCursorNS);
         }
-	}
-	else if ( event.Dragging() &&
-              ((m_dragMode == wxSASH_DRAG_DRAGGING) || (m_dragMode == wxSASH_DRAG_LEFT_DOWN))
-            )
-	{
-       	 if ( (m_draggingEdge == wxSASH_LEFT) || (m_draggingEdge == wxSASH_RIGHT) )
-         {
-	        SetCursor(*m_sashCursorWE);
-         }
-         else
-         {
-	        SetCursor(*m_sashCursorNS);
-         }
 
         if (m_dragMode == wxSASH_DRAG_LEFT_DOWN)
         {
@@ -272,18 +316,18 @@ void wxSashWindow::OnMouseEvent(wxMouseEvent& event)
         }
         else
         {
-          if ( m_dragMode == wxSASH_DRAG_DRAGGING )
-          {
-            // Erase old tracker
-            DrawSashTracker(m_draggingEdge, m_oldX, m_oldY);
+            if ( m_dragMode == wxSASH_DRAG_DRAGGING )
+            {
+                // Erase old tracker
+                DrawSashTracker(m_draggingEdge, m_oldX, m_oldY);
 
-            // Draw new one
-            DrawSashTracker(m_draggingEdge, x, y);
-          }
+                // Draw new one
+                DrawSashTracker(m_draggingEdge, x, y);
+            }
         }
         m_oldX = x;
         m_oldY = y;
-	}
+    }
     else if ( event.LeftDClick() )
     {
         // Nothing
diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp
index 76dae328f5..8e7d38a886 100644
--- a/src/gtk/textctrl.cpp
+++ b/src/gtk/textctrl.cpp
@@ -932,85 +932,6 @@ void wxTextCtrl::OnChar( wxKeyEvent &key_event )
     key_event.Skip();
 }
 
-#if wxUSE_STD_IOSTREAM
-int wxTextCtrl::overflow( int WXUNUSED(c) )
-{
-    int len = pptr() - pbase();
-    char *txt = new char[len+1];
-    strncpy(txt, pbase(), len);
-    txt[len] = '\0';
-    (*this) << txt;
-    setp(pbase(), epptr());
-    delete[] txt;
-    return EOF;
-}
-
-int wxTextCtrl::sync()
-{
-    int len = pptr() - pbase();
-    char *txt = new char[len+1];
-    strncpy(txt, pbase(), len);
-    txt[len] = '\0';
-    (*this) << txt;
-    setp(pbase(), epptr());
-    delete[] txt;
-    return 0;
-}
-
-int wxTextCtrl::underflow()
-{
-    return EOF;
-}
-#endif
-
-wxTextCtrl& wxTextCtrl::operator<<(const wxString& s)
-{
-    AppendText(s);
-    return *this;
-}
-
-wxTextCtrl& wxTextCtrl::operator<<(float f)
-{
-    static char buf[100];
-    sprintf(buf, "%.2f", f);
-    AppendText(buf);
-    return *this;
-}
-
-wxTextCtrl& wxTextCtrl::operator<<(double d)
-{
-    static char buf[100];
-    sprintf(buf, "%.2f", d);
-    AppendText(buf);
-    return *this;
-}
-
-wxTextCtrl& wxTextCtrl::operator<<(int i)
-{
-    static char buf[100];
-    sprintf(buf, "%i", i);
-    AppendText(buf);
-    return *this;
-}
-
-wxTextCtrl& wxTextCtrl::operator<<(long i)
-{
-    static char buf[100];
-    sprintf(buf, "%ld", i);
-    AppendText(buf);
-    return *this;
-}
-
-wxTextCtrl& wxTextCtrl::operator<<(const char c)
-{
-    char buf[2];
-
-    buf[0] = c;
-    buf[1] = 0;
-    AppendText(buf);
-    return *this;
-}
-
 GtkWidget* wxTextCtrl::GetConnectWidget()
 {
     return GTK_WIDGET(m_text);
diff --git a/src/gtk1/textctrl.cpp b/src/gtk1/textctrl.cpp
index 76dae328f5..8e7d38a886 100644
--- a/src/gtk1/textctrl.cpp
+++ b/src/gtk1/textctrl.cpp
@@ -932,85 +932,6 @@ void wxTextCtrl::OnChar( wxKeyEvent &key_event )
     key_event.Skip();
 }
 
-#if wxUSE_STD_IOSTREAM
-int wxTextCtrl::overflow( int WXUNUSED(c) )
-{
-    int len = pptr() - pbase();
-    char *txt = new char[len+1];
-    strncpy(txt, pbase(), len);
-    txt[len] = '\0';
-    (*this) << txt;
-    setp(pbase(), epptr());
-    delete[] txt;
-    return EOF;
-}
-
-int wxTextCtrl::sync()
-{
-    int len = pptr() - pbase();
-    char *txt = new char[len+1];
-    strncpy(txt, pbase(), len);
-    txt[len] = '\0';
-    (*this) << txt;
-    setp(pbase(), epptr());
-    delete[] txt;
-    return 0;
-}
-
-int wxTextCtrl::underflow()
-{
-    return EOF;
-}
-#endif
-
-wxTextCtrl& wxTextCtrl::operator<<(const wxString& s)
-{
-    AppendText(s);
-    return *this;
-}
-
-wxTextCtrl& wxTextCtrl::operator<<(float f)
-{
-    static char buf[100];
-    sprintf(buf, "%.2f", f);
-    AppendText(buf);
-    return *this;
-}
-
-wxTextCtrl& wxTextCtrl::operator<<(double d)
-{
-    static char buf[100];
-    sprintf(buf, "%.2f", d);
-    AppendText(buf);
-    return *this;
-}
-
-wxTextCtrl& wxTextCtrl::operator<<(int i)
-{
-    static char buf[100];
-    sprintf(buf, "%i", i);
-    AppendText(buf);
-    return *this;
-}
-
-wxTextCtrl& wxTextCtrl::operator<<(long i)
-{
-    static char buf[100];
-    sprintf(buf, "%ld", i);
-    AppendText(buf);
-    return *this;
-}
-
-wxTextCtrl& wxTextCtrl::operator<<(const char c)
-{
-    char buf[2];
-
-    buf[0] = c;
-    buf[1] = 0;
-    AppendText(buf);
-    return *this;
-}
-
 GtkWidget* wxTextCtrl::GetConnectWidget()
 {
     return GTK_WIDGET(m_text);
diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32
index 2773aed98f..5543dae5df 100644
--- a/src/msw/makefile.b32
+++ b/src/msw/makefile.b32
@@ -1,7 +1,14 @@
+
+
+
+
+# This file was automatically generated by tmake at 21:00, 1999/07/14
+# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE B32.T!
+
 #
-# File:		makefile.b32
-# Author:	Julian Smart
-# Created:	1998
+# File:     makefile.b32
+# Author:   Julian Smart
+# Created:  1998
 # Updated:
 # Copyright:
 #
@@ -71,22 +78,23 @@ MSWDIR=.
 
 DOCDIR = $(WXDIR)\docs
 
-GENERICOBJS= \
-  $(MSWDIR)\choicdgg.obj \
-  $(MSWDIR)\gridg.obj \
-  $(MSWDIR)\laywin.obj \
-  $(MSWDIR)\panelg.obj \
-  $(MSWDIR)\progdlgg.obj \
-  $(MSWDIR)\prop.obj \
-  $(MSWDIR)\proplist.obj \
-  $(MSWDIR)\propform.obj \
-  $(MSWDIR)\sashwin.obj \
-  $(MSWDIR)\scrolwin.obj \
-  $(MSWDIR)\splitter.obj \
-  $(MSWDIR)\statusbr.obj \
-  $(MSWDIR)\tabg.obj \
-  $(MSWDIR)\textdlgg.obj \
-  $(MSWDIR)\tipdlg.obj
+GENERICOBJS= $(MSWDIR)\busyinfo.obj \
+		$(MSWDIR)\choicdgg.obj \
+		$(MSWDIR)\extdlgg.obj \
+		$(MSWDIR)\gridg.obj \
+		$(MSWDIR)\laywin.obj \
+		$(MSWDIR)\panelg.obj \
+		$(MSWDIR)\printps.obj \
+		$(MSWDIR)\progdlgg.obj \
+		$(MSWDIR)\prop.obj \
+		$(MSWDIR)\propform.obj \
+		$(MSWDIR)\proplist.obj \
+		$(MSWDIR)\sashwin.obj \
+		$(MSWDIR)\scrolwin.obj \
+		$(MSWDIR)\splitter.obj \
+		$(MSWDIR)\tabg.obj \
+		$(MSWDIR)\textdlgg.obj \
+		$(MSWDIR)\tipdlg.obj
 
 # Not needed:
 #  $(MSWDIR)\colrdlgg.obj \
@@ -100,173 +108,174 @@ GENERICOBJS= \
 #  $(MSWDIR)\treectrl.obj
 
 COMMONOBJS = \
-  $(MSWDIR)\config.obj \
-  $(MSWDIR)\cmndata.obj \
-  $(MSWDIR)\dcbase.obj \
-  $(MSWDIR)\dlgcmn.obj \
-  $(MSWDIR)\docview.obj \
-  $(MSWDIR)\docmdi.obj \
-  $(MSWDIR)\dynarray.obj \
-  $(MSWDIR)\event.obj \
-  $(MSWDIR)\file.obj \
-  $(MSWDIR)\fileconf.obj \
-  $(MSWDIR)\filefn.obj \
-  $(MSWDIR)\framecmn.obj \
-  $(MSWDIR)\gdicmn.obj \
-  $(MSWDIR)\helpbase.obj \
-  $(MSWDIR)\image.obj \
-  $(MSWDIR)\imagbmp.obj \
-  $(MSWDIR)\imagpng.obj \
-  $(MSWDIR)\imagjpeg.obj \
-  $(MSWDIR)\imaggif.obj \
-  $(MSWDIR)\intl.obj \
-  $(MSWDIR)\ipcbase.obj \
-  $(MSWDIR)\log.obj \
-  $(MSWDIR)\layout.obj \
-  $(MSWDIR)\memory.obj \
-  $(MSWDIR)\mimetype.obj \
-  $(MSWDIR)\module.obj \
-  $(MSWDIR)\object.obj \
-  $(MSWDIR)\prntbase.obj \
-  $(MSWDIR)\resource.obj \
-  $(MSWDIR)\tbarbase.obj \
-  $(MSWDIR)\tbarsmpl.obj \
-  $(MSWDIR)\textfile.obj \
-  $(MSWDIR)\timercmn.obj \
-  $(MSWDIR)\utilscmn.obj \
-  $(MSWDIR)\validate.obj \
-  $(MSWDIR)\valgen.obj \
-  $(MSWDIR)\valtext.obj \
-  $(MSWDIR)\variant.obj \
-  $(MSWDIR)\date.obj \
-  $(MSWDIR)\hash.obj \
-  $(MSWDIR)\list.obj \
-  $(MSWDIR)\paper.obj \
-  $(MSWDIR)\string.obj \
-  $(MSWDIR)\time.obj \
-  $(MSWDIR)\wxexpr.obj \
-  $(MSWDIR)\y_tab.obj \
-  $(MSWDIR)\stream.obj \
-  $(MSWDIR)\wfstream.obj \
-  $(MSWDIR)\mstream.obj \
-  $(MSWDIR)\zstream.obj \
-  $(MSWDIR)\datstrm.obj \
-  $(MSWDIR)\sckstrm.obj \
-  $(MSWDIR)\extended.obj \
-  $(MSWDIR)\wincmn.obj \
-  $(MSWDIR)\objstrm.obj \
-  $(MSWDIR)\dynlib.obj \
-  $(MSWDIR)\tokenzr.obj \
-  $(MSWDIR)\socket.obj \
-  $(MSWDIR)\sckint.obj \
-  $(MSWDIR)\sckaddr.obj \
-  $(MSWDIR)\protocol.obj \
-  $(MSWDIR)\url.obj \
-  $(MSWDIR)\http.obj \
-  $(MSWDIR)\ftp.obj \
-  $(MSWDIR)\sckfile.obj \
-  $(MSWDIR)\sckipc.obj \
-  $(MSWDIR)\wxchar.obj
+		$(MSWDIR)\y_tab.obj \
+		$(MSWDIR)\extended.obj \
+		$(MSWDIR)\cmndata.obj \
+		$(MSWDIR)\config.obj \
+		$(MSWDIR)\date.obj \
+		$(MSWDIR)\datstrm.obj \
+		$(MSWDIR)\db.obj \
+		$(MSWDIR)\dbtable.obj \
+		$(MSWDIR)\dcbase.obj \
+		$(MSWDIR)\dlgcmn.obj \
+		$(MSWDIR)\docmdi.obj \
+		$(MSWDIR)\docview.obj \
+		$(MSWDIR)\dynarray.obj \
+		$(MSWDIR)\dynlib.obj \
+		$(MSWDIR)\event.obj \
+		$(MSWDIR)\file.obj \
+		$(MSWDIR)\fileconf.obj \
+		$(MSWDIR)\filefn.obj \
+		$(MSWDIR)\filesys.obj \
+		$(MSWDIR)\framecmn.obj \
+		$(MSWDIR)\fs_inet.obj \
+		$(MSWDIR)\fs_zip.obj \
+		$(MSWDIR)\ftp.obj \
+		$(MSWDIR)\gdicmn.obj \
+		$(MSWDIR)\hash.obj \
+		$(MSWDIR)\helpbase.obj \
+		$(MSWDIR)\http.obj \
+		$(MSWDIR)\imagbmp.obj \
+		$(MSWDIR)\image.obj \
+		$(MSWDIR)\imaggif.obj \
+		$(MSWDIR)\imagjpeg.obj \
+		$(MSWDIR)\imagpng.obj \
+		$(MSWDIR)\intl.obj \
+		$(MSWDIR)\ipcbase.obj \
+		$(MSWDIR)\layout.obj \
+		$(MSWDIR)\list.obj \
+		$(MSWDIR)\log.obj \
+		$(MSWDIR)\memory.obj \
+		$(MSWDIR)\mimetype.obj \
+		$(MSWDIR)\module.obj \
+		$(MSWDIR)\mstream.obj \
+		$(MSWDIR)\object.obj \
+		$(MSWDIR)\objstrm.obj \
+		$(MSWDIR)\odbc.obj \
+		$(MSWDIR)\paper.obj \
+		$(MSWDIR)\prntbase.obj \
+		$(MSWDIR)\process.obj \
+		$(MSWDIR)\protocol.obj \
+		$(MSWDIR)\resource.obj \
+		$(MSWDIR)\sckaddr.obj \
+		$(MSWDIR)\sckfile.obj \
+		$(MSWDIR)\sckint.obj \
+		$(MSWDIR)\sckipc.obj \
+		$(MSWDIR)\sckstrm.obj \
+		$(MSWDIR)\socket.obj \
+		$(MSWDIR)\stream.obj \
+		$(MSWDIR)\string.obj \
+		$(MSWDIR)\tbarbase.obj \
+		$(MSWDIR)\tbarsmpl.obj \
+		$(MSWDIR)\textfile.obj \
+		$(MSWDIR)\time.obj \
+		$(MSWDIR)\timercmn.obj \
+		$(MSWDIR)\tokenzr.obj \
+		$(MSWDIR)\txtstrm.obj \
+		$(MSWDIR)\unzip.obj \
+		$(MSWDIR)\url.obj \
+		$(MSWDIR)\utilscmn.obj \
+		$(MSWDIR)\valgen.obj \
+		$(MSWDIR)\validate.obj \
+		$(MSWDIR)\valtext.obj \
+		$(MSWDIR)\variant.obj \
+		$(MSWDIR)\wfstream.obj \
+		$(MSWDIR)\wincmn.obj \
+		$(MSWDIR)\wxchar.obj \
+		$(MSWDIR)\wxexpr.obj \
+		$(MSWDIR)\zipstream.obj \
+		$(MSWDIR)\zstream.obj
 
-#  $(MSWDIR)\odbc.obj \
-#  $(MSWDIR)\matrix.obj \
-
-MSWOBJS = \
-  $(MSWDIR)\accel.obj \
-  $(MSWDIR)\app.obj \
-  $(MSWDIR)\bitmap.obj \
-  $(MSWDIR)\bmpbuttn.obj \
-  $(MSWDIR)\brush.obj \
-  $(MSWDIR)\button.obj \
-  $(MSWDIR)\caret.obj \
-  $(MSWDIR)\checkbox.obj \
-  $(MSWDIR)\checklst.obj \
-  $(MSWDIR)\choice.obj \
-  $(MSWDIR)\clipbrd.obj \
-  $(MSWDIR)\colordlg.obj \
-  $(MSWDIR)\colour.obj \
-  $(MSWDIR)\combobox.obj \
-  $(MSWDIR)\control.obj \
-  $(MSWDIR)\curico.obj \
-  $(MSWDIR)\cursor.obj \
-  $(MSWDIR)\data.obj \
-  $(MSWDIR)\dc.obj \
-  $(MSWDIR)\dcmemory.obj \
-  $(MSWDIR)\dcclient.obj \
-  $(MSWDIR)\dcprint.obj \
-  $(MSWDIR)\dcscreen.obj \
-  $(MSWDIR)\dde.obj \
-  $(MSWDIR)\dialog.obj \
-  $(MSWDIR)\dib.obj \
-  $(MSWDIR)\dibutils.obj \
-  $(MSWDIR)\dirdlg.obj \
-  $(MSWDIR)\filedlg.obj \
-  $(MSWDIR)\font.obj \
-  $(MSWDIR)\fontdlg.obj \
-  $(MSWDIR)\frame.obj \
-  $(MSWDIR)\gauge95.obj \
-  $(MSWDIR)\gaugemsw.obj \
-  $(MSWDIR)\gdiobj.obj \
-  $(MSWDIR)\helpwin.obj \
-  $(MSWDIR)\icon.obj \
-  $(MSWDIR)\imaglist.obj \
-  $(MSWDIR)\joystick.obj \
-  $(MSWDIR)\listbox.obj \
-  $(MSWDIR)\listctrl.obj \
-  $(MSWDIR)\main.obj \
-  $(MSWDIR)\mdi.obj \
-  $(MSWDIR)\menu.obj \
-  $(MSWDIR)\menuitem.obj \
-  $(MSWDIR)\metafile.obj \
-  $(MSWDIR)\minifram.obj \
-  $(MSWDIR)\msgdlg.obj \
-  $(MSWDIR)\nativdlg.obj \
-  $(MSWDIR)\notebook.obj \
-  $(MSWDIR)\ownerdrw.obj \
-  $(MSWDIR)\palette.obj \
-  $(MSWDIR)\pen.obj \
-  $(MSWDIR)\penwin.obj \
-  $(MSWDIR)\pnghand.obj \
-  $(MSWDIR)\printdlg.obj \
-  $(MSWDIR)\printwin.obj \
-  $(MSWDIR)\radiobox.obj \
-  $(MSWDIR)\radiobut.obj \
-  $(MSWDIR)\region.obj \
-  $(MSWDIR)\registry.obj \
-  $(MSWDIR)\regconf.obj \
-  $(MSWDIR)\scrolbar.obj \
-  $(MSWDIR)\settings.obj \
-  $(MSWDIR)\slidrmsw.obj \
-  $(MSWDIR)\slider95.obj \
-  $(MSWDIR)\spinbutt.obj \
-  $(MSWDIR)\statbmp.obj \
-  $(MSWDIR)\statbox.obj \
-  $(MSWDIR)\statline.obj \
-  $(MSWDIR)\stattext.obj \
-  $(MSWDIR)\statbr95.obj \
-  $(MSWDIR)\tabctrl.obj \
-  $(MSWDIR)\tbarmsw.obj \
-  $(MSWDIR)\textctrl.obj \
-  $(MSWDIR)\txtstrm.obj \
-  $(MSWDIR)\thread.obj \
-  $(MSWDIR)\timer.obj \
-  $(MSWDIR)\tooltip.obj \
-  $(MSWDIR)\treectrl.obj \
-  $(MSWDIR)\taskbar.obj \
-  $(MSWDIR)\tbar95.obj \
-  $(MSWDIR)\utils.obj \
-  $(MSWDIR)\utilsexc.obj \
-  $(MSWDIR)\wave.obj \
-  $(MSWDIR)\window.obj \
-  $(MSWDIR)\xpmhand.obj \
-  $(MSWDIR)\droptgt.obj \
-  $(MSWDIR)\dropsrc.obj \
-  $(MSWDIR)\oleutils.obj \
-  $(MSWDIR)\dataobj.obj \
-  $(MSWDIR)\uuid.obj
-
-# Unfortunately this causes a crash when the oleauto sample starts.
-#  $(MSWDIR)\automtn.obj
+MSWOBJS = $(MSWDIR)\accel.obj \
+		$(MSWDIR)\app.obj \
+		$(MSWDIR)\automtn.obj \
+		$(MSWDIR)\bitmap.obj \
+		$(MSWDIR)\bmpbuttn.obj \
+		$(MSWDIR)\brush.obj \
+		$(MSWDIR)\button.obj \
+		$(MSWDIR)\caret.obj \
+		$(MSWDIR)\checkbox.obj \
+		$(MSWDIR)\checklst.obj \
+		$(MSWDIR)\choice.obj \
+		$(MSWDIR)\clipbrd.obj \
+		$(MSWDIR)\colordlg.obj \
+		$(MSWDIR)\colour.obj \
+		$(MSWDIR)\combobox.obj \
+		$(MSWDIR)\control.obj \
+		$(MSWDIR)\curico.obj \
+		$(MSWDIR)\cursor.obj \
+		$(MSWDIR)\data.obj \
+		$(MSWDIR)\dataobj.obj \
+		$(MSWDIR)\dc.obj \
+		$(MSWDIR)\dcclient.obj \
+		$(MSWDIR)\dcmemory.obj \
+		$(MSWDIR)\dcprint.obj \
+		$(MSWDIR)\dcscreen.obj \
+		$(MSWDIR)\dde.obj \
+		$(MSWDIR)\dialog.obj \
+		$(MSWDIR)\dib.obj \
+		$(MSWDIR)\dibutils.obj \
+		$(MSWDIR)\dirdlg.obj \
+		$(MSWDIR)\dragimag.obj \
+		$(MSWDIR)\dropsrc.obj \
+		$(MSWDIR)\droptgt.obj \
+		$(MSWDIR)\filedlg.obj \
+		$(MSWDIR)\font.obj \
+		$(MSWDIR)\fontdlg.obj \
+		$(MSWDIR)\frame.obj \
+		$(MSWDIR)\gauge95.obj \
+		$(MSWDIR)\gaugemsw.obj \
+		$(MSWDIR)\gdiobj.obj \
+		$(MSWDIR)\helpwin.obj \
+		$(MSWDIR)\icon.obj \
+		$(MSWDIR)\iniconf.obj \
+		$(MSWDIR)\joystick.obj \
+		$(MSWDIR)\listbox.obj \
+		$(MSWDIR)\main.obj \
+		$(MSWDIR)\mdi.obj \
+		$(MSWDIR)\menu.obj \
+		$(MSWDIR)\menuitem.obj \
+		$(MSWDIR)\metafile.obj \
+		$(MSWDIR)\minifram.obj \
+		$(MSWDIR)\msgdlg.obj \
+		$(MSWDIR)\nativdlg.obj \
+		$(MSWDIR)\oleutils.obj \
+		$(MSWDIR)\ownerdrw.obj \
+		$(MSWDIR)\palette.obj \
+		$(MSWDIR)\pen.obj \
+		$(MSWDIR)\penwin.obj \
+		$(MSWDIR)\pnghand.obj \
+		$(MSWDIR)\printdlg.obj \
+		$(MSWDIR)\printwin.obj \
+		$(MSWDIR)\radiobox.obj \
+		$(MSWDIR)\radiobut.obj \
+		$(MSWDIR)\regconf.obj \
+		$(MSWDIR)\region.obj \
+		$(MSWDIR)\registry.obj \
+		$(MSWDIR)\scrolbar.obj \
+		$(MSWDIR)\settings.obj \
+		$(MSWDIR)\slider95.obj \
+		$(MSWDIR)\slidrmsw.obj \
+		$(MSWDIR)\spinbutt.obj \
+		$(MSWDIR)\statbmp.obj \
+		$(MSWDIR)\statbox.obj \
+		$(MSWDIR)\statbr95.obj \
+		$(MSWDIR)\statline.obj \
+		$(MSWDIR)\stattext.obj \
+		$(MSWDIR)\tabctrl.obj \
+		$(MSWDIR)\taskbar.obj \
+		$(MSWDIR)\tbar95.obj \
+		$(MSWDIR)\tbarmsw.obj \
+		$(MSWDIR)\textctrl.obj \
+		$(MSWDIR)\thread.obj \
+		$(MSWDIR)\timer.obj \
+		$(MSWDIR)\tooltip.obj \
+		$(MSWDIR)\utils.obj \
+		$(MSWDIR)\utilsexc.obj \
+		$(MSWDIR)\uuid.obj \
+		$(MSWDIR)\wave.obj \
+		$(MSWDIR)\window.obj \
+		$(MSWDIR)\xpmhand.obj
 
 OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS)
 
@@ -306,8 +315,8 @@ dummydll.obj: dummydll.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\includ
 $(MSWDIR)\y_tab.obj:     $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c
 
 #        cl @<<
-#$(CPPFLAGS2) /c $*.c -DUSE_DEFINE -DYY_USE_PROTOS /Fo$@
-#<<
+# $(CPPFLAGS2) /c $*.c -DUSE_DEFINE -DYY_USE_PROTOS /Fo$@
+# <<
 
 $(COMMDIR)\y_tab.c:     $(COMMDIR)\dosyacc.c
         copy $(COMMDIR)\dosyacc.c $(COMMDIR)\y_tab.c
@@ -315,372 +324,385 @@ $(COMMDIR)\y_tab.c:     $(COMMDIR)\dosyacc.c
 $(COMMDIR)\lex_yy.c:    $(COMMDIR)\doslex.c
     copy $(COMMDIR)\doslex.c $(COMMDIR)\lex_yy.c
 
-#$(OBJECTS):	$(WXDIR)\include\wx\setup.h
+# $(OBJECTS):	$(WXDIR)\include\wx\setup.h
 
-$(MSWDIR)\accel.obj:     $(MSWDIR)\accel.$(SRCSUFF)
+$(MSWDIR)\accel.obj: $(MSWDIR)\accel.$(SRCSUFF)
 
-$(MSWDIR)\app.obj:     $(MSWDIR)\app.$(SRCSUFF)
+$(MSWDIR)\app.obj: $(MSWDIR)\app.$(SRCSUFF)
 
-$(MSWDIR)\bitmap.obj:     $(MSWDIR)\bitmap.$(SRCSUFF)
+$(MSWDIR)\automtn.obj: $(MSWDIR)\automtn.$(SRCSUFF)
 
-$(MSWDIR)\bmpbuttn.obj:     $(MSWDIR)\bmpbuttn.$(SRCSUFF)
+$(MSWDIR)\bitmap.obj: $(MSWDIR)\bitmap.$(SRCSUFF)
 
-$(MSWDIR)\brush.obj:     $(MSWDIR)\brush.$(SRCSUFF)
+$(MSWDIR)\bmpbuttn.obj: $(MSWDIR)\bmpbuttn.$(SRCSUFF)
 
-$(MSWDIR)\button.obj:     $(MSWDIR)\button.$(SRCSUFF)
+$(MSWDIR)\brush.obj: $(MSWDIR)\brush.$(SRCSUFF)
 
-$(MSWDIR)\caret.obj:     $(MSWDIR)\caret.$(SRCSUFF)
+$(MSWDIR)\button.obj: $(MSWDIR)\button.$(SRCSUFF)
 
-$(MSWDIR)\checkbox.obj:     $(MSWDIR)\checkbox.$(SRCSUFF)
+$(MSWDIR)\caret.obj: $(MSWDIR)\caret.$(SRCSUFF)
 
-$(MSWDIR)\checklst.obj:     $(MSWDIR)\checklst.$(SRCSUFF)
+$(MSWDIR)\checkbox.obj: $(MSWDIR)\checkbox.$(SRCSUFF)
 
-$(MSWDIR)\choice.obj:     $(MSWDIR)\choice.$(SRCSUFF)
+$(MSWDIR)\checklst.obj: $(MSWDIR)\checklst.$(SRCSUFF)
 
-$(MSWDIR)\clipbrd.obj:     $(MSWDIR)\clipbrd.$(SRCSUFF)
+$(MSWDIR)\choice.obj: $(MSWDIR)\choice.$(SRCSUFF)
 
-$(MSWDIR)\colordlg.obj:     $(MSWDIR)\colordlg.$(SRCSUFF)
+$(MSWDIR)\clipbrd.obj: $(MSWDIR)\clipbrd.$(SRCSUFF)
 
-$(MSWDIR)\colour.obj:     $(MSWDIR)\colour.$(SRCSUFF)
+$(MSWDIR)\colordlg.obj: $(MSWDIR)\colordlg.$(SRCSUFF)
 
-$(MSWDIR)\combobox.obj:     $(MSWDIR)\combobox.$(SRCSUFF)
+$(MSWDIR)\colour.obj: $(MSWDIR)\colour.$(SRCSUFF)
 
-$(MSWDIR)\control.obj:     $(MSWDIR)\control.$(SRCSUFF)
+$(MSWDIR)\combobox.obj: $(MSWDIR)\combobox.$(SRCSUFF)
 
-$(MSWDIR)\curico.obj:     $(MSWDIR)\curico.$(SRCSUFF)
+$(MSWDIR)\control.obj: $(MSWDIR)\control.$(SRCSUFF)
 
-$(MSWDIR)\cursor.obj:     $(MSWDIR)\cursor.$(SRCSUFF)
+$(MSWDIR)\curico.obj: $(MSWDIR)\curico.$(SRCSUFF)
 
-$(MSWDIR)\data.obj:     $(MSWDIR)\data.$(SRCSUFF)
+$(MSWDIR)\cursor.obj: $(MSWDIR)\cursor.$(SRCSUFF)
 
-$(MSWDIR)\dde.obj:     $(MSWDIR)\dde.$(SRCSUFF)
+$(MSWDIR)\data.obj: $(MSWDIR)\data.$(SRCSUFF)
 
-$(MSWDIR)\dc.obj:     $(MSWDIR)\dc.$(SRCSUFF)
+$(MSWDIR)\dataobj.obj: $(MSWDIR)\dataobj.$(SRCSUFF)
 
-$(MSWDIR)\dcmemory.obj:     $(MSWDIR)\dcmemory.$(SRCSUFF)
+$(MSWDIR)\dc.obj: $(MSWDIR)\dc.$(SRCSUFF)
 
-$(MSWDIR)\dcclient.obj:     $(MSWDIR)\dcclient.$(SRCSUFF)
+$(MSWDIR)\dcclient.obj: $(MSWDIR)\dcclient.$(SRCSUFF)
 
-$(MSWDIR)\dcprint.obj:     $(MSWDIR)\dcprint.$(SRCSUFF)
+$(MSWDIR)\dcmemory.obj: $(MSWDIR)\dcmemory.$(SRCSUFF)
 
-$(MSWDIR)\dcscreen.obj:     $(MSWDIR)\dcscreen.$(SRCSUFF)
+$(MSWDIR)\dcprint.obj: $(MSWDIR)\dcprint.$(SRCSUFF)
 
-$(MSWDIR)\dialog.obj:     $(MSWDIR)\dialog.$(SRCSUFF)
+$(MSWDIR)\dcscreen.obj: $(MSWDIR)\dcscreen.$(SRCSUFF)
 
-$(MSWDIR)\dib.obj:     $(MSWDIR)\dib.$(SRCSUFF)
+$(MSWDIR)\dde.obj: $(MSWDIR)\dde.$(SRCSUFF)
 
-$(MSWDIR)\dirdlg.obj:     $(MSWDIR)\dirdlg.$(SRCSUFF)
+$(MSWDIR)\dialog.obj: $(MSWDIR)\dialog.$(SRCSUFF)
 
-$(MSWDIR)\filedlg.obj:     $(MSWDIR)\filedlg.$(SRCSUFF)
+$(MSWDIR)\dib.obj: $(MSWDIR)\dib.$(SRCSUFF)
 
-$(MSWDIR)\font.obj:     $(MSWDIR)\font.$(SRCSUFF)
+$(MSWDIR)\dibutils.obj: $(MSWDIR)\dibutils.$(SRCSUFF)
 
-$(MSWDIR)\fontdlg.obj:     $(MSWDIR)\fontdlg.$(SRCSUFF)
+$(MSWDIR)\dirdlg.obj: $(MSWDIR)\dirdlg.$(SRCSUFF)
 
-$(MSWDIR)\frame.obj:     $(MSWDIR)\frame.$(SRCSUFF)
+$(MSWDIR)\dragimag.obj: $(MSWDIR)\dragimag.$(SRCSUFF)
 
-$(MSWDIR)\gaugemsw.obj:     $(MSWDIR)\gaugemsw.$(SRCSUFF)
+$(MSWDIR)\dropsrc.obj: $(MSWDIR)\dropsrc.$(SRCSUFF)
 
-$(MSWDIR)\gauge95.obj:     $(MSWDIR)\gauge95.$(SRCSUFF)
+$(MSWDIR)\droptgt.obj: $(MSWDIR)\droptgt.$(SRCSUFF)
 
-$(MSWDIR)\gdiobj.obj:     $(MSWDIR)\gdiobj.$(SRCSUFF)
+$(MSWDIR)\filedlg.obj: $(MSWDIR)\filedlg.$(SRCSUFF)
 
-$(MSWDIR)\icon.obj:     $(MSWDIR)\icon.$(SRCSUFF)
+$(MSWDIR)\font.obj: $(MSWDIR)\font.$(SRCSUFF)
 
-$(MSWDIR)\imaglist.obj:     $(MSWDIR)\imaglist.$(SRCSUFF)
+$(MSWDIR)\fontdlg.obj: $(MSWDIR)\fontdlg.$(SRCSUFF)
 
-$(MSWDIR)\joystick.obj:     $(MSWDIR)\joystick.$(SRCSUFF)
+$(MSWDIR)\frame.obj: $(MSWDIR)\frame.$(SRCSUFF)
 
-$(MSWDIR)\listbox.obj:     $(MSWDIR)\listbox.$(SRCSUFF)
+$(MSWDIR)\gauge95.obj: $(MSWDIR)\gauge95.$(SRCSUFF)
 
-$(MSWDIR)\listctrl.obj:     $(MSWDIR)\listctrl.$(SRCSUFF)
+$(MSWDIR)\gaugemsw.obj: $(MSWDIR)\gaugemsw.$(SRCSUFF)
 
-$(MSWDIR)\main.obj:     $(MSWDIR)\main.$(SRCSUFF)
+$(MSWDIR)\gdiobj.obj: $(MSWDIR)\gdiobj.$(SRCSUFF)
 
-$(MSWDIR)\mdi.obj:     $(MSWDIR)\mdi.$(SRCSUFF)
+$(MSWDIR)\helpwin.obj: $(MSWDIR)\helpwin.$(SRCSUFF)
 
-$(MSWDIR)\menu.obj:     $(MSWDIR)\menu.$(SRCSUFF)
+$(MSWDIR)\icon.obj: $(MSWDIR)\icon.$(SRCSUFF)
 
-$(MSWDIR)\menuitem.obj:     $(MSWDIR)\menu.$(SRCSUFF)
+$(MSWDIR)\iniconf.obj: $(MSWDIR)\iniconf.$(SRCSUFF)
 
-$(MSWDIR)\metafile.obj:     $(MSWDIR)\metafile.$(SRCSUFF)
+$(MSWDIR)\joystick.obj: $(MSWDIR)\joystick.$(SRCSUFF)
 
-$(MSWDIR)\minifram.obj:     $(MSWDIR)\minifram.$(SRCSUFF)
+$(MSWDIR)\listbox.obj: $(MSWDIR)\listbox.$(SRCSUFF)
 
-$(MSWDIR)\msgdlg.obj:     $(MSWDIR)\msgdlg.$(SRCSUFF)
+$(MSWDIR)\main.obj: $(MSWDIR)\main.$(SRCSUFF)
 
-$(MSWDIR)\nativdlg.obj:     $(MSWDIR)\nativdlg.$(SRCSUFF)
+$(MSWDIR)\mdi.obj: $(MSWDIR)\mdi.$(SRCSUFF)
 
-$(MSWDIR)\notebook.obj:     $(MSWDIR)\notebook.$(SRCSUFF)
+$(MSWDIR)\menu.obj: $(MSWDIR)\menu.$(SRCSUFF)
 
-$(MSWDIR)\ownerdrw.obj:     $(MSWDIR)\ownerdrw.$(SRCSUFF)
+$(MSWDIR)\menuitem.obj: $(MSWDIR)\menuitem.$(SRCSUFF)
 
-$(MSWDIR)\palette.obj:     $(MSWDIR)\palette.$(SRCSUFF)
+$(MSWDIR)\metafile.obj: $(MSWDIR)\metafile.$(SRCSUFF)
 
-$(MSWDIR)\pen.obj:     $(MSWDIR)\pen.$(SRCSUFF)
+$(MSWDIR)\minifram.obj: $(MSWDIR)\minifram.$(SRCSUFF)
 
-$(MSWDIR)\penwin.obj:     $(MSWDIR)\penwin.$(SRCSUFF)
+$(MSWDIR)\msgdlg.obj: $(MSWDIR)\msgdlg.$(SRCSUFF)
 
-$(MSWDIR)\printdlg.obj:     $(MSWDIR)\printdlg.$(SRCSUFF)
+$(MSWDIR)\nativdlg.obj: $(MSWDIR)\nativdlg.$(SRCSUFF)
 
-$(MSWDIR)\printwin.obj:     $(MSWDIR)\printwin.$(SRCSUFF)
+$(MSWDIR)\oleutils.obj: $(MSWDIR)\oleutils.$(SRCSUFF)
 
-$(MSWDIR)\radiobox.obj:     $(MSWDIR)\radiobox.$(SRCSUFF)
+$(MSWDIR)\ownerdrw.obj: $(MSWDIR)\ownerdrw.$(SRCSUFF)
 
-$(MSWDIR)\radiobut.obj:     $(MSWDIR)\radiobut.$(SRCSUFF)
+$(MSWDIR)\palette.obj: $(MSWDIR)\palette.$(SRCSUFF)
 
-$(MSWDIR)\region.obj:     $(MSWDIR)\region.$(SRCSUFF)
+$(MSWDIR)\pen.obj: $(MSWDIR)\pen.$(SRCSUFF)
 
-$(MSWDIR)\registry.obj:     $(MSWDIR)\registry.$(SRCSUFF)
+$(MSWDIR)\penwin.obj: $(MSWDIR)\penwin.$(SRCSUFF)
 
-$(MSWDIR)\regconf.obj:     $(MSWDIR)\regconf.$(SRCSUFF)
+$(MSWDIR)\pnghand.obj: $(MSWDIR)\pnghand.$(SRCSUFF)
 
-$(MSWDIR)\scrolbar.obj:     $(MSWDIR)\scrolbar.$(SRCSUFF)
+$(MSWDIR)\printdlg.obj: $(MSWDIR)\printdlg.$(SRCSUFF)
 
-$(MSWDIR)\settings.obj:     $(MSWDIR)\settings.$(SRCSUFF)
+$(MSWDIR)\printwin.obj: $(MSWDIR)\printwin.$(SRCSUFF)
 
-$(MSWDIR)\slidrmsw.obj:     $(MSWDIR)\slidrmsw.$(SRCSUFF)
+$(MSWDIR)\radiobox.obj: $(MSWDIR)\radiobox.$(SRCSUFF)
 
-$(MSWDIR)\slider95.obj:     $(MSWDIR)\slider95.$(SRCSUFF)
+$(MSWDIR)\radiobut.obj: $(MSWDIR)\radiobut.$(SRCSUFF)
 
-$(MSWDIR)\spinbutt.obj:     $(MSWDIR)\spinbutt.$(SRCSUFF)
+$(MSWDIR)\regconf.obj: $(MSWDIR)\regconf.$(SRCSUFF)
 
-$(MSWDIR)\statbmp.obj:     $(MSWDIR)\statbmp.$(SRCSUFF)
+$(MSWDIR)\region.obj: $(MSWDIR)\region.$(SRCSUFF)
 
-$(MSWDIR)\statbox.obj:     $(MSWDIR)\statbox.$(SRCSUFF)
+$(MSWDIR)\registry.obj: $(MSWDIR)\registry.$(SRCSUFF)
 
-$(MSWDIR)\statline.obj:     $(MSWDIR)\statline.$(SRCSUFF)
+$(MSWDIR)\scrolbar.obj: $(MSWDIR)\scrolbar.$(SRCSUFF)
 
-$(MSWDIR)\statbr95.obj:     $(MSWDIR)\statbr95.$(SRCSUFF)
+$(MSWDIR)\settings.obj: $(MSWDIR)\settings.$(SRCSUFF)
 
-$(MSWDIR)\stattext.obj:     $(MSWDIR)\stattext.$(SRCSUFF)
+$(MSWDIR)\slider95.obj: $(MSWDIR)\slider95.$(SRCSUFF)
 
-$(MSWDIR)\tabctrl.obj:     $(MSWDIR)\tabctrl.$(SRCSUFF)
+$(MSWDIR)\slidrmsw.obj: $(MSWDIR)\slidrmsw.$(SRCSUFF)
 
-$(MSWDIR)\taskbar.obj:     $(MSWDIR)\taskbar.$(SRCSUFF)
+$(MSWDIR)\spinbutt.obj: $(MSWDIR)\spinbutt.$(SRCSUFF)
 
-$(MSWDIR)\tbar95.obj:     $(MSWDIR)\tbar95.$(SRCSUFF)
+$(MSWDIR)\statbmp.obj: $(MSWDIR)\statbmp.$(SRCSUFF)
 
-$(MSWDIR)\tbarmsw.obj:     $(MSWDIR)\tbarmsw.$(SRCSUFF)
+$(MSWDIR)\statbox.obj: $(MSWDIR)\statbox.$(SRCSUFF)
 
-$(MSWDIR)\textctrl.obj:     $(MSWDIR)\textctrl.$(SRCSUFF)
+$(MSWDIR)\statbr95.obj: $(MSWDIR)\statbr95.$(SRCSUFF)
 
-$(MSWDIR)\txtstrm.obj:     $(MSWDIR)\txtstrm.$(SRCSUFF)
+$(MSWDIR)\statline.obj: $(MSWDIR)\statline.$(SRCSUFF)
 
-$(MSWDIR)\thread.obj:     $(MSWDIR)\thread.$(SRCSUFF)
+$(MSWDIR)\stattext.obj: $(MSWDIR)\stattext.$(SRCSUFF)
 
-$(MSWDIR)\timer.obj:     $(MSWDIR)\timer.$(SRCSUFF)
+$(MSWDIR)\tabctrl.obj: $(MSWDIR)\tabctrl.$(SRCSUFF)
 
-$(MSWDIR)\tooltip.obj:     $(MSWDIR)\tooltip.$(SRCSUFF)
+$(MSWDIR)\taskbar.obj: $(MSWDIR)\taskbar.$(SRCSUFF)
 
-$(MSWDIR)\treectrl.obj:     $(MSWDIR)\treectrl.$(SRCSUFF)
+$(MSWDIR)\tbar95.obj: $(MSWDIR)\tbar95.$(SRCSUFF)
 
-$(MSWDIR)\utils.obj:     $(MSWDIR)\utils.$(SRCSUFF)
+$(MSWDIR)\tbarmsw.obj: $(MSWDIR)\tbarmsw.$(SRCSUFF)
 
-$(MSWDIR)\utilsexc.obj:	$(MSWDIR)\utilsexc.$(SRCSUFF)
+$(MSWDIR)\textctrl.obj: $(MSWDIR)\textctrl.$(SRCSUFF)
 
-$(MSWDIR)\wave.obj:     $(MSWDIR)\wave.$(SRCSUFF)
+$(MSWDIR)\thread.obj: $(MSWDIR)\thread.$(SRCSUFF)
 
-$(MSWDIR)\window.obj:     $(MSWDIR)\window.$(SRCSUFF)
+$(MSWDIR)\timer.obj: $(MSWDIR)\timer.$(SRCSUFF)
 
-$(MSWDIR)\droptgt.obj:     $(OLEDIR)\droptgt.$(SRCSUFF)
+$(MSWDIR)\tooltip.obj: $(MSWDIR)\tooltip.$(SRCSUFF)
 
-$(MSWDIR)\dropsrc.obj:     $(OLEDIR)\dropsrc.$(SRCSUFF)
+$(MSWDIR)\utils.obj: $(MSWDIR)\utils.$(SRCSUFF)
 
-$(MSWDIR)\dataobj.obj:     $(OLEDIR)\dataobj.$(SRCSUFF)
+$(MSWDIR)\utilsexc.obj: $(MSWDIR)\utilsexc.$(SRCSUFF)
 
-$(MSWDIR)\oleutils.obj:     $(OLEDIR)\oleutils.$(SRCSUFF)
+$(MSWDIR)\uuid.obj: $(MSWDIR)\uuid.$(SRCSUFF)
+
+$(MSWDIR)\wave.obj: $(MSWDIR)\wave.$(SRCSUFF)
+
+$(MSWDIR)\window.obj: $(MSWDIR)\window.$(SRCSUFF)
+
+$(MSWDIR)\xpmhand.obj: $(MSWDIR)\xpmhand.$(SRCSUFF)
 
-$(MSWDIR)\uuid.obj:     $(OLEDIR)\uuid.$(SRCSUFF)
 
-$(MSWDIR)\automtn.obj:     $(OLEDIR)\automtn.$(SRCSUFF)
 
 ########################################################
 # Common objects (always compiled)
 
-$(MSWDIR)\config.obj:     $(COMMDIR)\config.$(SRCSUFF)
+$(MSWDIR)\cmndata.obj: $(COMMDIR)\cmndata.$(SRCSUFF)
 
-$(MSWDIR)\cmndata.obj:     $(COMMDIR)\cmndata.$(SRCSUFF)
+$(MSWDIR)\config.obj: $(COMMDIR)\config.$(SRCSUFF)
 
-$(MSWDIR)\dcbase.obj:     $(COMMDIR)\dcbase.$(SRCSUFF)
+$(MSWDIR)\date.obj: $(COMMDIR)\date.$(SRCSUFF)
 
-$(MSWDIR)\docview.obj:     $(COMMDIR)\docview.$(SRCSUFF)
+$(MSWDIR)\datstrm.obj: $(COMMDIR)\datstrm.$(SRCSUFF)
 
-$(MSWDIR)\docmdi.obj:     $(COMMDIR)\docmdi.$(SRCSUFF)
+$(MSWDIR)\db.obj: $(COMMDIR)\db.$(SRCSUFF)
 
-$(MSWDIR)\dynarray.obj:     $(COMMDIR)\dynarray.$(SRCSUFF)
+$(MSWDIR)\dbtable.obj: $(COMMDIR)\dbtable.$(SRCSUFF)
 
-$(MSWDIR)\dynlib.obj:   $(COMMDIR)\dynlib.$(SRCSUFF)
+$(MSWDIR)\dcbase.obj: $(COMMDIR)\dcbase.$(SRCSUFF)
 
-$(MSWDIR)\event.obj:     $(COMMDIR)\event.$(SRCSUFF)
+$(MSWDIR)\dlgcmn.obj: $(COMMDIR)\dlgcmn.$(SRCSUFF)
 
-$(MSWDIR)\file.obj:     $(COMMDIR)\file.$(SRCSUFF)
+$(MSWDIR)\docmdi.obj: $(COMMDIR)\docmdi.$(SRCSUFF)
 
-$(MSWDIR)\fileconf.obj:     $(COMMDIR)\fileconf.$(SRCSUFF)
+$(MSWDIR)\docview.obj: $(COMMDIR)\docview.$(SRCSUFF)
 
-$(MSWDIR)\filefn.obj:     $(COMMDIR)\filefn.$(SRCSUFF)
+$(MSWDIR)\dynarray.obj: $(COMMDIR)\dynarray.$(SRCSUFF)
 
-$(MSWDIR)\framecmn.obj:     $(COMMDIR)\framecmn.$(SRCSUFF)
+$(MSWDIR)\dynlib.obj: $(COMMDIR)\dynlib.$(SRCSUFF)
 
-$(MSWDIR)\gdicmn.obj:     $(COMMDIR)\gdicmn.$(SRCSUFF)
+$(MSWDIR)\event.obj: $(COMMDIR)\event.$(SRCSUFF)
 
-$(MSWDIR)\image.obj:     $(COMMDIR)\image.$(SRCSUFF)
+$(MSWDIR)\file.obj: $(COMMDIR)\file.$(SRCSUFF)
 
-$(MSWDIR)\imagbmp.obj:     $(COMMDIR)\imagbmp.$(SRCSUFF)
+$(MSWDIR)\fileconf.obj: $(COMMDIR)\fileconf.$(SRCSUFF)
 
-$(MSWDIR)\imagpng.obj:     $(COMMDIR)\imagpng.$(SRCSUFF)
+$(MSWDIR)\filefn.obj: $(COMMDIR)\filefn.$(SRCSUFF)
 
-$(MSWDIR)\imagjpeg.obj:     $(COMMDIR)\imagjpeg.$(SRCSUFF)
+$(MSWDIR)\filesys.obj: $(COMMDIR)\filesys.$(SRCSUFF)
 
-$(MSWDIR)\imaggif.obj:     $(COMMDIR)\imaggif.$(SRCSUFF)
+$(MSWDIR)\framecmn.obj: $(COMMDIR)\framecmn.$(SRCSUFF)
 
-$(MSWDIR)\image.obj:     $(COMMDIR)\image.$(SRCSUFF)
+$(MSWDIR)\fs_inet.obj: $(COMMDIR)\fs_inet.$(SRCSUFF)
 
-$(MSWDIR)\intl.obj:     $(COMMDIR)\intl.$(SRCSUFF)
+$(MSWDIR)\fs_zip.obj: $(COMMDIR)\fs_zip.$(SRCSUFF)
 
-$(MSWDIR)\ipcbase.obj:     $(COMMDIR)\ipcbase.$(SRCSUFF)
+$(MSWDIR)\ftp.obj: $(COMMDIR)\ftp.$(SRCSUFF)
 
-$(MSWDIR)\helpbase.obj:     $(COMMDIR)\helpbase.$(SRCSUFF)
+$(MSWDIR)\gdicmn.obj: $(COMMDIR)\gdicmn.$(SRCSUFF)
 
-$(MSWDIR)\layout.obj:     $(COMMDIR)\layout.$(SRCSUFF)
+$(MSWDIR)\hash.obj: $(COMMDIR)\hash.$(SRCSUFF)
 
-$(MSWDIR)\log.obj:     $(COMMDIR)\log.$(SRCSUFF)
+$(MSWDIR)\helpbase.obj: $(COMMDIR)\helpbase.$(SRCSUFF)
 
-$(MSWDIR)\memory.obj:     $(COMMDIR)\memory.$(SRCSUFF)
+$(MSWDIR)\http.obj: $(COMMDIR)\http.$(SRCSUFF)
 
-$(MSWDIR)\mimetype.obj:     $(COMMDIR)\mimetype.$(SRCSUFF)
+$(MSWDIR)\imagbmp.obj: $(COMMDIR)\imagbmp.$(SRCSUFF)
 
-$(MSWDIR)\module.obj:     $(COMMDIR)\module.$(SRCSUFF)
+$(MSWDIR)\image.obj: $(COMMDIR)\image.$(SRCSUFF)
 
-$(MSWDIR)\object.obj:     $(COMMDIR)\object.$(SRCSUFF)
+$(MSWDIR)\imaggif.obj: $(COMMDIR)\imaggif.$(SRCSUFF)
 
-$(MSWDIR)\odbc.obj:     $(COMMDIR)\odbc.$(SRCSUFF)
+$(MSWDIR)\imagjpeg.obj: $(COMMDIR)\imagjpeg.$(SRCSUFF)
 
-$(MSWDIR)\prntbase.obj:     $(COMMDIR)\prntbase.$(SRCSUFF)
+$(MSWDIR)\imagpng.obj: $(COMMDIR)\imagpng.$(SRCSUFF)
 
-$(MSWDIR)\resource.obj:     $(COMMDIR)\resource.$(SRCSUFF)
+$(MSWDIR)\intl.obj: $(COMMDIR)\intl.$(SRCSUFF)
 
-$(MSWDIR)\tbarbase.obj:     $(COMMDIR)\tbarbase.$(SRCSUFF)
+$(MSWDIR)\ipcbase.obj: $(COMMDIR)\ipcbase.$(SRCSUFF)
 
-$(MSWDIR)\tbarsmpl.obj:     $(COMMDIR)\tbarsmpl.$(SRCSUFF)
+$(MSWDIR)\layout.obj: $(COMMDIR)\layout.$(SRCSUFF)
 
-$(MSWDIR)\textfile.obj:     $(COMMDIR)\textfile.$(SRCSUFF)
+$(MSWDIR)\list.obj: $(COMMDIR)\list.$(SRCSUFF)
 
-$(MSWDIR)\timercmn.obj:     $(COMMDIR)\timercmn.$(SRCSUFF)
+$(MSWDIR)\log.obj: $(COMMDIR)\log.$(SRCSUFF)
 
-$(MSWDIR)\utilscmn.obj:     $(COMMDIR)\utilscmn.$(SRCSUFF)
+$(MSWDIR)\memory.obj: $(COMMDIR)\memory.$(SRCSUFF)
 
-$(MSWDIR)\validate.obj:     $(COMMDIR)\validate.$(SRCSUFF)
+$(MSWDIR)\mimetype.obj: $(COMMDIR)\mimetype.$(SRCSUFF)
 
-$(MSWDIR)\valgen.obj:     $(COMMDIR)\valgen.$(SRCSUFF)
+$(MSWDIR)\module.obj: $(COMMDIR)\module.$(SRCSUFF)
 
-$(MSWDIR)\valtext.obj:     $(COMMDIR)\valtext.$(SRCSUFF)
+$(MSWDIR)\mstream.obj: $(COMMDIR)\mstream.$(SRCSUFF)
 
-$(MSWDIR)\date.obj:     $(COMMDIR)\date.$(SRCSUFF)
+$(MSWDIR)\object.obj: $(COMMDIR)\object.$(SRCSUFF)
 
-$(MSWDIR)\wxexpr.obj:     $(COMMDIR)\wxexpr.$(SRCSUFF)
+$(MSWDIR)\objstrm.obj: $(COMMDIR)\objstrm.$(SRCSUFF)
 
-$(MSWDIR)\hash.obj:     $(COMMDIR)\hash.$(SRCSUFF)
+$(MSWDIR)\odbc.obj: $(COMMDIR)\odbc.$(SRCSUFF)
 
-$(MSWDIR)\list.obj:     $(COMMDIR)\list.$(SRCSUFF)
+$(MSWDIR)\paper.obj: $(COMMDIR)\paper.$(SRCSUFF)
 
-$(MSWDIR)\paper.obj:     $(COMMDIR)\paper.$(SRCSUFF)
+$(MSWDIR)\prntbase.obj: $(COMMDIR)\prntbase.$(SRCSUFF)
 
-$(MSWDIR)\string.obj:     $(COMMDIR)\string.$(SRCSUFF)
-
-$(MSWDIR)\variant.obj:     $(COMMDIR)\variant.$(SRCSUFF)
-
-$(MSWDIR)\matrix.obj:     $(COMMDIR)\matrix.$(SRCSUFF)
-
-$(MSWDIR)\time.obj:     $(COMMDIR)\time.$(SRCSUFF)
-
-$(MSWDIR)\datstrm.obj:	$(COMMDIR)\datstrm.$(SRCSUFF)
-
-$(MSWDIR)\sckstrm.obj:  $(COMMDIR)\sckstrm.$(SRCSUFF)
-
-$(MSWDIR)\mstream.obj:	$(COMMDIR)\mstream.$(SRCSUFF)
-
-$(MSWDIR)\zstream.obj:	$(COMMDIR)\zstream.$(SRCSUFF)
-
-$(MSWDIR)\wfstream.obj:	$(COMMDIR)\wfstream.$(SRCSUFF)
-
-$(MSWDIR)\stream.obj:	$(COMMDIR)\stream.$(SRCSUFF)
-
-$(MSWDIR)\objstrm.obj:  $(COMMDIR)\objstrm.$(SRCSUFF)
-
-$(MSWDIR)\dlgcmn.obj:	$(COMMDIR)\dlgcmn.$(SRCSUFF)
-
-$(MSWDIR)\wincmn.obj:	$(COMMDIR)\wincmn.$(SRCSUFF)
-
-$(MSWDIR)\extended.obj:	$(COMMDIR)\extended.c
-
-$(MSWDIR)\tokenzr.obj:	$(COMMDIR)\tokenzr.$(SRCSUFF)
-
-$(MSWDIR)\socket.obj:	$(COMMDIR)\socket.$(SRCSUFF)
-
-$(MSWDIR)\sckint.obj:	$(COMMDIR)\sckint.$(SRCSUFF)
-
-$(MSWDIR)\sckaddr.obj:	$(COMMDIR)\sckaddr.$(SRCSUFF)
+$(MSWDIR)\process.obj: $(COMMDIR)\process.$(SRCSUFF)
 
 $(MSWDIR)\protocol.obj: $(COMMDIR)\protocol.$(SRCSUFF)
 
-$(MSWDIR)\url.obj:	$(COMMDIR)\url.$(SRCSUFF)
+$(MSWDIR)\resource.obj: $(COMMDIR)\resource.$(SRCSUFF)
 
-$(MSWDIR)\http.obj:	$(COMMDIR)\http.$(SRCSUFF)
+$(MSWDIR)\sckaddr.obj: $(COMMDIR)\sckaddr.$(SRCSUFF)
 
-$(MSWDIR)\ftp.obj:	$(COMMDIR)\ftp.$(SRCSUFF)
+$(MSWDIR)\sckfile.obj: $(COMMDIR)\sckfile.$(SRCSUFF)
 
-$(MSWDIR)\sckfile.obj:	$(COMMDIR)\sckfile.$(SRCSUFF)
+$(MSWDIR)\sckint.obj: $(COMMDIR)\sckint.$(SRCSUFF)
+
+$(MSWDIR)\sckipc.obj: $(COMMDIR)\sckipc.$(SRCSUFF)
+
+$(MSWDIR)\sckstrm.obj: $(COMMDIR)\sckstrm.$(SRCSUFF)
+
+$(MSWDIR)\socket.obj: $(COMMDIR)\socket.$(SRCSUFF)
+
+$(MSWDIR)\stream.obj: $(COMMDIR)\stream.$(SRCSUFF)
+
+$(MSWDIR)\string.obj: $(COMMDIR)\string.$(SRCSUFF)
+
+$(MSWDIR)\tbarbase.obj: $(COMMDIR)\tbarbase.$(SRCSUFF)
+
+$(MSWDIR)\tbarsmpl.obj: $(COMMDIR)\tbarsmpl.$(SRCSUFF)
+
+$(MSWDIR)\textfile.obj: $(COMMDIR)\textfile.$(SRCSUFF)
+
+$(MSWDIR)\time.obj: $(COMMDIR)\time.$(SRCSUFF)
+
+$(MSWDIR)\timercmn.obj: $(COMMDIR)\timercmn.$(SRCSUFF)
+
+$(MSWDIR)\tokenzr.obj: $(COMMDIR)\tokenzr.$(SRCSUFF)
+
+$(MSWDIR)\txtstrm.obj: $(COMMDIR)\txtstrm.$(SRCSUFF)
+
+$(MSWDIR)\unzip.obj: $(COMMDIR)\unzip.$(SRCSUFF)
+
+$(MSWDIR)\url.obj: $(COMMDIR)\url.$(SRCSUFF)
+
+$(MSWDIR)\utilscmn.obj: $(COMMDIR)\utilscmn.$(SRCSUFF)
+
+$(MSWDIR)\valgen.obj: $(COMMDIR)\valgen.$(SRCSUFF)
+
+$(MSWDIR)\validate.obj: $(COMMDIR)\validate.$(SRCSUFF)
+
+$(MSWDIR)\valtext.obj: $(COMMDIR)\valtext.$(SRCSUFF)
+
+$(MSWDIR)\variant.obj: $(COMMDIR)\variant.$(SRCSUFF)
+
+$(MSWDIR)\wfstream.obj: $(COMMDIR)\wfstream.$(SRCSUFF)
+
+$(MSWDIR)\wincmn.obj: $(COMMDIR)\wincmn.$(SRCSUFF)
+
+$(MSWDIR)\wxchar.obj: $(COMMDIR)\wxchar.$(SRCSUFF)
+
+$(MSWDIR)\wxexpr.obj: $(COMMDIR)\wxexpr.$(SRCSUFF)
+
+$(MSWDIR)\zipstream.obj: $(COMMDIR)\zipstream.$(SRCSUFF)
+
+$(MSWDIR)\zstream.obj: $(COMMDIR)\zstream.$(SRCSUFF)
 
-$(MSWDIR)\sckipc.obj:	$(COMMDIR)\sckipc.$(SRCSUFF)
 
-$(MSWDIR)\wxchar.obj:	$(COMMDIR)\wxchar.$(SRCSUFF)
 
 ########################################################
 # Generic objects (not always compiled, depending on
 # whether platforms have native implementations)
 
-$(MSWDIR)\choicdgg.obj:     $(GENDIR)\choicdgg.$(SRCSUFF)
+$(MSWDIR)\busyinfo.obj: $(GENDIR)\busyinfo.$(SRCSUFF)
 
-$(MSWDIR)\colrdlgg.obj:     $(GENDIR)\colrdlgg.$(SRCSUFF)
+$(MSWDIR)\choicdgg.obj: $(GENDIR)\choicdgg.$(SRCSUFF)
 
-$(MSWDIR)\fontdlgg.obj:     $(GENDIR)\fontdlgg.$(SRCSUFF)
+$(MSWDIR)\extdlgg.obj: $(GENDIR)\extdlgg.$(SRCSUFF)
 
-$(MSWDIR)\gridg.obj:     $(GENDIR)\gridg.$(SRCSUFF)
+$(MSWDIR)\gridg.obj: $(GENDIR)\gridg.$(SRCSUFF)
 
-$(MSWDIR)\helpxlp.obj:     $(GENDIR)\helpxlp.$(SRCSUFF)
+$(MSWDIR)\laywin.obj: $(GENDIR)\laywin.$(SRCSUFF)
 
-$(MSWDIR)\laywin.obj:     $(GENDIR)\laywin.$(SRCSUFF)
+$(MSWDIR)\panelg.obj: $(GENDIR)\panelg.$(SRCSUFF)
 
-$(MSWDIR)\msgdlgg.obj:     $(GENDIR)\msgdlgg.$(SRCSUFF)
+$(MSWDIR)\printps.obj: $(GENDIR)\printps.$(SRCSUFF)
 
-$(MSWDIR)\panelg.obj:     $(GENDIR)\panelg.$(SRCSUFF)
+$(MSWDIR)\progdlgg.obj: $(GENDIR)\progdlgg.$(SRCSUFF)
 
-$(MSWDIR)\progdlgg.obj:     $(GENDIR)\progdlgg.$(SRCSUFF)
+$(MSWDIR)\prop.obj: $(GENDIR)\prop.$(SRCSUFF)
 
-$(MSWDIR)\prop.obj:     $(GENDIR)\prop.$(SRCSUFF)
+$(MSWDIR)\propform.obj: $(GENDIR)\propform.$(SRCSUFF)
 
-$(MSWDIR)\proplist.obj:     $(GENDIR)\proplist.$(SRCSUFF)
+$(MSWDIR)\proplist.obj: $(GENDIR)\proplist.$(SRCSUFF)
 
-$(MSWDIR)\propform.obj:     $(GENDIR)\propform.$(SRCSUFF)
+$(MSWDIR)\sashwin.obj: $(GENDIR)\sashwin.$(SRCSUFF)
 
-$(MSWDIR)\printps.obj:     $(GENDIR)\printps.$(SRCSUFF)
+$(MSWDIR)\scrolwin.obj: $(GENDIR)\scrolwin.$(SRCSUFF)
 
-$(MSWDIR)\prntdlgg.obj:     $(GENDIR)\prntdlgg.$(SRCSUFF)
+$(MSWDIR)\splitter.obj: $(GENDIR)\splitter.$(SRCSUFF)
 
-$(MSWDIR)\sashwin.obj:     $(GENDIR)\sashwin.$(SRCSUFF)
+$(MSWDIR)\tabg.obj: $(GENDIR)\tabg.$(SRCSUFF)
 
-$(MSWDIR)\scrolwin.obj:     $(GENDIR)\scrolwin.$(SRCSUFF)
+$(MSWDIR)\textdlgg.obj: $(GENDIR)\textdlgg.$(SRCSUFF)
 
-$(MSWDIR)\splitter.obj:     $(GENDIR)\splitter.$(SRCSUFF)
+$(MSWDIR)\tipdlg.obj: $(GENDIR)\tipdlg.$(SRCSUFF)
 
-$(MSWDIR)\statusbr.obj:     $(GENDIR)\statusbr.$(SRCSUFF)
 
-$(MSWDIR)\textdlgg.obj:     $(GENDIR)\textdlgg.$(SRCSUFF)
 
-$(MSWDIR)\tipdlg.obj:     $(GENDIR)\tipdlg.$(SRCSUFF)
-
-$(MSWDIR)\tabg.obj:     $(GENDIR)\tabg.$(SRCSUFF)
 
 all_utils:
     cd $(WXDIR)\utils
@@ -772,7 +794,7 @@ clean: $(PERIPH_CLEAN_TARGET)
     -erase *.pch
     -erase *.csm
     -erase *.cfg
-	-erase ..\common\y_tab.c
+    -erase ..\common\y_tab.c
     -erase ..\common\lex_yy.c
 
 cleanall: clean
diff --git a/src/msw/makefile.bcc b/src/msw/makefile.bcc
index 70b465d6cf..4c1467510e 100644
--- a/src/msw/makefile.bcc
+++ b/src/msw/makefile.bcc
@@ -1,9 +1,16 @@
+
+
+
+
+# This file was automatically generated by tmake at 21:00, 1999/07/14
+# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BCC.T!
+
 #
-# File:		makefile.bcc
-# Author:	Julian Smart
-# Created:	1993
-# Updated:	
-# Copyright:	(c) 1993, AIAI, University of Edinburgh
+# File:     makefile.bcc
+# Author:   Julian Smart
+# Created:  1993
+# Updated:
+# Copyright:(c) 1993, AIAI, University of Edinburgh
 #
 # "%W% %G%"
 #
@@ -19,7 +26,7 @@
 !endif
 
 !if "$(CFG)" == ""
-#!error You must start compiling from wx\src, not wx\src\msw.
+# !error You must start compiling from wx\src, not wx\src\msw.
 !endif
 
 !ifndef DEBUG
@@ -68,204 +75,171 @@ MSWDIR=.
 
 DOCDIR = $(WXDIR)\docs
 
-GENERICOBJS= \
-  $(MSWDIR)\choicdgg.obj \
-  $(MSWDIR)\colrdlgg.obj \
-  $(MSWDIR)\fontdlgg.obj \
-  $(MSWDIR)\gridg.obj \
-  $(MSWDIR)\imaglist.obj \
-  $(MSWDIR)\helpxlp.obj \
-  $(MSWDIR)\laywin.obj \
-  $(MSWDIR)\listctrl.obj \
-  $(MSWDIR)\notebook.obj \
-  $(MSWDIR)\panelg.obj \
-  $(MSWDIR)\progdlgg.obj \
-  $(MSWDIR)\prop.obj \
-  $(MSWDIR)\propform.obj \
-  $(MSWDIR)\proplist.obj \
-  $(MSWDIR)\sashwin.obj \
-  $(MSWDIR)\scrolwin.obj \
-  $(MSWDIR)\splitter.obj \
-  $(MSWDIR)\statusbr.obj \
-  $(MSWDIR)\tabg.obj \
-  $(MSWDIR)\textdlgg.obj \
-  $(MSWDIR)\tipdlg.obj \
-  $(MSWDIR)\treectrl.obj
-
-#  $(MSWDIR)\msgdlgg.obj \
-#  $(MSWDIR)\printps.obj \
-#  $(MSWDIR)\prntdlgg.obj \
+GENERICOBJS= $(MSWDIR)\busyinfo.obj \
+		$(MSWDIR)\choicdgg.obj \
+		$(MSWDIR)\dirdlgg.obj \
+		$(MSWDIR)\extdlgg.obj \
+		$(MSWDIR)\gridg.obj \
+		$(MSWDIR)\imaglist.obj \
+		$(MSWDIR)\laywin.obj \
+		$(MSWDIR)\listctrl.obj \
+		$(MSWDIR)\notebook.obj \
+		$(MSWDIR)\panelg.obj \
+		$(MSWDIR)\progdlgg.obj \
+		$(MSWDIR)\prop.obj \
+		$(MSWDIR)\propform.obj \
+		$(MSWDIR)\proplist.obj \
+		$(MSWDIR)\sashwin.obj \
+		$(MSWDIR)\scrolwin.obj \
+		$(MSWDIR)\splitter.obj \
+		$(MSWDIR)\statusbr.obj \
+		$(MSWDIR)\tabg.obj \
+		$(MSWDIR)\textdlgg.obj \
+		$(MSWDIR)\tipdlg.obj \
+		$(MSWDIR)\treectrl.obj
 
 COMMONOBJS = \
-  $(MSWDIR)\config.obj \
-  $(MSWDIR)\cmndata.obj \
-  $(MSWDIR)\dcbase.obj \
-  $(MSWDIR)\docview.obj \
-  $(MSWDIR)\docmdi.obj \
-  $(MSWDIR)\dynarray.obj \
-  $(MSWDIR)\event.obj \
-  $(MSWDIR)\file.obj \
-  $(MSWDIR)\fileconf.obj \
-  $(MSWDIR)\filefn.obj \
-  $(MSWDIR)\framecmn.obj \
-  $(MSWDIR)\gdicmn.obj \
-  $(MSWDIR)\helpbase.obj \
-  $(MSWDIR)\image.obj \
-  $(MSWDIR)\intl.obj \
-  $(MSWDIR)\ipcbase.obj \
-  $(MSWDIR)\log.obj \
-  $(MSWDIR)\layout.obj \
-  $(MSWDIR)\memory.obj \
-  $(MSWDIR)\module.obj \
-  $(MSWDIR)\object.obj \
-  $(MSWDIR)\prntbase.obj \
-  $(MSWDIR)\resource.obj \
-  $(MSWDIR)\resourc2.obj \
-  $(MSWDIR)\tbarbase.obj \
-  $(MSWDIR)\tbarsmpl.obj \
-  $(MSWDIR)\textfile.obj \
-  $(MSWDIR)\timercmn.obj \
-  $(MSWDIR)\utilscmn.obj \
-  $(MSWDIR)\validate.obj \
-  $(MSWDIR)\valgen.obj \
-  $(MSWDIR)\valtext.obj \
-  $(MSWDIR)\variant.obj \
-  $(MSWDIR)\date.obj \
-  $(MSWDIR)\hash.obj \
-  $(MSWDIR)\list.obj \
-  $(MSWDIR)\paper.obj \
-  $(MSWDIR)\string.obj \
-  $(MSWDIR)\time.obj \
-  $(MSWDIR)\wxexpr.obj \
-  $(MSWDIR)\y_tab.obj \
-  $(MSWDIR)\stream.obj \
-  $(MSWDIR)\wfstream.obj \
-  $(MSWDIR)\mstream.obj \
-  $(MSWDIR)\zstream.obj \
-  $(MSWDIR)\datstrm.obj \
-  $(MSWDIR)\sckstrm.obj \
-  $(MSWDIR)\extended.obj \
-  $(MSWDIR)\dlgcmn.obj \
-  $(MSWDIR)\wincmn.obj \
-  $(MSWDIR)\objstrm.obj \
-  $(MSWDIR)\dynlib.obj \
-  $(MSWDIR)\tokenzr.obj \
-  $(MSWDIR)\wxchar.obj
+		$(MSWDIR)\y_tab.obj \
+		$(MSWDIR)\extended.obj \
+		$(MSWDIR)\cmndata.obj \
+		$(MSWDIR)\config.obj \
+		$(MSWDIR)\date.obj \
+		$(MSWDIR)\datstrm.obj \
+		$(MSWDIR)\db.obj \
+		$(MSWDIR)\dbtable.obj \
+		$(MSWDIR)\dcbase.obj \
+		$(MSWDIR)\dlgcmn.obj \
+		$(MSWDIR)\docmdi.obj \
+		$(MSWDIR)\docview.obj \
+		$(MSWDIR)\dynarray.obj \
+		$(MSWDIR)\dynlib.obj \
+		$(MSWDIR)\event.obj \
+		$(MSWDIR)\file.obj \
+		$(MSWDIR)\fileconf.obj \
+		$(MSWDIR)\filefn.obj \
+		$(MSWDIR)\filesys.obj \
+		$(MSWDIR)\framecmn.obj \
+		$(MSWDIR)\fs_inet.obj \
+		$(MSWDIR)\fs_zip.obj \
+		$(MSWDIR)\gdicmn.obj \
+		$(MSWDIR)\hash.obj \
+		$(MSWDIR)\helpbase.obj \
+		$(MSWDIR)\imagbmp.obj \
+		$(MSWDIR)\image.obj \
+		$(MSWDIR)\imaggif.obj \
+		$(MSWDIR)\imagjpeg.obj \
+		$(MSWDIR)\imagpng.obj \
+		$(MSWDIR)\intl.obj \
+		$(MSWDIR)\ipcbase.obj \
+		$(MSWDIR)\layout.obj \
+		$(MSWDIR)\list.obj \
+		$(MSWDIR)\log.obj \
+		$(MSWDIR)\memory.obj \
+		$(MSWDIR)\module.obj \
+		$(MSWDIR)\mstream.obj \
+		$(MSWDIR)\object.obj \
+		$(MSWDIR)\objstrm.obj \
+		$(MSWDIR)\paper.obj \
+		$(MSWDIR)\prntbase.obj \
+		$(MSWDIR)\resource.obj \
+		$(MSWDIR)\stream.obj \
+		$(MSWDIR)\string.obj \
+		$(MSWDIR)\tbarbase.obj \
+		$(MSWDIR)\tbarsmpl.obj \
+		$(MSWDIR)\textfile.obj \
+		$(MSWDIR)\time.obj \
+		$(MSWDIR)\timercmn.obj \
+		$(MSWDIR)\tokenzr.obj \
+		$(MSWDIR)\txtstrm.obj \
+		$(MSWDIR)\unzip.obj \
+		$(MSWDIR)\utilscmn.obj \
+		$(MSWDIR)\valgen.obj \
+		$(MSWDIR)\validate.obj \
+		$(MSWDIR)\valtext.obj \
+		$(MSWDIR)\variant.obj \
+		$(MSWDIR)\wfstream.obj \
+		$(MSWDIR)\wincmn.obj \
+		$(MSWDIR)\wxchar.obj \
+		$(MSWDIR)\wxexpr.obj \
+		$(MSWDIR)\zipstream.obj \
+		$(MSWDIR)\zstream.obj \
+		${MSWDIR}\resourc2.cpp
 
-# Don't compile for WIN16
-#  $(MSWDIR)\socket.obj \
-#  $(MSWDIR)\sckaddr.obj \
-#  $(MSWDIR)\protocol.obj \
-#  $(MSWDIR)\url.obj \
-#  $(MSWDIR)\http.obj \
-#  $(MSWDIR)\ftp.obj \
-#  $(MSWDIR)\sckfile.obj \
-#  $(MSWDIR)\sckipc.obj \
-
-# Needs extra files (sql*.h) so not compiled by default.
-#  $(MSWDIR)\odbc.obj \
-
-# Uses WIN32 registry functions
-#  $(MSWDIR)\mimetype.obj \
-
-MSWOBJS = \
-  $(MSWDIR)\accel.obj \
-  $(MSWDIR)\app.obj \
-  $(MSWDIR)\bitmap.obj \
-  $(MSWDIR)\bmpbuttn.obj \
-  $(MSWDIR)\brush.obj \
-  $(MSWDIR)\button.obj \
-  $(MSWDIR)\checkbox.obj \
-  $(MSWDIR)\checklst.obj \
-  $(MSWDIR)\caret.obj \
-  $(MSWDIR)\choice.obj \
-  $(MSWDIR)\clipbrd.obj \
-  $(MSWDIR)\colordlg.obj \
-  $(MSWDIR)\colour.obj \
-  $(MSWDIR)\combobox.obj \
-  $(MSWDIR)\control.obj \
-  $(MSWDIR)\curico.obj \
-  $(MSWDIR)\cursor.obj \
-  $(MSWDIR)\data.obj \
-  $(MSWDIR)\dc.obj \
-  $(MSWDIR)\dcmemory.obj \
-  $(MSWDIR)\dcclient.obj \
-  $(MSWDIR)\dcprint.obj \
-  $(MSWDIR)\dcscreen.obj \
-  $(MSWDIR)\dde.obj \
-  $(MSWDIR)\dialog.obj \
-  $(MSWDIR)\dib.obj \
-  $(MSWDIR)\dibutils.obj \
-  $(MSWDIR)\dirdlg.obj \
-  $(MSWDIR)\filedlg.obj \
-  $(MSWDIR)\font.obj \
-  $(MSWDIR)\fontdlg.obj \
-  $(MSWDIR)\frame.obj \
-  $(MSWDIR)\gaugemsw.obj \
-  $(MSWDIR)\gdiobj.obj \
-  $(MSWDIR)\helpwin.obj \
-  $(MSWDIR)\icon.obj \
-  $(MSWDIR)\iniconf.obj \
-  $(MSWDIR)\joystick.obj \
-  $(MSWDIR)\listbox.obj \
-  $(MSWDIR)\main.obj \
-  $(MSWDIR)\mdi.obj \
-  $(MSWDIR)\menu.obj \
-  $(MSWDIR)\menuitem.obj \
-  $(MSWDIR)\metafile.obj \
-  $(MSWDIR)\minifram.obj \
-  $(MSWDIR)\msgdlg.obj \
-  $(MSWDIR)\nativdlg.obj \
-  $(MSWDIR)\ownerdrw.obj \
-  $(MSWDIR)\palette.obj \
-  $(MSWDIR)\pen.obj \
-  $(MSWDIR)\penwin.obj \
-  $(MSWDIR)\pnghand.obj \
-  $(MSWDIR)\printdlg.obj \
-  $(MSWDIR)\printwin.obj \
-  $(MSWDIR)\radiobox.obj \
-  $(MSWDIR)\radiobut.obj \
-  $(MSWDIR)\region.obj \
-  $(MSWDIR)\scrolbar.obj \
-  $(MSWDIR)\settings.obj \
-  $(MSWDIR)\slidrmsw.obj \
-  $(MSWDIR)\spinbutt.obj \
-  $(MSWDIR)\statbmp.obj \
-  $(MSWDIR)\statbox.obj \
-  $(MSWDIR)\statline.obj \
-  $(MSWDIR)\stattext.obj \
-  $(MSWDIR)\tbarmsw.obj \
-  $(MSWDIR)\textctrl.obj \
-  $(MSWDIR)\timer.obj \
-  $(MSWDIR)\utils.obj \
-  $(MSWDIR)\utilsexc.obj \
-  $(MSWDIR)\wave.obj \
-  $(MSWDIR)\window.obj \
-  $(MSWDIR)\xpmhand.obj
-
-# Unfortunately this causes a crash when the oleauto sample starts.
-#  $(MSWDIR)\automtn.obj
-
-# Not used for 16-bit compilation
-#  $(MSWDIR)\tooltip.obj \
-#  $(MSWDIR)\gauge95.obj \
-#  $(MSWDIR)\treectrl.obj \
-#  $(MSWDIR)\oleutils.obj \
-#  $(MSWDIR)\dataobj.obj \
-#  $(MSWDIR)\uuid.obj
-#  $(MSWDIR)\droptgt.obj \
-#  $(MSWDIR)\dropsrc.obj \
-#  $(MSWDIR)\imaglist.obj \
-#  $(MSWDIR)\notebook.obj \
-#  $(MSWDIR)\listctrl.obj \
-#  $(MSWDIR)\tabctrl.obj \
-#  $(MSWDIR)\taskbar.obj \
-#  $(MSWDIR)\tbar95.obj \
-#  $(MSWDIR)\thread.obj \
-#  $(MSWDIR)\slider95.obj \
-#  $(MSWDIR)\statbr95.obj \
-#  $(MSWDIR)\registry.obj \
-#  $(MSWDIR)\regconf.obj \
+MSWOBJS = $(MSWDIR)\accel.obj \
+		$(MSWDIR)\app.obj \
+		$(MSWDIR)\bitmap.obj \
+		$(MSWDIR)\bmpbuttn.obj \
+		$(MSWDIR)\brush.obj \
+		$(MSWDIR)\button.obj \
+		$(MSWDIR)\caret.obj \
+		$(MSWDIR)\checkbox.obj \
+		$(MSWDIR)\checklst.obj \
+		$(MSWDIR)\choice.obj \
+		$(MSWDIR)\clipbrd.obj \
+		$(MSWDIR)\colordlg.obj \
+		$(MSWDIR)\colour.obj \
+		$(MSWDIR)\combobox.obj \
+		$(MSWDIR)\control.obj \
+		$(MSWDIR)\curico.obj \
+		$(MSWDIR)\cursor.obj \
+		$(MSWDIR)\data.obj \
+		$(MSWDIR)\dc.obj \
+		$(MSWDIR)\dcclient.obj \
+		$(MSWDIR)\dcmemory.obj \
+		$(MSWDIR)\dcprint.obj \
+		$(MSWDIR)\dcscreen.obj \
+		$(MSWDIR)\dde.obj \
+		$(MSWDIR)\dialog.obj \
+		$(MSWDIR)\dib.obj \
+		$(MSWDIR)\dibutils.obj \
+		$(MSWDIR)\dragimag.obj \
+		$(MSWDIR)\filedlg.obj \
+		$(MSWDIR)\font.obj \
+		$(MSWDIR)\fontdlg.obj \
+		$(MSWDIR)\frame.obj \
+		$(MSWDIR)\gaugemsw.obj \
+		$(MSWDIR)\gdiobj.obj \
+		$(MSWDIR)\helpwin.obj \
+		$(MSWDIR)\icon.obj \
+		$(MSWDIR)\iniconf.obj \
+		$(MSWDIR)\joystick.obj \
+		$(MSWDIR)\listbox.obj \
+		$(MSWDIR)\main.obj \
+		$(MSWDIR)\mdi.obj \
+		$(MSWDIR)\menu.obj \
+		$(MSWDIR)\menuitem.obj \
+		$(MSWDIR)\metafile.obj \
+		$(MSWDIR)\minifram.obj \
+		$(MSWDIR)\msgdlg.obj \
+		$(MSWDIR)\nativdlg.obj \
+		$(MSWDIR)\notebook.obj \
+		$(MSWDIR)\ownerdrw.obj \
+		$(MSWDIR)\palette.obj \
+		$(MSWDIR)\pen.obj \
+		$(MSWDIR)\penwin.obj \
+		$(MSWDIR)\pnghand.obj \
+		$(MSWDIR)\printdlg.obj \
+		$(MSWDIR)\printwin.obj \
+		$(MSWDIR)\radiobox.obj \
+		$(MSWDIR)\radiobut.obj \
+		$(MSWDIR)\region.obj \
+		$(MSWDIR)\scrolbar.obj \
+		$(MSWDIR)\settings.obj \
+		$(MSWDIR)\slidrmsw.obj \
+		$(MSWDIR)\spinbutt.obj \
+		$(MSWDIR)\statbmp.obj \
+		$(MSWDIR)\statbox.obj \
+		$(MSWDIR)\statline.obj \
+		$(MSWDIR)\stattext.obj \
+		$(MSWDIR)\tabctrl.obj \
+		$(MSWDIR)\tbarmsw.obj \
+		$(MSWDIR)\textctrl.obj \
+		$(MSWDIR)\timer.obj \
+		$(MSWDIR)\utils.obj \
+		$(MSWDIR)\utilsexc.obj \
+		$(MSWDIR)\wave.obj \
+		$(MSWDIR)\window.obj \
+		$(MSWDIR)\xpmhand.obj
 
 OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS)
 
@@ -285,8 +259,8 @@ dummydll.obj: dummydll.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\includ
 $(MSWDIR)\y_tab.obj:     $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c
 
 #        cl @<<
-#$(CPPFLAGS2) /c $*.c -DUSE_DEFINE -DYY_USE_PROTOS /Fo$@
-#<<
+# $(CPPFLAGS2) /c $*.c -DUSE_DEFINE -DYY_USE_PROTOS /Fo$@
+# <<
 
 $(COMMDIR)\y_tab.c:     $(COMMDIR)\dosyacc.c
         copy $(COMMDIR)\dosyacc.c $(COMMDIR)\y_tab.c
@@ -294,368 +268,340 @@ $(COMMDIR)\y_tab.c:     $(COMMDIR)\dosyacc.c
 $(COMMDIR)\lex_yy.c:    $(COMMDIR)\doslex.c
     copy $(COMMDIR)\doslex.c $(COMMDIR)\lex_yy.c
 
-#$(OBJECTS):	$(WXDIR)\include\wx\setup.h
+# $(OBJECTS):	$(WXDIR)\include\wx\setup.h
 
-$(MSWDIR)\accel.obj:     $(MSWDIR)\accel.$(SRCSUFF)
+$(MSWDIR)\accel.obj: $(MSWDIR)\accel.$(SRCSUFF)
 
-$(MSWDIR)\app.obj:     $(MSWDIR)\app.$(SRCSUFF)
+$(MSWDIR)\app.obj: $(MSWDIR)\app.$(SRCSUFF)
 
-$(MSWDIR)\bitmap.obj:     $(MSWDIR)\bitmap.$(SRCSUFF)
+$(MSWDIR)\bitmap.obj: $(MSWDIR)\bitmap.$(SRCSUFF)
 
-$(MSWDIR)\bmpbuttn.obj:     $(MSWDIR)\bmpbuttn.$(SRCSUFF)
+$(MSWDIR)\bmpbuttn.obj: $(MSWDIR)\bmpbuttn.$(SRCSUFF)
 
-$(MSWDIR)\brush.obj:     $(MSWDIR)\brush.$(SRCSUFF)
+$(MSWDIR)\brush.obj: $(MSWDIR)\brush.$(SRCSUFF)
 
-$(MSWDIR)\button.obj:     $(MSWDIR)\button.$(SRCSUFF)
+$(MSWDIR)\button.obj: $(MSWDIR)\button.$(SRCSUFF)
 
-$(MSWDIR)\caret.obj:     $(MSWDIR)\caret.$(SRCSUFF)
+$(MSWDIR)\caret.obj: $(MSWDIR)\caret.$(SRCSUFF)
 
-$(MSWDIR)\choice.obj:     $(MSWDIR)\choice.$(SRCSUFF)
+$(MSWDIR)\checkbox.obj: $(MSWDIR)\checkbox.$(SRCSUFF)
 
-$(MSWDIR)\checkbox.obj:     $(MSWDIR)\checkbox.$(SRCSUFF)
+$(MSWDIR)\checklst.obj: $(MSWDIR)\checklst.$(SRCSUFF)
 
-$(MSWDIR)\checklst.obj:     $(MSWDIR)\checklst.$(SRCSUFF)
+$(MSWDIR)\choice.obj: $(MSWDIR)\choice.$(SRCSUFF)
 
-$(MSWDIR)\clipbrd.obj:     $(MSWDIR)\clipbrd.$(SRCSUFF)
+$(MSWDIR)\clipbrd.obj: $(MSWDIR)\clipbrd.$(SRCSUFF)
 
-$(MSWDIR)\colordlg.obj:     $(MSWDIR)\colordlg.$(SRCSUFF)
+$(MSWDIR)\colordlg.obj: $(MSWDIR)\colordlg.$(SRCSUFF)
 
-$(MSWDIR)\colour.obj:     $(MSWDIR)\colour.$(SRCSUFF)
+$(MSWDIR)\colour.obj: $(MSWDIR)\colour.$(SRCSUFF)
 
-$(MSWDIR)\combobox.obj:     $(MSWDIR)\combobox.$(SRCSUFF)
+$(MSWDIR)\combobox.obj: $(MSWDIR)\combobox.$(SRCSUFF)
 
-$(MSWDIR)\control.obj:     $(MSWDIR)\control.$(SRCSUFF)
+$(MSWDIR)\control.obj: $(MSWDIR)\control.$(SRCSUFF)
 
-$(MSWDIR)\curico.obj:     $(MSWDIR)\curico.$(SRCSUFF)
+$(MSWDIR)\curico.obj: $(MSWDIR)\curico.$(SRCSUFF)
 
-$(MSWDIR)\cursor.obj:     $(MSWDIR)\cursor.$(SRCSUFF)
+$(MSWDIR)\cursor.obj: $(MSWDIR)\cursor.$(SRCSUFF)
 
-$(MSWDIR)\data.obj:     $(MSWDIR)\data.$(SRCSUFF)
+$(MSWDIR)\data.obj: $(MSWDIR)\data.$(SRCSUFF)
 
-$(MSWDIR)\dde.obj:     $(MSWDIR)\dde.$(SRCSUFF)
+$(MSWDIR)\dc.obj: $(MSWDIR)\dc.$(SRCSUFF)
 
-$(MSWDIR)\dc.obj:     $(MSWDIR)\dc.$(SRCSUFF)
+$(MSWDIR)\dcclient.obj: $(MSWDIR)\dcclient.$(SRCSUFF)
 
-$(MSWDIR)\dcmemory.obj:     $(MSWDIR)\dcmemory.$(SRCSUFF)
+$(MSWDIR)\dcmemory.obj: $(MSWDIR)\dcmemory.$(SRCSUFF)
 
-$(MSWDIR)\dcclient.obj:     $(MSWDIR)\dcclient.$(SRCSUFF)
+$(MSWDIR)\dcprint.obj: $(MSWDIR)\dcprint.$(SRCSUFF)
 
-$(MSWDIR)\dcprint.obj:     $(MSWDIR)\dcprint.$(SRCSUFF)
+$(MSWDIR)\dcscreen.obj: $(MSWDIR)\dcscreen.$(SRCSUFF)
 
-$(MSWDIR)\dcscreen.obj:     $(MSWDIR)\dcscreen.$(SRCSUFF)
+$(MSWDIR)\dde.obj: $(MSWDIR)\dde.$(SRCSUFF)
 
-$(MSWDIR)\dialog.obj:     $(MSWDIR)\dialog.$(SRCSUFF)
+$(MSWDIR)\dialog.obj: $(MSWDIR)\dialog.$(SRCSUFF)
 
-$(MSWDIR)\dib.obj:     $(MSWDIR)\dib.$(SRCSUFF)
+$(MSWDIR)\dib.obj: $(MSWDIR)\dib.$(SRCSUFF)
 
-$(MSWDIR)\dirdlg.obj:     $(MSWDIR)\dirdlg.$(SRCSUFF)
+$(MSWDIR)\dibutils.obj: $(MSWDIR)\dibutils.$(SRCSUFF)
 
-$(MSWDIR)\filedlg.obj:     $(MSWDIR)\filedlg.$(SRCSUFF)
+$(MSWDIR)\dragimag.obj: $(MSWDIR)\dragimag.$(SRCSUFF)
 
-$(MSWDIR)\font.obj:     $(MSWDIR)\font.$(SRCSUFF)
+$(MSWDIR)\filedlg.obj: $(MSWDIR)\filedlg.$(SRCSUFF)
 
-$(MSWDIR)\fontdlg.obj:     $(MSWDIR)\fontdlg.$(SRCSUFF)
+$(MSWDIR)\font.obj: $(MSWDIR)\font.$(SRCSUFF)
 
-$(MSWDIR)\frame.obj:     $(MSWDIR)\frame.$(SRCSUFF)
+$(MSWDIR)\fontdlg.obj: $(MSWDIR)\fontdlg.$(SRCSUFF)
 
-$(MSWDIR)\gaugemsw.obj:     $(MSWDIR)\gaugemsw.$(SRCSUFF)
+$(MSWDIR)\frame.obj: $(MSWDIR)\frame.$(SRCSUFF)
 
-$(MSWDIR)\gauge95.obj:     $(MSWDIR)\gauge95.$(SRCSUFF)
+$(MSWDIR)\gaugemsw.obj: $(MSWDIR)\gaugemsw.$(SRCSUFF)
 
-$(MSWDIR)\gdiobj.obj:     $(MSWDIR)\gdiobj.$(SRCSUFF)
+$(MSWDIR)\gdiobj.obj: $(MSWDIR)\gdi$(SRCSUFF).obj
 
-$(MSWDIR)\icon.obj:     $(MSWDIR)\icon.$(SRCSUFF)
+$(MSWDIR)\helpwin.obj: $(MSWDIR)\helpwin.$(SRCSUFF)
 
-# $(MSWDIR)\imaglist.obj:     $(MSWDIR)\imaglist.$(SRCSUFF)
+$(MSWDIR)\icon.obj: $(MSWDIR)\icon.$(SRCSUFF)
 
-$(MSWDIR)\joystick.obj:     $(MSWDIR)\joystick.$(SRCSUFF)
+$(MSWDIR)\iniconf.obj: $(MSWDIR)\iniconf.$(SRCSUFF)
 
-$(MSWDIR)\listbox.obj:     $(MSWDIR)\listbox.$(SRCSUFF)
+$(MSWDIR)\joystick.obj: $(MSWDIR)\joystick.$(SRCSUFF)
 
-# $(MSWDIR)\listctrl.obj:     $(MSWDIR)\listctrl.$(SRCSUFF)
+$(MSWDIR)\listbox.obj: $(MSWDIR)\listbox.$(SRCSUFF)
 
-$(MSWDIR)\main.obj:     $(MSWDIR)\main.$(SRCSUFF)
+$(MSWDIR)\main.obj: $(MSWDIR)\main.$(SRCSUFF)
 
-$(MSWDIR)\mdi.obj:     $(MSWDIR)\mdi.$(SRCSUFF)
+$(MSWDIR)\mdi.obj: $(MSWDIR)\mdi.$(SRCSUFF)
 
-$(MSWDIR)\menu.obj:     $(MSWDIR)\menu.$(SRCSUFF)
+$(MSWDIR)\menu.obj: $(MSWDIR)\menu.$(SRCSUFF)
 
-$(MSWDIR)\menuitem.obj:     $(MSWDIR)\menu.$(SRCSUFF)
+$(MSWDIR)\menuitem.obj: $(MSWDIR)\menuitem.$(SRCSUFF)
 
-$(MSWDIR)\metafile.obj:     $(MSWDIR)\metafile.$(SRCSUFF)
+$(MSWDIR)\metafile.obj: $(MSWDIR)\metafile.$(SRCSUFF)
 
-$(MSWDIR)\minifram.obj:     $(MSWDIR)\minifram.$(SRCSUFF)
+$(MSWDIR)\minifram.obj: $(MSWDIR)\minifram.$(SRCSUFF)
 
-$(MSWDIR)\msgdlg.obj:     $(MSWDIR)\msgdlg.$(SRCSUFF)
+$(MSWDIR)\msgdlg.obj: $(MSWDIR)\msgdlg.$(SRCSUFF)
 
-$(MSWDIR)\nativdlg.obj:     $(MSWDIR)\nativdlg.$(SRCSUFF)
+$(MSWDIR)\nativdlg.obj: $(MSWDIR)\nativdlg.$(SRCSUFF)
 
-# $(MSWDIR)\notebook.obj:     $(MSWDIR)\notebook.$(SRCSUFF)
+$(MSWDIR)\notebook.obj: $(MSWDIR)\notebook.$(SRCSUFF)
 
-$(MSWDIR)\ownerdrw.obj:     $(MSWDIR)\ownerdrw.$(SRCSUFF)
+$(MSWDIR)\ownerdrw.obj: $(MSWDIR)\ownerdrw.$(SRCSUFF)
 
-$(MSWDIR)\palette.obj:     $(MSWDIR)\palette.$(SRCSUFF)
+$(MSWDIR)\palette.obj: $(MSWDIR)\palette.$(SRCSUFF)
 
-$(MSWDIR)\pen.obj:     $(MSWDIR)\pen.$(SRCSUFF)
+$(MSWDIR)\pen.obj: $(MSWDIR)\pen.$(SRCSUFF)
 
-$(MSWDIR)\penwin.obj:     $(MSWDIR)\penwin.$(SRCSUFF)
+$(MSWDIR)\penwin.obj: $(MSWDIR)\penwin.$(SRCSUFF)
 
-$(MSWDIR)\printdlg.obj:     $(MSWDIR)\printdlg.$(SRCSUFF)
+$(MSWDIR)\pnghand.obj: $(MSWDIR)\pnghand.$(SRCSUFF)
 
-$(MSWDIR)\printwin.obj:     $(MSWDIR)\printwin.$(SRCSUFF)
+$(MSWDIR)\printdlg.obj: $(MSWDIR)\printdlg.$(SRCSUFF)
 
-$(MSWDIR)\radiobox.obj:     $(MSWDIR)\radiobox.$(SRCSUFF)
+$(MSWDIR)\printwin.obj: $(MSWDIR)\printwin.$(SRCSUFF)
 
-$(MSWDIR)\radiobut.obj:     $(MSWDIR)\radiobut.$(SRCSUFF)
+$(MSWDIR)\radiobox.obj: $(MSWDIR)\radiobox.$(SRCSUFF)
 
-$(MSWDIR)\region.obj:     $(MSWDIR)\region.$(SRCSUFF)
+$(MSWDIR)\radiobut.obj: $(MSWDIR)\radiobut.$(SRCSUFF)
 
-$(MSWDIR)\registry.obj:     $(MSWDIR)\registry.$(SRCSUFF)
+$(MSWDIR)\region.obj: $(MSWDIR)\region.$(SRCSUFF)
 
-$(MSWDIR)\regconf.obj:     $(MSWDIR)\regconf.$(SRCSUFF)
+$(MSWDIR)\scrolbar.obj: $(MSWDIR)\scrolbar.$(SRCSUFF)
 
-$(MSWDIR)\scrolbar.obj:     $(MSWDIR)\scrolbar.$(SRCSUFF)
+$(MSWDIR)\settings.obj: $(MSWDIR)\settings.$(SRCSUFF)
 
-$(MSWDIR)\settings.obj:     $(MSWDIR)\settings.$(SRCSUFF)
+$(MSWDIR)\slidrmsw.obj: $(MSWDIR)\slidrmsw.$(SRCSUFF)
 
-$(MSWDIR)\slidrmsw.obj:     $(MSWDIR)\slidrmsw.$(SRCSUFF)
+$(MSWDIR)\spinbutt.obj: $(MSWDIR)\spinbutt.$(SRCSUFF)
 
-$(MSWDIR)\slider95.obj:     $(MSWDIR)\slider95.$(SRCSUFF)
+$(MSWDIR)\statbmp.obj: $(MSWDIR)\statbmp.$(SRCSUFF)
 
-$(MSWDIR)\spinbutt.obj:     $(MSWDIR)\spinbutt.$(SRCSUFF)
+$(MSWDIR)\statbox.obj: $(MSWDIR)\statbox.$(SRCSUFF)
 
-$(MSWDIR)\statbmp.obj:     $(MSWDIR)\statbmp.$(SRCSUFF)
+$(MSWDIR)\statline.obj: $(MSWDIR)\statline.$(SRCSUFF)
 
-$(MSWDIR)\statbox.obj:     $(MSWDIR)\statbox.$(SRCSUFF)
+$(MSWDIR)\stattext.obj: $(MSWDIR)\stattext.$(SRCSUFF)
 
-$(MSWDIR)\statline.obj:     $(MSWDIR)\statline.$(SRCSUFF)
+$(MSWDIR)\tabctrl.obj: $(MSWDIR)\tabctrl.$(SRCSUFF)
 
-$(MSWDIR)\statbr95.obj:     $(MSWDIR)\statbr95.$(SRCSUFF)
+$(MSWDIR)\tbarmsw.obj: $(MSWDIR)\tbarmsw.$(SRCSUFF)
 
-$(MSWDIR)\stattext.obj:     $(MSWDIR)\stattext.$(SRCSUFF)
+$(MSWDIR)\textctrl.obj: $(MSWDIR)\textctrl.$(SRCSUFF)
 
-$(MSWDIR)\tabctrl.obj:     $(MSWDIR)\tabctrl.$(SRCSUFF)
+$(MSWDIR)\timer.obj: $(MSWDIR)\timer.$(SRCSUFF)
 
-$(MSWDIR)\taskbar.obj:     $(MSWDIR)\taskbar.$(SRCSUFF)
+$(MSWDIR)\utils.obj: $(MSWDIR)\utils.$(SRCSUFF)
 
-$(MSWDIR)\tbar95.obj:     $(MSWDIR)\tbar95.$(SRCSUFF)
+$(MSWDIR)\utilsexc.obj: $(MSWDIR)\utilsexc.$(SRCSUFF)
 
-$(MSWDIR)\tbarmsw.obj:     $(MSWDIR)\tbarmsw.$(SRCSUFF)
+$(MSWDIR)\wave.obj: $(MSWDIR)\wave.$(SRCSUFF)
 
-$(MSWDIR)\textctrl.obj:     $(MSWDIR)\textctrl.$(SRCSUFF)
+$(MSWDIR)\window.obj: $(MSWDIR)\window.$(SRCSUFF)
 
-$(MSWDIR)\thread.obj:     $(MSWDIR)\thread.$(SRCSUFF)
+$(MSWDIR)\xpmhand.obj: $(MSWDIR)\xpmhand.$(SRCSUFF)
 
-$(MSWDIR)\timer.obj:     $(MSWDIR)\timer.$(SRCSUFF)
 
-$(MSWDIR)\tooltip.obj:     $(MSWDIR)\tooltip.$(SRCSUFF)
-
-# $(MSWDIR)\treectrl.obj:     $(MSWDIR)\treectrl.$(SRCSUFF)
-
-$(MSWDIR)\utils.obj:     $(MSWDIR)\utils.$(SRCSUFF)
-
-$(MSWDIR)\utilsexc.obj:	$(MSWDIR)\utilsexc.$(SRCSUFF)
-
-$(MSWDIR)\wave.obj:     $(MSWDIR)\wave.$(SRCSUFF)
-
-$(MSWDIR)\window.obj:     $(MSWDIR)\window.$(SRCSUFF)
-
-$(MSWDIR)\droptgt.obj:     $(OLEDIR)\droptgt.$(SRCSUFF)
-
-$(MSWDIR)\dropsrc.obj:     $(OLEDIR)\dropsrc.$(SRCSUFF)
-
-$(MSWDIR)\dataobj.obj:     $(OLEDIR)\dataobj.$(SRCSUFF)
-
-$(MSWDIR)\oleutils.obj:     $(OLEDIR)\oleutils.$(SRCSUFF)
-
-$(MSWDIR)\uuid.obj:     $(OLEDIR)\uuid.$(SRCSUFF)
-
-$(MSWDIR)\automtn.obj:     $(OLEDIR)\automtn.$(SRCSUFF)
 
 ########################################################
 # Common objects (always compiled)
 
-$(MSWDIR)\config.obj:     $(COMMDIR)\config.$(SRCSUFF)
+$(MSWDIR)\cmndata.obj: $(COMMDIR)\cmndata.$(SRCSUFF)
 
-$(MSWDIR)\cmndata.obj:     $(COMMDIR)\cmndata.$(SRCSUFF)
+$(MSWDIR)\config.obj: $(COMMDIR)\config.$(SRCSUFF)
 
-$(MSWDIR)\dcbase.obj:     $(COMMDIR)\dcbase.$(SRCSUFF)
+$(MSWDIR)\date.obj: $(COMMDIR)\date.$(SRCSUFF)
 
-$(MSWDIR)\docview.obj:     $(COMMDIR)\docview.$(SRCSUFF)
+$(MSWDIR)\datstrm.obj: $(COMMDIR)\datstrm.$(SRCSUFF)
 
-$(MSWDIR)\docmdi.obj:     $(COMMDIR)\docmdi.$(SRCSUFF)
+$(MSWDIR)\db.obj: $(COMMDIR)\db.$(SRCSUFF)
 
-$(MSWDIR)\dynarray.obj:     $(COMMDIR)\dynarray.$(SRCSUFF)
+$(MSWDIR)\dbtable.obj: $(COMMDIR)\dbtable.$(SRCSUFF)
 
-$(MSWDIR)\dynlib.obj:   $(COMMDIR)\dynlib.$(SRCSUFF)
+$(MSWDIR)\dcbase.obj: $(COMMDIR)\dcbase.$(SRCSUFF)
 
-$(MSWDIR)\event.obj:     $(COMMDIR)\event.$(SRCSUFF)
+$(MSWDIR)\dlgcmn.obj: $(COMMDIR)\dlgcmn.$(SRCSUFF)
 
-$(MSWDIR)\file.obj:     $(COMMDIR)\file.$(SRCSUFF)
+$(MSWDIR)\docmdi.obj: $(COMMDIR)\docmdi.$(SRCSUFF)
 
-$(MSWDIR)\fileconf.obj:     $(COMMDIR)\fileconf.$(SRCSUFF)
+$(MSWDIR)\docview.obj: $(COMMDIR)\docview.$(SRCSUFF)
 
-$(MSWDIR)\filefn.obj:     $(COMMDIR)\filefn.$(SRCSUFF)
+$(MSWDIR)\dynarray.obj: $(COMMDIR)\dynarray.$(SRCSUFF)
 
-$(MSWDIR)\framecmn.obj:     $(COMMDIR)\framecmn.$(SRCSUFF)
+$(MSWDIR)\dynlib.obj: $(COMMDIR)\dynlib.$(SRCSUFF)
 
-$(MSWDIR)\gdicmn.obj:     $(COMMDIR)\gdicmn.$(SRCSUFF)
+$(MSWDIR)\event.obj: $(COMMDIR)\event.$(SRCSUFF)
 
-$(MSWDIR)\image.obj:     $(COMMDIR)\image.$(SRCSUFF)
+$(MSWDIR)\file.obj: $(COMMDIR)\file.$(SRCSUFF)
 
-$(MSWDIR)\intl.obj:     $(COMMDIR)\intl.$(SRCSUFF)
+$(MSWDIR)\fileconf.obj: $(COMMDIR)\fileconf.$(SRCSUFF)
 
-$(MSWDIR)\ipcbase.obj:     $(COMMDIR)\ipcbase.$(SRCSUFF)
+$(MSWDIR)\filefn.obj: $(COMMDIR)\filefn.$(SRCSUFF)
 
-$(MSWDIR)\helpbase.obj:     $(COMMDIR)\helpbase.$(SRCSUFF)
+$(MSWDIR)\filesys.obj: $(COMMDIR)\filesys.$(SRCSUFF)
 
-$(MSWDIR)\layout.obj:     $(COMMDIR)\layout.$(SRCSUFF)
+$(MSWDIR)\framecmn.obj: $(COMMDIR)\framecmn.$(SRCSUFF)
 
-$(MSWDIR)\log.obj:     $(COMMDIR)\log.$(SRCSUFF)
+$(MSWDIR)\fs_inet.obj: $(COMMDIR)\fs_inet.$(SRCSUFF)
 
-$(MSWDIR)\memory.obj:     $(COMMDIR)\memory.$(SRCSUFF)
+$(MSWDIR)\fs_zip.obj: $(COMMDIR)\fs_zip.$(SRCSUFF)
 
-$(MSWDIR)\mimetype.obj:     $(COMMDIR)\mimetype.$(SRCSUFF)
+$(MSWDIR)\gdicmn.obj: $(COMMDIR)\gdicmn.$(SRCSUFF)
 
-$(MSWDIR)\module.obj:     $(COMMDIR)\module.$(SRCSUFF)
+$(MSWDIR)\hash.obj: $(COMMDIR)\hash.$(SRCSUFF)
 
-$(MSWDIR)\object.obj:     $(COMMDIR)\object.$(SRCSUFF)
+$(MSWDIR)\helpbase.obj: $(COMMDIR)\helpbase.$(SRCSUFF)
 
-$(MSWDIR)\odbc.obj:     $(COMMDIR)\odbc.$(SRCSUFF)
+$(MSWDIR)\imagbmp.obj: $(COMMDIR)\imagbmp.$(SRCSUFF)
 
-$(MSWDIR)\prntbase.obj:     $(COMMDIR)\prntbase.$(SRCSUFF)
+$(MSWDIR)\image.obj: $(COMMDIR)\image.$(SRCSUFF)
 
-$(MSWDIR)\resource.obj:     $(COMMDIR)\resource.$(SRCSUFF)
+$(MSWDIR)\imaggif.obj: $(COMMDIR)\imaggif.$(SRCSUFF)
 
-$(MSWDIR)\resourc2.obj:     $(COMMDIR)\resourc2.$(SRCSUFF)
+$(MSWDIR)\imagjpeg.obj: $(COMMDIR)\imagjpeg.$(SRCSUFF)
 
-$(MSWDIR)\tbarbase.obj:     $(COMMDIR)\tbarbase.$(SRCSUFF)
+$(MSWDIR)\imagpng.obj: $(COMMDIR)\imagpng.$(SRCSUFF)
 
-$(MSWDIR)\tbarsmpl.obj:     $(COMMDIR)\tbarsmpl.$(SRCSUFF)
+$(MSWDIR)\intl.obj: $(COMMDIR)\intl.$(SRCSUFF)
 
-$(MSWDIR)\textfile.obj:     $(COMMDIR)\textfile.$(SRCSUFF)
+$(MSWDIR)\ipcbase.obj: $(COMMDIR)\ipcbase.$(SRCSUFF)
 
-$(MSWDIR)\timercmn.obj:     $(COMMDIR)\timercmn.$(SRCSUFF)
+$(MSWDIR)\layout.obj: $(COMMDIR)\layout.$(SRCSUFF)
 
-$(MSWDIR)\utilscmn.obj:     $(COMMDIR)\utilscmn.$(SRCSUFF)
+$(MSWDIR)\list.obj: $(COMMDIR)\list.$(SRCSUFF)
 
-$(MSWDIR)\validate.obj:     $(COMMDIR)\validate.$(SRCSUFF)
+$(MSWDIR)\log.obj: $(COMMDIR)\log.$(SRCSUFF)
 
-$(MSWDIR)\valgen.obj:     $(COMMDIR)\valgen.$(SRCSUFF)
+$(MSWDIR)\memory.obj: $(COMMDIR)\memory.$(SRCSUFF)
 
-$(MSWDIR)\valtext.obj:     $(COMMDIR)\valtext.$(SRCSUFF)
+$(MSWDIR)\module.obj: $(COMMDIR)\module.$(SRCSUFF)
 
-$(MSWDIR)\date.obj:     $(COMMDIR)\date.$(SRCSUFF)
+$(MSWDIR)\mstream.obj: $(COMMDIR)\mstream.$(SRCSUFF)
 
-$(MSWDIR)\wxexpr.obj:     $(COMMDIR)\wxexpr.$(SRCSUFF)
+$(MSWDIR)\object.obj: $(COMMDIR)\$(SRCSUFF)ect.obj
 
-$(MSWDIR)\hash.obj:     $(COMMDIR)\hash.$(SRCSUFF)
+$(MSWDIR)\objstrm.obj: $(COMMDIR)\$(SRCSUFF)strm.obj
 
-$(MSWDIR)\list.obj:     $(COMMDIR)\list.$(SRCSUFF)
+$(MSWDIR)\paper.obj: $(COMMDIR)\paper.$(SRCSUFF)
 
-$(MSWDIR)\paper.obj:     $(COMMDIR)\paper.$(SRCSUFF)
+$(MSWDIR)\prntbase.obj: $(COMMDIR)\prntbase.$(SRCSUFF)
 
-$(MSWDIR)\string.obj:     $(COMMDIR)\string.$(SRCSUFF)
+$(MSWDIR)\resource.obj: $(COMMDIR)\resource.$(SRCSUFF)
 
-$(MSWDIR)\variant.obj:     $(COMMDIR)\variant.$(SRCSUFF)
+$(MSWDIR)\stream.obj: $(COMMDIR)\stream.$(SRCSUFF)
 
-$(MSWDIR)\matrix.obj:     $(COMMDIR)\matrix.$(SRCSUFF)
+$(MSWDIR)\string.obj: $(COMMDIR)\string.$(SRCSUFF)
 
-$(MSWDIR)\time.obj:     $(COMMDIR)\time.$(SRCSUFF)
+$(MSWDIR)\tbarbase.obj: $(COMMDIR)\tbarbase.$(SRCSUFF)
 
-$(MSWDIR)\datstrm.obj:	$(COMMDIR)\datstrm.$(SRCSUFF)
+$(MSWDIR)\tbarsmpl.obj: $(COMMDIR)\tbarsmpl.$(SRCSUFF)
 
-$(MSWDIR)\sckstrm.obj:  $(COMMDIR)\sckstrm.$(SRCSUFF)
+$(MSWDIR)\textfile.obj: $(COMMDIR)\textfile.$(SRCSUFF)
 
-$(MSWDIR)\mstream.obj:	$(COMMDIR)\mstream.$(SRCSUFF)
+$(MSWDIR)\time.obj: $(COMMDIR)\time.$(SRCSUFF)
 
-$(MSWDIR)\zstream.obj:	$(COMMDIR)\zstream.$(SRCSUFF)
+$(MSWDIR)\timercmn.obj: $(COMMDIR)\timercmn.$(SRCSUFF)
 
-$(MSWDIR)\wfstream.obj:	$(COMMDIR)\wfstream.$(SRCSUFF)
+$(MSWDIR)\tokenzr.obj: $(COMMDIR)\tokenzr.$(SRCSUFF)
 
-$(MSWDIR)\stream.obj:	$(COMMDIR)\stream.$(SRCSUFF)
+$(MSWDIR)\txtstrm.obj: $(COMMDIR)\txtstrm.$(SRCSUFF)
 
-$(MSWDIR)\objstrm.obj:  $(COMMDIR)\objstrm.$(SRCSUFF)
+$(MSWDIR)\unzip.obj: $(COMMDIR)\unzip.$(SRCSUFF)
 
-$(MSWDIR)\dlgcmn.obj:	$(COMMDIR)\dlgcmn.$(SRCSUFF)
+$(MSWDIR)\utilscmn.obj: $(COMMDIR)\utilscmn.$(SRCSUFF)
 
-$(MSWDIR)\wincmn.obj:	$(COMMDIR)\wincmn.$(SRCSUFF)
+$(MSWDIR)\valgen.obj: $(COMMDIR)\valgen.$(SRCSUFF)
 
-$(MSWDIR)\extended.obj:	$(COMMDIR)\extended.c
+$(MSWDIR)\validate.obj: $(COMMDIR)\validate.$(SRCSUFF)
 
-$(MSWDIR)\tokenzr.obj:	$(COMMDIR)\tokenzr.$(SRCSUFF)
+$(MSWDIR)\valtext.obj: $(COMMDIR)\valtext.$(SRCSUFF)
 
-$(MSWDIR)\socket.obj:	$(COMMDIR)\socket.$(SRCSUFF)
+$(MSWDIR)\variant.obj: $(COMMDIR)\variant.$(SRCSUFF)
 
-$(MSWDIR)\sckaddr.obj:	$(COMMDIR)\sckaddr.$(SRCSUFF)
+$(MSWDIR)\wfstream.obj: $(COMMDIR)\wfstream.$(SRCSUFF)
 
-$(MSWDIR)\protocol.obj: $(COMMDIR)\protocol.$(SRCSUFF)
+$(MSWDIR)\wincmn.obj: $(COMMDIR)\wincmn.$(SRCSUFF)
 
-$(MSWDIR)\url.obj:	$(COMMDIR)\url.$(SRCSUFF)
+$(MSWDIR)\wxchar.obj: $(COMMDIR)\wxchar.$(SRCSUFF)
 
-$(MSWDIR)\http.obj:	$(COMMDIR)\http.$(SRCSUFF)
+$(MSWDIR)\wxexpr.obj: $(COMMDIR)\wxexpr.$(SRCSUFF)
 
-$(MSWDIR)\ftp.obj:	$(COMMDIR)\ftp.$(SRCSUFF)
+$(MSWDIR)\zipstream.obj: $(COMMDIR)\zipstream.$(SRCSUFF)
 
-$(MSWDIR)\sckfile.obj:	$(COMMDIR)\sckfile.$(SRCSUFF)
+$(MSWDIR)\zstream.obj: $(COMMDIR)\zstream.$(SRCSUFF)
+
+${MSWDIR}\resourc2.cpp: ${COMMDIR}\resourc2.cpp
 
-$(MSWDIR)\sckipc.obj:	$(COMMDIR)\sckipc.$(SRCSUFF)
 
-$(MSWDIR)\wxchar.obj:	$(COMMDIR)\wxchar.$(SRCSUFF)
 
 ########################################################
 # Generic objects (not always compiled, depending on
 # whether platforms have native implementations)
 
-$(MSWDIR)\choicdgg.obj:     $(GENDIR)\choicdgg.$(SRCSUFF)
+$(MSWDIR)\busyinfo.obj: $(GENDIR)\busyinfo.$(SRCSUFF)
 
-$(MSWDIR)\colrdlgg.obj:     $(GENDIR)\colrdlgg.$(SRCSUFF)
+$(MSWDIR)\choicdgg.obj: $(GENDIR)\choicdgg.$(SRCSUFF)
 
-$(MSWDIR)\fontdlgg.obj:     $(GENDIR)\fontdlgg.$(SRCSUFF)
+$(MSWDIR)\dirdlgg.obj: $(GENDIR)\dirdlgg.$(SRCSUFF)
 
-$(MSWDIR)\gridg.obj:     $(GENDIR)\gridg.$(SRCSUFF)
+$(MSWDIR)\extdlgg.obj: $(GENDIR)\extdlgg.$(SRCSUFF)
 
-$(MSWDIR)\helpxlp.obj:     $(GENDIR)\helpxlp.$(SRCSUFF)
+$(MSWDIR)\gridg.obj: $(GENDIR)\gridg.$(SRCSUFF)
 
-$(MSWDIR)\laywin.obj:     $(GENDIR)\laywin.$(SRCSUFF)
+$(MSWDIR)\imaglist.obj: $(GENDIR)\imaglist.$(SRCSUFF)
 
-$(MSWDIR)\msgdlgg.obj:     $(GENDIR)\msgdlgg.$(SRCSUFF)
+$(MSWDIR)\laywin.obj: $(GENDIR)\laywin.$(SRCSUFF)
 
-$(MSWDIR)\panelg.obj:     $(GENDIR)\panelg.$(SRCSUFF)
+$(MSWDIR)\listctrl.obj: $(GENDIR)\listctrl.$(SRCSUFF)
 
-$(MSWDIR)\printps.obj:     $(GENDIR)\printps.$(SRCSUFF)
+$(MSWDIR)\notebook.obj: $(GENDIR)\notebook.$(SRCSUFF)
 
-$(MSWDIR)\prntdlgg.obj:     $(GENDIR)\prntdlgg.$(SRCSUFF)
+$(MSWDIR)\panelg.obj: $(GENDIR)\panelg.$(SRCSUFF)
 
-$(MSWDIR)\progdlgg.obj:     $(GENDIR)\progdlgg.$(SRCSUFF)
+$(MSWDIR)\progdlgg.obj: $(GENDIR)\progdlgg.$(SRCSUFF)
 
-$(MSWDIR)\prop.obj:     $(GENDIR)\prop.$(SRCSUFF)
+$(MSWDIR)\prop.obj: $(GENDIR)\prop.$(SRCSUFF)
 
-$(MSWDIR)\proplist.obj:     $(GENDIR)\proplist.$(SRCSUFF)
+$(MSWDIR)\propform.obj: $(GENDIR)\propform.$(SRCSUFF)
 
-$(MSWDIR)\propform.obj:     $(GENDIR)\propform.$(SRCSUFF)
+$(MSWDIR)\proplist.obj: $(GENDIR)\proplist.$(SRCSUFF)
 
-$(MSWDIR)\sashwin.obj:     $(GENDIR)\sashwin.$(SRCSUFF)
+$(MSWDIR)\sashwin.obj: $(GENDIR)\sashwin.$(SRCSUFF)
 
-$(MSWDIR)\scrolwin.obj:     $(GENDIR)\scrolwin.$(SRCSUFF)
+$(MSWDIR)\scrolwin.obj: $(GENDIR)\scrolwin.$(SRCSUFF)
 
-$(MSWDIR)\splitter.obj:     $(GENDIR)\splitter.$(SRCSUFF)
+$(MSWDIR)\splitter.obj: $(GENDIR)\splitter.$(SRCSUFF)
 
-$(MSWDIR)\statusbr.obj:     $(GENDIR)\statusbr.$(SRCSUFF)
+$(MSWDIR)\statusbr.obj: $(GENDIR)\statusbr.$(SRCSUFF)
 
-$(MSWDIR)\textdlgg.obj:     $(GENDIR)\textdlgg.$(SRCSUFF)
+$(MSWDIR)\tabg.obj: $(GENDIR)\tabg.$(SRCSUFF)
 
-$(MSWDIR)\tipdlg.obj:     $(GENDIR)\tipdlg.$(SRCSUFF)
+$(MSWDIR)\textdlgg.obj: $(GENDIR)\textdlgg.$(SRCSUFF)
 
-$(MSWDIR)\tabg.obj:     $(GENDIR)\tabg.$(SRCSUFF)
+$(MSWDIR)\tipdlg.obj: $(GENDIR)\tipdlg.$(SRCSUFF)
 
-$(MSWDIR)\treectrl.obj:     $(GENDIR)\treectrl.$(SRCSUFF)
+$(MSWDIR)\treectrl.obj: $(GENDIR)\treectrl.$(SRCSUFF)
 
-$(MSWDIR)\listctrl.obj:     $(GENDIR)\listctrl.$(SRCSUFF)
 
-$(MSWDIR)\imaglist.obj:     $(GENDIR)\imaglist.$(SRCSUFF)
-
-$(MSWDIR)\notebook.obj:     $(GENDIR)\notebook.$(SRCSUFF)
 
 all_utils:
     cd $(WXDIR)\utils
diff --git a/src/msw/makefile.dos b/src/msw/makefile.dos
index a9a3678b9d..4b3c8e0350 100644
--- a/src/msw/makefile.dos
+++ b/src/msw/makefile.dos
@@ -1,9 +1,16 @@
+
+
+
+
+# This file was automatically generated by tmake at 21:00, 1999/07/14
+# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE DOS.T!
+
 #
-# File:		makefile.dos
-# Author:	Julian Smart
-# Created:	1997
-# Updated:	
-# Copyright:	(c) 1997, Julian Smart
+# File:     makefile.dos
+# Author:   Julian Smart
+# Created:  1997
+# Updated:
+# Copyright:(c) 1997, Julian Smart
 #
 # "%W% %G%"
 #
@@ -54,198 +61,192 @@ COMMDIR=..\common
 OLEDIR=.\ole
 MSWDIR=.
 
-GENERICOBJS= \
-  $(GENDIR)\choicdgg.obj \
-  $(GENDIR)\dirdlgg.obj \
-  $(GENDIR)\gridg.obj \
-  $(GENDIR)\imaglist.obj \
-  $(GENDIR)\listctrl.obj \
-  $(GENDIR)\notebook.obj \
-  $(GENDIR)\panelg.obj \
-  $(GENDIR)\progdlgg.obj \
-  $(GENDIR)\prop.obj \
-  $(GENDIR)\propform.obj \
-  $(GENDIR)\proplist.obj \
-  $(GENDIR)\scrolwin.obj \
-  $(GENDIR)\splitter.obj \
-  $(GENDIR)\statusbr.obj \
-  $(GENDIR)\tabg.obj \
-  $(GENDIR)\textdlgg.obj\
-  $(GENDIR)\tipdlg.obj\
-  $(GENDIR)\prntdlgg.obj \
-  $(GENDIR)\treectrl.obj
+GENERICOBJS= $(GENDIR)\busyinfo.obj \
+		$(GENDIR)\choicdgg.obj \
+		$(GENDIR)\dirdlgg.obj \
+		$(GENDIR)\extdlgg.obj \
+		$(GENDIR)\gridg.obj \
+		$(GENDIR)\imaglist.obj \
+		$(GENDIR)\laywin.obj \
+		$(GENDIR)\listctrl.obj \
+		$(GENDIR)\notebook.obj \
+		$(GENDIR)\panelg.obj \
+		$(GENDIR)\prntdlgg.obj \
+		$(GENDIR)\progdlgg.obj \
+		$(GENDIR)\prop.obj \
+		$(GENDIR)\propform.obj \
+		$(GENDIR)\proplist.obj \
+		$(GENDIR)\sashwin.obj \
+		$(GENDIR)\scrolwin.obj \
+		$(GENDIR)\splitter.obj \
+		$(GENDIR)\statusbr.obj \
+		$(GENDIR)\tabg.obj \
+		$(GENDIR)\textdlgg.obj \
+		$(GENDIR)\tipdlg.obj \
+		$(GENDIR)\treectrl.obj
 
-# Don't need these generic objects for Windows
-#  $(GENDIR)\msgdlgg.obj \
-#  $(GENDIR)\fontdlgg.obj \
-#  $(GENDIR)\colrdlgg.obj \
-#  $(GENDIR)\printps.obj \
-# $(GENDIR)\helpxlp.obj \
- 
 COMMONOBJS = \
-  $(COMMDIR)\config.obj \
-  $(COMMDIR)\cmndata.obj \
-  $(COMMDIR)\dcbase.obj \
-  $(COMMDIR)\docview.obj \
-  $(COMMDIR)\docmdi.obj \
-  $(COMMDIR)\dynarray.obj \
-  $(COMMDIR)\event.obj \
-  $(COMMDIR)\file.obj \
-  $(COMMDIR)\filefn.obj \
-  $(COMMDIR)\framecmn.obj \
-  $(COMMDIR)\gdicmn.obj \
-  $(COMMDIR)\intl.obj \
-  $(COMMDIR)\helpbase.obj \
-  $(COMMDIR)\ipcbase.obj \
-  $(COMMDIR)\layout.obj \
-  $(COMMDIR)\log.obj \
-  $(COMMDIR)\memory.obj \
-  $(COMMDIR)\module.obj \
-  $(COMMDIR)\object.obj \
-  $(COMMDIR)\odbc.obj \
-  $(COMMDIR)\process.obj \
-  $(COMMDIR)\prntbase.obj \
-  $(COMMDIR)\resource.obj \
-  $(COMMDIR)\tbarbase.obj \
-  $(COMMDIR)\tbarsmpl.obj \
-  $(COMMDIR)\textfile.obj \
-  $(COMMDIR)\timercmn.obj \
-  $(COMMDIR)\utilscmn.obj \
-  $(COMMDIR)\validate.obj \
-  $(COMMDIR)\valgen.obj \
-  $(COMMDIR)\valtext.obj \
-  $(COMMDIR)\date.obj \
-  $(COMMDIR)\wxexpr.obj \
-  $(COMMDIR)\hash.obj \
-  $(COMMDIR)\list.obj \
-  $(COMMDIR)\variant.obj \
-  $(COMMDIR)\paper.obj \
-  $(COMMDIR)\string.obj \
-  $(COMMDIR)\time.obj \
-  $(COMMDIR)\y_tab.obj \
-  $(COMMDIR)\stream.obj \
-  $(COMMDIR)\wfstream.obj \
-  $(COMMDIR)\mstream.obj \
-  $(COMMDIR)\zstream.obj \
-  $(COMMDIR)\datstrm.obj \
-  $(COMMDIR)\extended.obj \
-  $(COMMDIR)\dlgcmn.obj \
-  $(COMMDIR)\wincmn.obj \
-  $(COMMDIR)\wxchar.obj
+		$(COMMDIR)\y_tab.obj \
+		$(COMMDIR)\extended.obj \
+		$(COMMDIR)\cmndata.obj \
+		$(COMMDIR)\config.obj \
+		$(COMMDIR)\date.obj \
+		$(COMMDIR)\datstrm.obj \
+		$(COMMDIR)\db.obj \
+		$(COMMDIR)\dbtable.obj \
+		$(COMMDIR)\dcbase.obj \
+		$(COMMDIR)\dlgcmn.obj \
+		$(COMMDIR)\docmdi.obj \
+		$(COMMDIR)\docview.obj \
+		$(COMMDIR)\dynarray.obj \
+		$(COMMDIR)\dynlib.obj \
+		$(COMMDIR)\event.obj \
+		$(COMMDIR)\file.obj \
+		$(COMMDIR)\fileconf.obj \
+		$(COMMDIR)\filefn.obj \
+		$(COMMDIR)\filesys.obj \
+		$(COMMDIR)\framecmn.obj \
+		$(COMMDIR)\fs_inet.obj \
+		$(COMMDIR)\fs_zip.obj \
+		$(COMMDIR)\gdicmn.obj \
+		$(COMMDIR)\hash.obj \
+		$(COMMDIR)\helpbase.obj \
+		$(COMMDIR)\imagbmp.obj \
+		$(COMMDIR)\image.obj \
+		$(COMMDIR)\imaggif.obj \
+		$(COMMDIR)\imagjpeg.obj \
+		$(COMMDIR)\imagpng.obj \
+		$(COMMDIR)\intl.obj \
+		$(COMMDIR)\ipcbase.obj \
+		$(COMMDIR)\layout.obj \
+		$(COMMDIR)\list.obj \
+		$(COMMDIR)\log.obj \
+		$(COMMDIR)\memory.obj \
+		$(COMMDIR)\module.obj \
+		$(COMMDIR)\mstream.obj \
+		$(COMMDIR)\object.obj \
+		$(COMMDIR)\objstrm.obj \
+		$(COMMDIR)\odbc.obj \
+		$(COMMDIR)\paper.obj \
+		$(COMMDIR)\prntbase.obj \
+		$(COMMDIR)\resource.obj \
+		$(COMMDIR)\stream.obj \
+		$(COMMDIR)\string.obj \
+		$(COMMDIR)\tbarbase.obj \
+		$(COMMDIR)\tbarsmpl.obj \
+		$(COMMDIR)\textfile.obj \
+		$(COMMDIR)\time.obj \
+		$(COMMDIR)\timercmn.obj \
+		$(COMMDIR)\tokenzr.obj \
+		$(COMMDIR)\txtstrm.obj \
+		$(COMMDIR)\unzip.obj \
+		$(COMMDIR)\utilscmn.obj \
+		$(COMMDIR)\valgen.obj \
+		$(COMMDIR)\validate.obj \
+		$(COMMDIR)\valtext.obj \
+		$(COMMDIR)\variant.obj \
+		$(COMMDIR)\wfstream.obj \
+		$(COMMDIR)\wincmn.obj \
+		$(COMMDIR)\wxchar.obj \
+		$(COMMDIR)\wxexpr.obj \
+		$(COMMDIR)\zipstream.obj \
+		$(COMMDIR)\zstream.obj
 
-# Doesn't compile (nested classes)
-# $(COMMDIR)\fileconf.obj\
-
-# Uses WIN32 registry functions
-#  $(COMMDIR)\mimetype.obj \
-
-# Fails when including png.h, on jmp_buf.
-#  $(COMMDIR)\image.obj \
-
-MSWOBJS = \
-  $(MSWDIR)\accel.obj \
-  $(MSWDIR)\app.obj \
-  $(MSWDIR)\bitmap.obj \
-  $(MSWDIR)\bmpbuttn.obj \
-  $(MSWDIR)\brush.obj \
-  $(MSWDIR)\button.obj \
-  $(MSWDIR)\checkbox.obj \
-  $(MSWDIR)\checklst.obj \
-  $(MSWDIR)\caret.obj \
-  $(MSWDIR)\choice.obj \
-  $(MSWDIR)\clipbrd.obj \
-  $(MSWDIR)\colordlg.obj \
-  $(MSWDIR)\colour.obj \
-  $(MSWDIR)\combobox.obj \
-  $(MSWDIR)\control.obj \
-  $(MSWDIR)\curico.obj \
-  $(MSWDIR)\cursor.obj \
-  $(MSWDIR)\data.obj \
-  $(MSWDIR)\dc.obj \
-  $(MSWDIR)\dcmemory.obj \
-  $(MSWDIR)\dcclient.obj \
-  $(MSWDIR)\dcprint.obj \
-  $(MSWDIR)\dcscreen.obj \
-  $(MSWDIR)\dde.obj \
-  $(MSWDIR)\dialog.obj \
-  $(MSWDIR)\dib.obj \
-  $(MSWDIR)\filedlg.obj \
-  $(MSWDIR)\font.obj \
-  $(MSWDIR)\fontdlg.obj \
-  $(MSWDIR)\frame.obj \
-  $(MSWDIR)\gaugemsw.obj \
-  $(MSWDIR)\gdiobj.obj \
-  $(MSWDIR)\helpwin.obj \
-  $(MSWDIR)\icon.obj \
-  $(MSWDIR)\iniconf.obj\
-  $(MSWDIR)\joystick.obj \
-  $(MSWDIR)\listbox.obj \
-  $(MSWDIR)\main.obj \
-  $(MSWDIR)\mdi.obj \
-  $(MSWDIR)\menu.obj\
-  $(MSWDIR)\menuitem.obj \
-  $(MSWDIR)\metafile.obj \
-  $(MSWDIR)\minifram.obj \
-  $(MSWDIR)\msgdlg.obj \
-  $(MSWDIR)\nativdlg.obj \
-  $(MSWDIR)\ownerdrw.obj \
-  $(MSWDIR)\palette.obj \
-  $(MSWDIR)\pen.obj \
-  $(MSWDIR)\penwin.obj \
-  $(MSWDIR)\printdlg.obj \
-  $(MSWDIR)\printwin.obj \
-  $(MSWDIR)\radiobox.obj \
-  $(MSWDIR)\radiobut.obj \
-  $(MSWDIR)\region.obj \
-  $(MSWDIR)\scrolbar.obj \
-  $(MSWDIR)\settings.obj \
-  $(MSWDIR)\slidrmsw.obj \
-  $(MSWDIR)\spinbutt.obj \
-  $(MSWDIR)\statbmp.obj \
-  $(MSWDIR)\statbox.obj \
-  $(MSWDIR)\statline.obj \
-  $(MSWDIR)\stattext.obj \
-  $(MSWDIR)\tbarmsw.obj \
-  $(MSWDIR)\textctrl.obj \
-  $(MSWDIR)\timer.obj \
-  $(MSWDIR)\utils.obj \
-  $(MSWDIR)\utilsexc.obj \
-  $(MSWDIR)\wave.obj \
-  $(MSWDIR)\window.obj \
-  $(OLEDIR)\dropsrc.obj \
-  $(OLEDIR)\droptgt.obj
-
-#  $(OLEDIR)\automtn.obj \
-#  $(OLEDIR)\dataobj.obj \
-#  $(OLEDIR)\oleutils.obj \
-#  $(OLEDIR)\uuid.obj
-#  $(MSWDIR)\tooltip.obj \
+MSWOBJS = $(MSWDIR)\accel.obj \
+		$(MSWDIR)\app.obj \
+		$(MSWDIR)\bitmap.obj \
+		$(MSWDIR)\bmpbuttn.obj \
+		$(MSWDIR)\brush.obj \
+		$(MSWDIR)\button.obj \
+		$(MSWDIR)\caret.obj \
+		$(MSWDIR)\checkbox.obj \
+		$(MSWDIR)\checklst.obj \
+		$(MSWDIR)\choice.obj \
+		$(MSWDIR)\clipbrd.obj \
+		$(MSWDIR)\colordlg.obj \
+		$(MSWDIR)\colour.obj \
+		$(MSWDIR)\combobox.obj \
+		$(MSWDIR)\control.obj \
+		$(MSWDIR)\curico.obj \
+		$(MSWDIR)\cursor.obj \
+		$(MSWDIR)\data.obj \
+		$(MSWDIR)\dc.obj \
+		$(MSWDIR)\dcclient.obj \
+		$(MSWDIR)\dcmemory.obj \
+		$(MSWDIR)\dcprint.obj \
+		$(MSWDIR)\dcscreen.obj \
+		$(MSWDIR)\dde.obj \
+		$(MSWDIR)\dialog.obj \
+		$(MSWDIR)\dib.obj \
+		$(MSWDIR)\dibutils.obj \
+		$(MSWDIR)\dragimag.obj \
+		$(MSWDIR)\filedlg.obj \
+		$(MSWDIR)\font.obj \
+		$(MSWDIR)\fontdlg.obj \
+		$(MSWDIR)\frame.obj \
+		$(MSWDIR)\gaugemsw.obj \
+		$(MSWDIR)\gdiobj.obj \
+		$(MSWDIR)\helpwin.obj \
+		$(MSWDIR)\icon.obj \
+		$(MSWDIR)\iniconf.obj \
+		$(MSWDIR)\joystick.obj \
+		$(MSWDIR)\listbox.obj \
+		$(MSWDIR)\main.obj \
+		$(MSWDIR)\mdi.obj \
+		$(MSWDIR)\menu.obj \
+		$(MSWDIR)\menuitem.obj \
+		$(MSWDIR)\metafile.obj \
+		$(MSWDIR)\minifram.obj \
+		$(MSWDIR)\msgdlg.obj \
+		$(MSWDIR)\nativdlg.obj \
+		$(MSWDIR)\notebook.obj \
+		$(MSWDIR)\ownerdrw.obj \
+		$(MSWDIR)\palette.obj \
+		$(MSWDIR)\pen.obj \
+		$(MSWDIR)\penwin.obj \
+		$(MSWDIR)\pnghand.obj \
+		$(MSWDIR)\printdlg.obj \
+		$(MSWDIR)\printwin.obj \
+		$(MSWDIR)\radiobox.obj \
+		$(MSWDIR)\radiobut.obj \
+		$(MSWDIR)\region.obj \
+		$(MSWDIR)\scrolbar.obj \
+		$(MSWDIR)\settings.obj \
+		$(MSWDIR)\slidrmsw.obj \
+		$(MSWDIR)\spinbutt.obj \
+		$(MSWDIR)\statbmp.obj \
+		$(MSWDIR)\statbox.obj \
+		$(MSWDIR)\statline.obj \
+		$(MSWDIR)\stattext.obj \
+		$(MSWDIR)\tabctrl.obj \
+		$(MSWDIR)\tbarmsw.obj \
+		$(MSWDIR)\textctrl.obj \
+		$(MSWDIR)\timer.obj \
+		$(MSWDIR)\utils.obj \
+		$(MSWDIR)\utilsexc.obj \
+		$(MSWDIR)\wave.obj \
+		$(MSWDIR)\window.obj \
+		$(MSWDIR)\xpmhand.obj
 
 # TODO: Implement XPM and PNG targets in this makefile!
 #  $(OLEDIR)\xpmhand \
 #  $(OLEDIR)\pnghand \
 
-# Not appropriate for 16-bit Windows
-#  $(MSWDIR)\registry.obj \
-#  $(MSWDIR)\dirdlg.obj \
-#  $(MSWDIR)\treectrl.obj \
-#  $(MSWDIR)\listctrl.obj \
-
 OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS)
 
 # Normal, static library
 all:    $(DUMMYOBJ) $(WXDIR)\lib\wx1.lib $(WXDIR)\lib\wx2.lib $(WXDIR)\lib\wx3.lib
 
 
-#$(WXDIR)\lib\wx.lib:      dummy.obj $(OBJECTS) $(PERIPH_LIBS)
-#	-erase $(LIBTARGET)
-#	lib /PAGESIZE:128 @<<
-#$(LIBTARGET)
-#y
-#$(OBJECTS) $(PERIPH_LIBS)
-#nul
-#;
-#<<
+# $(WXDIR)\lib\wx.lib:      dummy.obj $(OBJECTS) $(PERIPH_LIBS)
+# 	-erase $(LIBTARGET)
+# 	lib /PAGESIZE:128 @<<
+# $(LIBTARGET)
+# y
+# $(OBJECTS) $(PERIPH_LIBS)
+# nul
+# ;
+# <<
 
 $(WXDIR)\lib\wx1.lib:      $(COMMONOBJS) $(PERIPH_LIBS)
 	-erase $(WXDIR)\lib\wx1.lib
@@ -328,11 +329,6 @@ $(MSWDIR)/caret.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
-$(MSWDIR)/choice.obj:     $*.$(SRCSUFF)
-        cl @<<
-$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
-<<
-
 $(MSWDIR)/checkbox.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
@@ -343,6 +339,11 @@ $(MSWDIR)/checklst.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+$(MSWDIR)/choice.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(MSWDIR)/clipbrd.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
@@ -388,7 +389,7 @@ $(MSWDIR)/dc.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
-$(MSWDIR)/dde.obj:     $*.$(SRCSUFF)
+$(MSWDIR)/dcclient.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
@@ -398,11 +399,6 @@ $(MSWDIR)/dcmemory.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
-$(MSWDIR)/dcclient.obj:     $*.$(SRCSUFF)
-        cl @<<
-$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
-<<
-
 $(MSWDIR)/dcprint.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
@@ -413,6 +409,11 @@ $(MSWDIR)/dcscreen.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+$(MSWDIR)/dde.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(MSWDIR)/dialog.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
@@ -423,7 +424,12 @@ $(MSWDIR)/dib.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
-$(MSWDIR)/dirdlg.obj:     $*.$(SRCSUFF)
+$(MSWDIR)/dibutils.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
+$(MSWDIR)/dragimag.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
@@ -473,11 +479,6 @@ $(MSWDIR)/iniconf.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
-$(MSWDIR)/imaglist.obj:     $*.$(SRCSUFF)
-        cl @<<
-$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
-<<
-
 $(MSWDIR)/joystick.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
@@ -488,11 +489,6 @@ $(MSWDIR)/listbox.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
-$(MSWDIR)/listctrl.obj:     $*.$(SRCSUFF)
-        cl @<<
-$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
-<<
-
 $(MSWDIR)/main.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
@@ -533,6 +529,11 @@ $(MSWDIR)/nativdlg.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+$(MSWDIR)/notebook.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(MSWDIR)/ownerdrw.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
@@ -553,6 +554,11 @@ $(MSWDIR)/penwin.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+$(MSWDIR)/pnghand.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(MSWDIR)/printdlg.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
@@ -578,11 +584,6 @@ $(MSWDIR)/region.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
-$(MSWDIR)/registry.obj:     $*.$(SRCSUFF)
-        cl @<<
-$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
-<<
-
 $(MSWDIR)/scrolbar.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
@@ -623,6 +624,11 @@ $(MSWDIR)/stattext.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+$(MSWDIR)/tabctrl.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(MSWDIR)/tbarmsw.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
@@ -638,16 +644,6 @@ $(MSWDIR)/timer.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
-$(MSWDIR)/tooltip.obj:     $*.$(SRCSUFF)
-        cl @<<
-$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
-<<
-
-$(MSWDIR)/treectrl.obj:     $*.$(SRCSUFF)
-        cl @<<
-$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
-<<
-
 $(MSWDIR)/utils.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
@@ -668,40 +664,7 @@ $(MSWDIR)/window.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
-$(OLEDIR)/droptgt.obj:     $*.$(SRCSUFF)
-        cl @<<
-$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
-<<
-
-$(OLEDIR)/dropsrc.obj:     $*.$(SRCSUFF)
-        cl @<<
-$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
-<<
-
-$(OLEDIR)/dataobj.obj:     $*.$(SRCSUFF)
-        cl @<<
-$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
-<<
-
-$(OLEDIR)/oleutils.obj:     $*.$(SRCSUFF)
-        cl @<<
-$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
-<<
-
-$(OLEDIR)/uuid.obj:     $*.$(SRCSUFF)
-        cl @<<
-$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
-<<
-
-$(OLEDIR)/automtn.obj:     $*.$(SRCSUFF)
-        cl @<<
-$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
-<<
-
-########################################################
-# Common objects (always compiled)
-
-$(COMMDIR)/config.obj:     $*.$(SRCSUFF)
+$(MSWDIR)/xpmhand.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
@@ -711,12 +674,37 @@ $(COMMDIR)/cmndata.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+$(COMMDIR)/config.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
+$(COMMDIR)/date.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
+$(COMMDIR)/datstrm.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
+$(COMMDIR)/db.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
+$(COMMDIR)/dbtable.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(COMMDIR)/dcbase.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
-$(COMMDIR)/docview.obj:     $*.$(SRCSUFF)
+$(COMMDIR)/dlgcmn.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
@@ -726,11 +714,21 @@ $(COMMDIR)/docmdi.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+$(COMMDIR)/docview.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(COMMDIR)/dynarray.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+$(COMMDIR)/dynlib.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(COMMDIR)/event.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
@@ -751,26 +749,66 @@ $(COMMDIR)/filefn.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+$(COMMDIR)/filesys.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(COMMDIR)/framecmn.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+$(COMMDIR)/fs_inet.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
+$(COMMDIR)/fs_zip.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(COMMDIR)/gdicmn.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+$(COMMDIR)/hash.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(COMMDIR)/helpbase.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+$(COMMDIR)/imagbmp.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(COMMDIR)/image.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+$(COMMDIR)/imaggif.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
+$(COMMDIR)/imagjpeg.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
+$(COMMDIR)/imagpng.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(COMMDIR)/intl.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
@@ -786,6 +824,11 @@ $(COMMDIR)/layout.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+$(COMMDIR)/list.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(COMMDIR)/log.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
@@ -796,12 +839,12 @@ $(COMMDIR)/memory.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
-$(COMMDIR)/mimetype.obj:     $*.$(SRCSUFF)
+$(COMMDIR)/module.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
-$(COMMDIR)/module.obj:     $*.$(SRCSUFF)
+$(COMMDIR)/mstream.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
@@ -811,12 +854,17 @@ $(COMMDIR)/object.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+$(COMMDIR)/objstrm.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(COMMDIR)/odbc.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
-$(COMMDIR)/process.obj:     $*.$(SRCSUFF)
+$(COMMDIR)/paper.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
@@ -831,6 +879,16 @@ $(COMMDIR)/resource.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+$(COMMDIR)/stream.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
+$(COMMDIR)/string.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(COMMDIR)/tbarbase.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
@@ -846,22 +904,42 @@ $(COMMDIR)/textfile.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+$(COMMDIR)/time.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(COMMDIR)/timercmn.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+$(COMMDIR)/tokenzr.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
+$(COMMDIR)/txtstrm.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
+$(COMMDIR)/unzip.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(COMMDIR)/utilscmn.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
-$(COMMDIR)/validate.obj:     $*.$(SRCSUFF)
+$(COMMDIR)/valgen.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
-$(COMMDIR)/valgen.obj:     $*.$(SRCSUFF)
+$(COMMDIR)/validate.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
@@ -871,96 +949,16 @@ $(COMMDIR)/valtext.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
-$(COMMDIR)/date.obj:     $*.$(SRCSUFF)
-        cl @<<
-$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
-<<
-
-$(COMMDIR)/wxexpr.obj:     $*.$(SRCSUFF)
-        cl @<<
-$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
-<<
-
-$(COMMDIR)/hash.obj:     $*.$(SRCSUFF)
-        cl @<<
-$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
-<<
-
-$(COMMDIR)/list.obj:     $*.$(SRCSUFF)
-        cl @<<
-$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
-<<
-
 $(COMMDIR)/variant.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
-$(COMMDIR)/paper.obj:     $*.$(SRCSUFF)
-        cl @<<
-$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
-<<
-
-$(COMMDIR)/string.obj:     $*.$(SRCSUFF)
-        cl @<<
-$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
-<<
-
-$(COMMDIR)/matrix.obj:     $*.$(SRCSUFF)
-        cl @<<
-$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
-<<
-
-$(COMMDIR)/wxstrgnu/wxstrgnu.obj:     $*.$(SRCSUFF)
-        cl @<<
-$(CPPFLAGS2) /Fo$@ /c /Tp $*.$(SRCSUFF)
-<<
-
-$(COMMDIR)/wxstrgnu/wxregex.obj:     $*.$(SRCSUFF)
-        cl @<<
-$(CPPFLAGS2) /Fo$@ /c /Tp $*.$(SRCSUFF)
-<<
-
-$(COMMDIR)/time.obj:     $*.$(SRCSUFF)
-        cl @<<
-$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
-<<
-
-$(COMMDIR)/stream.obj:     $*.$(SRCSUFF)
-        cl @<<
-$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
-<<
-
 $(COMMDIR)/wfstream.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
-$(COMMDIR)/mstream.obj:     $*.$(SRCSUFF)
-        cl @<<
-$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
-<<
-
-$(COMMDIR)/zstream.obj:     $*.$(SRCSUFF)
-        cl @<<
-$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
-<<
-
-$(COMMDIR)/datstrm.obj:     $*.$(SRCSUFF)
-        cl @<<
-$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
-<<
-
-$(COMMDIR)/extended.obj:     $*.c
-        cl @<<
-$(CPPFLAGS2) /Fo$@ /c /Tp $*.c
-<<
-
-$(COMMDIR)/dlgcmn.obj:     $*.$(SRCSUFF)
-        cl @<<
-$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
-<<
-
 $(COMMDIR)/wincmn.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
@@ -971,27 +969,27 @@ $(COMMDIR)/wxchar.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
-$(COMMDIR)/y_tab.obj:     $*.c $(COMMDIR)/lex_yy.c
-        cl @<<
-$(CPPFLAGS2) -DUSE_DEFINE -DYY_USE_PROTOS /Fo$@ /I ..\common /c $*.c
-<<
-
-$(COMMDIR)/y_tab.c:     $(COMMDIR)/dosyacc.c
-        copy $(COMMDIR)\dosyacc.c $(COMMDIR)\y_tab.c
-
-$(COMMDIR)/lex_yy.c:    $(COMMDIR)/doslex.c
-    copy $(COMMDIR)\doslex.c $(COMMDIR)\lex_yy.c
-
-########################################################
-# Generic objects (not always compiled, depending on
-# whether platforms have native implementations)
-
-$(GENDIR)/choicdgg.obj:     $*.$(SRCSUFF)
+$(COMMDIR)/wxexpr.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
-$(GENDIR)/colrdlgg.obj:     $*.$(SRCSUFF)
+$(COMMDIR)/zipstream.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
+$(COMMDIR)/zstream.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
+$(GENDIR)/busyinfo.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
+$(GENDIR)/choicdgg.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
@@ -1001,7 +999,7 @@ $(GENDIR)/dirdlgg.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
-$(GENDIR)/fontdlgg.obj:     $*.$(SRCSUFF)
+$(GENDIR)/extdlgg.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
@@ -1016,6 +1014,11 @@ $(GENDIR)/imaglist.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+$(GENDIR)/laywin.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(GENDIR)/listctrl.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
@@ -1026,26 +1029,11 @@ $(GENDIR)/notebook.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
-$(GENDIR)/helpxlp.obj:     $*.$(SRCSUFF)
-        cl @<<
-$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
-<<
-
-$(GENDIR)/msgdlgg.obj:     $*.$(SRCSUFF)
-        cl @<<
-$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
-<<
-
 $(GENDIR)/panelg.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
-$(GENDIR)/printps.obj:     $*.$(SRCSUFF)
-        cl @<<
-$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
-<<
-
 $(GENDIR)/prntdlgg.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
@@ -1071,6 +1059,11 @@ $(GENDIR)/proplist.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+$(GENDIR)/sashwin.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(GENDIR)/scrolwin.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
@@ -1106,6 +1099,24 @@ $(GENDIR)/treectrl.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+
+
+$(COMMDIR)/extended.obj:     $*.c
+        cl @<<
+$(CPPFLAGS2) /Fo$@ /c /Tp $*.c
+<<
+
+$(COMMDIR)/y_tab.obj:     $*.c $(COMMDIR)/lex_yy.c
+        cl @<<
+$(CPPFLAGS2) -DUSE_DEFINE -DYY_USE_PROTOS /Fo$@ /I ..\common /c $*.c
+<<
+
+$(COMMDIR)/y_tab.c:     $(COMMDIR)/dosyacc.c
+        copy $(COMMDIR)\dosyacc.c $(COMMDIR)\y_tab.c
+
+$(COMMDIR)/lex_yy.c:    $(COMMDIR)/doslex.c
+    copy $(COMMDIR)\doslex.c $(COMMDIR)\lex_yy.c
+
 $(OBJECTS):	$(WXDIR)/include/wx/setup.h
 
 # Peripheral components
diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95
index bf92a7eccb..2e90ee0a37 100644
--- a/src/msw/makefile.g95
+++ b/src/msw/makefile.g95
@@ -1,11 +1,18 @@
+
+
+
+
+# This file was automatically generated by tmake at 21:00, 1999/07/14
+# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T!
+
 #
-# File:		makefile.unx
-# Author:	Julian Smart
-# Created:	1993
-# Updated:	
-# Copyright:	(c) 1993, AIAI, University of Edinburgh
+# File:     makefile.unx
+# Author:   Julian Smart
+# Created:  1993
+# Updated:
+# Copyright:(c) 1993, AIAI, University of Edinburgh
 #
-# "@(#)makefile.unx	1.2 5/9/94"
+# "@(#)makefile.unx 1.2 5/9/94"
 #
 # Makefile for libwx.a
 
@@ -53,197 +60,182 @@ MSWDIR=.
 
 DOCDIR = $(WXDIR)\docs
 
-GENERICOBJS= \
-  $(GENDIR)/choicdgg.$(OBJSUFF) \
-  $(GENDIR)/dirdlgg.$(OBJSUFF) \
-  $(GENDIR)/gridg.$(OBJSUFF) \
-  $(GENDIR)/laywin.$(OBJSUFF) \
-  $(GENDIR)/panelg.$(OBJSUFF) \
-  $(GENDIR)/progdlgg.$(OBJSUFF) \
-  $(GENDIR)/prop.$(OBJSUFF) \
-  $(GENDIR)/propform.$(OBJSUFF) \
-  $(GENDIR)/proplist.$(OBJSUFF) \
-  $(GENDIR)/sashwin.$(OBJSUFF) \
-  $(GENDIR)/scrolwin.$(OBJSUFF) \
-  $(GENDIR)/splitter.$(OBJSUFF) \
-  $(GENDIR)/statusbr.$(OBJSUFF) \
-  $(GENDIR)/tabg.$(OBJSUFF) \
-  $(GENDIR)/textdlgg.$(OBJSUFF) \
-  $(GENDIR)/tipdlg.$(OBJSUFF)
-
-#  $(GENDIR)/colrdlgg.$(OBJSUFF) \
-#  $(GENDIR)/fontdlgg.$(OBJSUFF) \
-#  $(GENDIR)/prntdlgg.$(OBJSUFF) \
-#  $(GENDIR)/printps.$(OBJSUFF) \
-#  $(GENDIR)/msgdlgg.$(OBJSUFF) \
+GENERICOBJS= $(GENDIR)\busyinfo.$(OBJSUFF) \
+		$(GENDIR)\choicdgg.$(OBJSUFF) \
+		$(GENDIR)\dirdlgg.$(OBJSUFF) \
+		$(GENDIR)\extdlgg.$(OBJSUFF) \
+		$(GENDIR)\gridg.$(OBJSUFF) \
+		$(GENDIR)\imaglist.$(OBJSUFF) \
+		$(GENDIR)\laywin.$(OBJSUFF) \
+		$(GENDIR)\listctrl.$(OBJSUFF) \
+		$(GENDIR)\notebook.$(OBJSUFF) \
+		$(GENDIR)\panelg.$(OBJSUFF) \
+		$(GENDIR)\progdlgg.$(OBJSUFF) \
+		$(GENDIR)\prop.$(OBJSUFF) \
+		$(GENDIR)\propform.$(OBJSUFF) \
+		$(GENDIR)\proplist.$(OBJSUFF) \
+		$(GENDIR)\sashwin.$(OBJSUFF) \
+		$(GENDIR)\scrolwin.$(OBJSUFF) \
+		$(GENDIR)\splitter.$(OBJSUFF) \
+		$(GENDIR)\statusbr.$(OBJSUFF) \
+		$(GENDIR)\tabg.$(OBJSUFF) \
+		$(GENDIR)\textdlgg.$(OBJSUFF) \
+		$(GENDIR)\tipdlg.$(OBJSUFF) \
+		$(GENDIR)\treectrl.$(OBJSUFF)
 
 COMMONOBJS = \
-  $(COMMDIR)/config.$(OBJSUFF) \
-  $(COMMDIR)/cmndata.$(OBJSUFF) \
-  $(COMMDIR)/dcbase.$(OBJSUFF) \
-  $(COMMDIR)/docview.$(OBJSUFF) \
-  $(COMMDIR)/docmdi.$(OBJSUFF) \
-  $(COMMDIR)/dynarray.$(OBJSUFF) \
-  $(COMMDIR)/event.$(OBJSUFF) \
-  $(COMMDIR)/file.$(OBJSUFF) \
-  $(COMMDIR)/fileconf.$(OBJSUFF) \
-  $(COMMDIR)/filefn.$(OBJSUFF) \
-  $(COMMDIR)/framecmn.$(OBJSUFF) \
-  $(COMMDIR)/gdicmn.$(OBJSUFF) \
-  $(COMMDIR)/helpbase.$(OBJSUFF) \
-  $(COMMDIR)/image.$(OBJSUFF) \
-  $(COMMDIR)/imagebmp.$(OBJSUFF) \
-  $(COMMDIR)/imagpng.$(OBJSUFF) \
-  $(COMMDIR)/imagjpeg.$(OBJSUFF) \
-  $(COMMDIR)/intl.$(OBJSUFF) \
-  $(COMMDIR)/ipcbase.$(OBJSUFF) \
-  $(COMMDIR)/layout.$(OBJSUFF) \
-  $(COMMDIR)/log.$(OBJSUFF) \
-  $(COMMDIR)/memory.$(OBJSUFF) \
-  $(COMMDIR)/module.$(OBJSUFF) \
-  $(COMMDIR)/mimetype.$(OBJSUFF) \
-  $(COMMDIR)/object.$(OBJSUFF) \
-  $(COMMDIR)/odbc.$(OBJSUFF) \
-  $(COMMDIR)/process.$(OBJSUFF) \
-  $(COMMDIR)/prntbase.$(OBJSUFF) \
-  $(COMMDIR)/resource.$(OBJSUFF) \
-  $(COMMDIR)/tbarbase.$(OBJSUFF) \
-  $(COMMDIR)/tbarsmpl.$(OBJSUFF) \
-  $(COMMDIR)/textfile.$(OBJSUFF) \
-  $(COMMDIR)/timercmn.$(OBJSUFF) \
-  $(COMMDIR)/utilscmn.$(OBJSUFF) \
-  $(COMMDIR)/validate.$(OBJSUFF) \
-  $(COMMDIR)/valgen.$(OBJSUFF) \
-  $(COMMDIR)/valtext.$(OBJSUFF) \
-  $(COMMDIR)/date.$(OBJSUFF) \
-  $(COMMDIR)/wxexpr.$(OBJSUFF) \
-  $(COMMDIR)/hash.$(OBJSUFF) \
-  $(COMMDIR)/list.$(OBJSUFF) \
-  $(COMMDIR)/variant.$(OBJSUFF) \
-  $(COMMDIR)/paper.$(OBJSUFF) \
-  $(COMMDIR)/string.$(OBJSUFF) \
-  $(COMMDIR)/time.$(OBJSUFF) \
-  $(COMMDIR)/tokenzr.$(OBJSUFF) \
-  $(COMMDIR)/y_tab.$(OBJSUFF) \
-  $(COMMDIR)/stream.$(OBJSUFF) \
-  $(COMMDIR)/wfstream.$(OBJSUFF) \
-  $(COMMDIR)/mstream.$(OBJSUFF) \
-  $(COMMDIR)/zstream.$(OBJSUFF) \
-  $(COMMDIR)/datstrm.$(OBJSUFF) \
-  $(COMMDIR)/objstrm.$(OBJSUFF) \
-  $(COMMDIR)/extended.$(OBJSUFF) \
-  $(COMMDIR)/dlgcmn.$(OBJSUFF) \
-  $(COMMDIR)/wincmn.$(OBJSUFF) \
-  $(COMMDIR)/wxchar.$(OBJSUFF)
+		$(COMMDIR)/y_tab.$(OBJSUFF) \
+		$(COMMDIR)/extended.$(OBJSUFF) \
+		$(COMMDIR)\cmndata.$(OBJSUFF) \
+		$(COMMDIR)\config.$(OBJSUFF) \
+		$(COMMDIR)\date.$(OBJSUFF) \
+		$(COMMDIR)\datstrm.$(OBJSUFF) \
+		$(COMMDIR)\db.$(OBJSUFF) \
+		$(COMMDIR)\dbtable.$(OBJSUFF) \
+		$(COMMDIR)\dcbase.$(OBJSUFF) \
+		$(COMMDIR)\dlgcmn.$(OBJSUFF) \
+		$(COMMDIR)\docmdi.$(OBJSUFF) \
+		$(COMMDIR)\docview.$(OBJSUFF) \
+		$(COMMDIR)\dynarray.$(OBJSUFF) \
+		$(COMMDIR)\dynlib.$(OBJSUFF) \
+		$(COMMDIR)\event.$(OBJSUFF) \
+		$(COMMDIR)\file.$(OBJSUFF) \
+		$(COMMDIR)\fileconf.$(OBJSUFF) \
+		$(COMMDIR)\filefn.$(OBJSUFF) \
+		$(COMMDIR)\filesys.$(OBJSUFF) \
+		$(COMMDIR)\framecmn.$(OBJSUFF) \
+		$(COMMDIR)\fs_inet.$(OBJSUFF) \
+		$(COMMDIR)\fs_zip.$(OBJSUFF) \
+		$(COMMDIR)\gdicmn.$(OBJSUFF) \
+		$(COMMDIR)\hash.$(OBJSUFF) \
+		$(COMMDIR)\helpbase.$(OBJSUFF) \
+		$(COMMDIR)\imagbmp.$(OBJSUFF) \
+		$(COMMDIR)\image.$(OBJSUFF) \
+		$(COMMDIR)\imaggif.$(OBJSUFF) \
+		$(COMMDIR)\imagjpeg.$(OBJSUFF) \
+		$(COMMDIR)\imagpng.$(OBJSUFF) \
+		$(COMMDIR)\intl.$(OBJSUFF) \
+		$(COMMDIR)\ipcbase.$(OBJSUFF) \
+		$(COMMDIR)\layout.$(OBJSUFF) \
+		$(COMMDIR)\list.$(OBJSUFF) \
+		$(COMMDIR)\log.$(OBJSUFF) \
+		$(COMMDIR)\memory.$(OBJSUFF) \
+		$(COMMDIR)\module.$(OBJSUFF) \
+		$(COMMDIR)\mstream.$(OBJSUFF) \
+		$(COMMDIR)\object.$(OBJSUFF) \
+		$(COMMDIR)\objstrm.$(OBJSUFF) \
+		$(COMMDIR)\paper.$(OBJSUFF) \
+		$(COMMDIR)\prntbase.$(OBJSUFF) \
+		$(COMMDIR)\resource.$(OBJSUFF) \
+		$(COMMDIR)\stream.$(OBJSUFF) \
+		$(COMMDIR)\string.$(OBJSUFF) \
+		$(COMMDIR)\tbarbase.$(OBJSUFF) \
+		$(COMMDIR)\tbarsmpl.$(OBJSUFF) \
+		$(COMMDIR)\textfile.$(OBJSUFF) \
+		$(COMMDIR)\time.$(OBJSUFF) \
+		$(COMMDIR)\timercmn.$(OBJSUFF) \
+		$(COMMDIR)\tokenzr.$(OBJSUFF) \
+		$(COMMDIR)\txtstrm.$(OBJSUFF) \
+		$(COMMDIR)\unzip.$(OBJSUFF) \
+		$(COMMDIR)\utilscmn.$(OBJSUFF) \
+		$(COMMDIR)\valgen.$(OBJSUFF) \
+		$(COMMDIR)\validate.$(OBJSUFF) \
+		$(COMMDIR)\valtext.$(OBJSUFF) \
+		$(COMMDIR)\variant.$(OBJSUFF) \
+		$(COMMDIR)\wfstream.$(OBJSUFF) \
+		$(COMMDIR)\wincmn.$(OBJSUFF) \
+		$(COMMDIR)\wxchar.$(OBJSUFF) \
+		$(COMMDIR)\wxexpr.$(OBJSUFF) \
+		$(COMMDIR)\zipstream.$(OBJSUFF) \
+		$(COMMDIR)\zstream.$(OBJSUFF)
 
-# NOTE: if the socket-related files fail with a syntax error in Sockets.h,
-# remove the files (probably all GnuWin32 releases < b20). Cygwin b20 is OK,
-# Mingw32 may still have problems.
-#  $(COMMDIR)/socket.$(OBJSUFF) \
-#  $(COMMDIR)/sckaddr.$(OBJSUFF) \
-#  $(COMMDIR)/sckfile.$(OBJSUFF) \
-#  $(COMMDIR)/sckipc.$(OBJSUFF) \
-#  $(COMMDIR)/sckstrm.$(OBJSUFF) \
-#  $(COMMDIR)/protocol.$(OBJSUFF) \
-#  $(COMMDIR)/http.$(OBJSUFF) \
-#  $(COMMDIR)/ftp.$(OBJSUFF) \
-#  $(COMMDIR)/url.$(OBJSUFF) \
-
-MSWOBJS = \
-  accel.$(OBJSUFF) \
-  app.$(OBJSUFF) \
-  bitmap.$(OBJSUFF) \
-  bmpbuttn.$(OBJSUFF) \
-  brush.$(OBJSUFF) \
-  button.$(OBJSUFF) \
-  checkbox.$(OBJSUFF) \
-  checklst.$(OBJSUFF) \
-  caret.$(OBJSUFF) \
-  choice.$(OBJSUFF) \
-  clipbrd.$(OBJSUFF) \
-  colordlg.$(OBJSUFF) \
-  colour.$(OBJSUFF) \
-  combobox.$(OBJSUFF) \
-  control.$(OBJSUFF) \
-  curico.$(OBJSUFF) \
-  cursor.$(OBJSUFF) \
-  data.$(OBJSUFF) \
-  dc.$(OBJSUFF) \
-  dcmemory.$(OBJSUFF) \
-  dcclient.$(OBJSUFF) \
-  dcprint.$(OBJSUFF) \
-  dcscreen.$(OBJSUFF) \
-  dde.$(OBJSUFF) \
-  dialog.$(OBJSUFF) \
-  dib.$(OBJSUFF) \
-  filedlg.$(OBJSUFF) \
-  font.$(OBJSUFF) \
-  fontdlg.$(OBJSUFF) \
-  frame.$(OBJSUFF) \
-  gaugemsw.$(OBJSUFF) \
-  gauge95.$(OBJSUFF) \
-  gdiobj.$(OBJSUFF) \
-  helpwin.$(OBJSUFF) \
-  icon.$(OBJSUFF) \
-  imaglist.$(OBJSUFF) \
-  joystick.$(OBJSUFF) \
-  listbox.$(OBJSUFF) \
-  listctrl.$(OBJSUFF) \
-  main.$(OBJSUFF) \
-  mdi.$(OBJSUFF) \
-  menu.$(OBJSUFF) \
-  menuitem.$(OBJSUFF) \
-  metafile.$(OBJSUFF) \
-  minifram.$(OBJSUFF) \
-  msgdlg.$(OBJSUFF) \
-  nativdlg.$(OBJSUFF) \
-  notebook.$(OBJSUFF) \
-  ownerdrw.$(OBJSUFF) \
-  palette.$(OBJSUFF) \
-  pen.$(OBJSUFF) \
-  penwin.$(OBJSUFF) \
-  printdlg.$(OBJSUFF) \
-  printwin.$(OBJSUFF) \
-  radiobox.$(OBJSUFF) \
-  radiobut.$(OBJSUFF) \
-  region.$(OBJSUFF) \
-  registry.$(OBJSUFF) \
-  regconf.$(OBJSUFF) \
-  scrolbar.$(OBJSUFF) \
-  settings.$(OBJSUFF) \
-  slidrmsw.$(OBJSUFF) \
-  slider95.$(OBJSUFF) \
-  spinbutt.$(OBJSUFF) \
-  statbmp.$(OBJSUFF) \
-  statbox.$(OBJSUFF) \
-  statline.$(OBJSUFF) \
-  statbr95.$(OBJSUFF) \
-  stattext.$(OBJSUFF) \
-  tabctrl.$(OBJSUFF) \
-  taskbar.$(OBJSUFF) \
-  tbar95.$(OBJSUFF) \
-  tbarmsw.$(OBJSUFF) \
-  textctrl.$(OBJSUFF) \
-  thread.$(OBJSUFF) \
-  timer.$(OBJSUFF) \
-  tooltip.$(OBJSUFF) \
-  treectrl.$(OBJSUFF) \
-  utils.$(OBJSUFF) \
-  utilsexc.$(OBJSUFF) \
-  wave.$(OBJSUFF) \
-  window.$(OBJSUFF) \
-  xpmhand.$(OBJSUFF)
-
-# Native wxDirDlg can't be compiled due to GnuWin32/OLE limitations
-#  dirdlg.$(OBJSUFF) \
-
-# OLE not supported yet by GnuWin32
-#  $(OLEDIR)/droptgt.$(OBJSUFF) \
-#  $(OLEDIR)/dropsrc.$(OBJSUFF) \
-#  $(OLEDIR)/dataobj.$(OBJSUFF) \
-#  $(OLEDIR)/oleutils.$(OBJSUFF) \
-#  $(OLEDIR)/uuid.$(OBJSUFF) \
-#  $(OLEDIR)/automtn.$(OBJSUFF)
+MSWOBJS = accel.$(OBJSUFF) \
+		app.$(OBJSUFF) \
+		bitmap.$(OBJSUFF) \
+		bmpbuttn.$(OBJSUFF) \
+		brush.$(OBJSUFF) \
+		button.$(OBJSUFF) \
+		caret.$(OBJSUFF) \
+		checkbox.$(OBJSUFF) \
+		checklst.$(OBJSUFF) \
+		choice.$(OBJSUFF) \
+		clipbrd.$(OBJSUFF) \
+		colordlg.$(OBJSUFF) \
+		colour.$(OBJSUFF) \
+		combobox.$(OBJSUFF) \
+		control.$(OBJSUFF) \
+		curico.$(OBJSUFF) \
+		cursor.$(OBJSUFF) \
+		data.$(OBJSUFF) \
+		dc.$(OBJSUFF) \
+		dcclient.$(OBJSUFF) \
+		dcmemory.$(OBJSUFF) \
+		dcprint.$(OBJSUFF) \
+		dcscreen.$(OBJSUFF) \
+		dde.$(OBJSUFF) \
+		dialog.$(OBJSUFF) \
+		dib.$(OBJSUFF) \
+		dibutils.$(OBJSUFF) \
+		dirdlg.$(OBJSUFF) \
+		dragimag.$(OBJSUFF) \
+		filedlg.$(OBJSUFF) \
+		font.$(OBJSUFF) \
+		fontdlg.$(OBJSUFF) \
+		frame.$(OBJSUFF) \
+		gauge95.$(OBJSUFF) \
+		gaugemsw.$(OBJSUFF) \
+		gdiobj.$(OBJSUFF) \
+		helpwin.$(OBJSUFF) \
+		icon.$(OBJSUFF) \
+		imaglist.$(OBJSUFF) \
+		iniconf.$(OBJSUFF) \
+		joystick.$(OBJSUFF) \
+		listbox.$(OBJSUFF) \
+		listctrl.$(OBJSUFF) \
+		main.$(OBJSUFF) \
+		mdi.$(OBJSUFF) \
+		menu.$(OBJSUFF) \
+		menuitem.$(OBJSUFF) \
+		metafile.$(OBJSUFF) \
+		minifram.$(OBJSUFF) \
+		msgdlg.$(OBJSUFF) \
+		nativdlg.$(OBJSUFF) \
+		notebook.$(OBJSUFF) \
+		ownerdrw.$(OBJSUFF) \
+		palette.$(OBJSUFF) \
+		pen.$(OBJSUFF) \
+		penwin.$(OBJSUFF) \
+		pnghand.$(OBJSUFF) \
+		printdlg.$(OBJSUFF) \
+		printwin.$(OBJSUFF) \
+		radiobox.$(OBJSUFF) \
+		radiobut.$(OBJSUFF) \
+		regconf.$(OBJSUFF) \
+		region.$(OBJSUFF) \
+		registry.$(OBJSUFF) \
+		scrolbar.$(OBJSUFF) \
+		settings.$(OBJSUFF) \
+		slider95.$(OBJSUFF) \
+		spinbutt.$(OBJSUFF) \
+		statbmp.$(OBJSUFF) \
+		statbox.$(OBJSUFF) \
+		statbr95.$(OBJSUFF) \
+		statline.$(OBJSUFF) \
+		stattext.$(OBJSUFF) \
+		tabctrl.$(OBJSUFF) \
+		taskbar.$(OBJSUFF) \
+		tbar95.$(OBJSUFF) \
+		tbarmsw.$(OBJSUFF) \
+		textctrl.$(OBJSUFF) \
+		thread.$(OBJSUFF) \
+		timer.$(OBJSUFF) \
+		tooltip.$(OBJSUFF) \
+		treectrl.$(OBJSUFF) \
+		utils.$(OBJSUFF) \
+		utilsexc.$(OBJSUFF) \
+		wave.$(OBJSUFF) \
+		window.$(OBJSUFF) \
+		xpmhand.$(OBJSUFF)
 
 XPMOBJECTS = 	$(XPMDIR)/crbuffri.o\
 		$(XPMDIR)/crdatfri.o\
@@ -301,7 +293,7 @@ $(COMMDIR)/y_tab.c:	$(COMMDIR)/parser.y
 # If you use e.g. gcc on Unix, uncomment these lines
 # and comment out the above.
 
-#$(COMMDIR)/y_tab.c:	$(COMMDIR)/parser.y
+# $(COMMDIR)/y_tab.c:	$(COMMDIR)/parser.y
 #	$(YACC) $(COMMDIR)/parser.y
 #	mv y.tab.c $(COMMDIR)/y_tab.c
 
diff --git a/src/msw/makefile.sc b/src/msw/makefile.sc
index ae802d21f8..6c72597921 100644
--- a/src/msw/makefile.sc
+++ b/src/msw/makefile.sc
@@ -1,3 +1,10 @@
+
+
+
+
+# This file was automatically generated by tmake at 21:00, 1999/07/14
+# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE SC.T!
+
 # Symantec C++ makefile for the msw objects
 # called from src\makefile.sc
 
@@ -21,208 +28,190 @@ XPMDIR=$(WXDIR)\src\xpm
 OLEDIR=ole
 MSWDIR=$(WXDIR)\src\msw
 
-GENERICOBJS= \
-  $(GENDIR)\choicdgg.obj \
-  $(GENDIR)\gridg.obj \
-  $(GENDIR)\laywin.obj \
-  $(GENDIR)\panelg.obj \
-  $(GENDIR)\progdlgg.obj \
-  $(GENDIR)\prop.obj \
-  $(GENDIR)\propform.obj \
-  $(GENDIR)\proplist.obj \
-  $(GENDIR)\sashwin.obj \
-  $(GENDIR)\scrolwin.obj \
-  $(GENDIR)\splitter.obj \
-  $(GENDIR)\statusbr.obj \
-  $(GENDIR)\tabg.obj \
-  $(GENDIR)\textdlgg.obj \
-  $(GENDIR)\tipdlg.obj
-
-#  $(GENDIR)\imaglist.obj \
-#  $(GENDIR)\treectrl.obj \
-#  $(GENDIR)\listctrl.obj \
-#  $(GENDIR)\notebook.obj \
-
-# These are generic things that don't need to be compiled on MSW,
-# but sometimes it's useful to do so for testing purposes.
-NONESSENTIALOBJS= \
-  $(GENDIR)\printps.obj \
-  $(GENDIR)\prntdlgg.obj \
-  $(GENDIR)\msgdlgg.obj \
-  $(GENDIR)\helpxlp.obj \
-  $(GENDIR)\colrdlgg.obj \
-  $(GENDIR)\fontdlgg.obj
+GENERICOBJS= $(GENDIR)\busyinfo.obj \
+		$(GENDIR)\choicdgg.obj \
+		$(GENDIR)\extdlgg.obj \
+		$(GENDIR)\gridg.obj \
+		$(GENDIR)\laywin.obj \
+		$(GENDIR)\panelg.obj \
+		$(GENDIR)\progdlgg.obj \
+		$(GENDIR)\prop.obj \
+		$(GENDIR)\propform.obj \
+		$(GENDIR)\proplist.obj \
+		$(GENDIR)\sashwin.obj \
+		$(GENDIR)\scrolwin.obj \
+		$(GENDIR)\splitter.obj \
+		$(GENDIR)\tabg.obj \
+		$(GENDIR)\textdlgg.obj \
+		$(GENDIR)\tipdlg.obj
 
 COMMONOBJS = \
-  $(COMMDIR)\cmndata.obj \
-  $(COMMDIR)\config.obj \
-  $(COMMDIR)\dcbase.obj \
-  $(COMMDIR)\docview.obj \
-  $(COMMDIR)\docmdi.obj \
-  $(COMMDIR)\dynarray.obj \
-  $(COMMDIR)\dynlib.obj \
-  $(COMMDIR)\event.obj \
-  $(COMMDIR)\file.obj \
-  $(COMMDIR)\filefn.obj \
-  $(COMMDIR)\fileconf.obj \
-  $(COMMDIR)\framecmn.obj \
-  $(COMMDIR)\gdicmn.obj \
-  $(COMMDIR)\image.obj \
-  $(COMMDIR)\intl.obj \
-  $(COMMDIR)\ipcbase.obj \
-  $(COMMDIR)\helpbase.obj \
-  $(COMMDIR)\layout.obj \
-  $(COMMDIR)\log.obj \
-  $(COMMDIR)\memory.obj \
-  $(COMMDIR)\mimetype.obj \
-  $(COMMDIR)\module.obj \
-  $(COMMDIR)\object.obj \
-  $(COMMDIR)\prntbase.obj \
-  $(COMMDIR)\resource.obj \
-  $(COMMDIR)\resourc2.obj \
-  $(COMMDIR)\tbarbase.obj \
-  $(COMMDIR)\tbarsmpl.obj \
-  $(COMMDIR)\textfile.obj \
-  $(COMMDIR)\timercmn.obj \
-  $(COMMDIR)\utilscmn.obj \
-  $(COMMDIR)\validate.obj \
-  $(COMMDIR)\valgen.obj \
-  $(COMMDIR)\valtext.obj \
-  $(COMMDIR)\date.obj \
-  $(COMMDIR)\hash.obj \
-  $(COMMDIR)\list.obj \
-  $(COMMDIR)\paper.obj \
-  $(COMMDIR)\string.obj \
-  $(COMMDIR)\time.obj \
-  $(COMMDIR)\tokenzr.obj \
-  $(COMMDIR)\wxexpr.obj \
-  $(COMMDIR)\y_tab.obj \
-  $(COMMDIR)\extended.obj \
-  $(COMMDIR)\process.obj \
-  $(COMMDIR)\wfstream.obj \
-  $(COMMDIR)\mstream.obj \
-  $(COMMDIR)\zstream.obj \
-  $(COMMDIR)\stream.obj \
-  $(COMMDIR)\datstrm.obj \
-  $(COMMDIR)\objstrm.obj \
-  $(COMMDIR)\variant.obj \
-  $(COMMDIR)\dlgcmn.obj \
-  $(COMMDIR)\wincmn.obj \
-  $(COMMDIR)\wxchar.obj
+		$(COMMDIR)\y_tab.obj \
+		$(COMMDIR)\extended.obj \
+		$(COMMDIR)\cmndata.obj \
+		$(COMMDIR)\config.obj \
+		$(COMMDIR)\date.obj \
+		$(COMMDIR)\datstrm.obj \
+		$(COMMDIR)\db.obj \
+		$(COMMDIR)\dbtable.obj \
+		$(COMMDIR)\dcbase.obj \
+		$(COMMDIR)\dlgcmn.obj \
+		$(COMMDIR)\docmdi.obj \
+		$(COMMDIR)\docview.obj \
+		$(COMMDIR)\dynarray.obj \
+		$(COMMDIR)\dynlib.obj \
+		$(COMMDIR)\event.obj \
+		$(COMMDIR)\file.obj \
+		$(COMMDIR)\fileconf.obj \
+		$(COMMDIR)\filefn.obj \
+		$(COMMDIR)\filesys.obj \
+		$(COMMDIR)\framecmn.obj \
+		$(COMMDIR)\fs_inet.obj \
+		$(COMMDIR)\fs_zip.obj \
+		$(COMMDIR)\ftp.obj \
+		$(COMMDIR)\gdicmn.obj \
+		$(COMMDIR)\hash.obj \
+		$(COMMDIR)\helpbase.obj \
+		$(COMMDIR)\http.obj \
+		$(COMMDIR)\imagbmp.obj \
+		$(COMMDIR)\image.obj \
+		$(COMMDIR)\imaggif.obj \
+		$(COMMDIR)\imagjpeg.obj \
+		$(COMMDIR)\imagpng.obj \
+		$(COMMDIR)\intl.obj \
+		$(COMMDIR)\ipcbase.obj \
+		$(COMMDIR)\layout.obj \
+		$(COMMDIR)\list.obj \
+		$(COMMDIR)\log.obj \
+		$(COMMDIR)\memory.obj \
+		$(COMMDIR)\mimetype.obj \
+		$(COMMDIR)\module.obj \
+		$(COMMDIR)\mstream.obj \
+		$(COMMDIR)\object.obj \
+		$(COMMDIR)\objstrm.obj \
+		$(COMMDIR)\odbc.obj \
+		$(COMMDIR)\paper.obj \
+		$(COMMDIR)\prntbase.obj \
+		$(COMMDIR)\process.obj \
+		$(COMMDIR)\protocol.obj \
+		$(COMMDIR)\resource.obj \
+		$(COMMDIR)\sckaddr.obj \
+		$(COMMDIR)\sckfile.obj \
+		$(COMMDIR)\sckint.obj \
+		$(COMMDIR)\sckipc.obj \
+		$(COMMDIR)\sckstrm.obj \
+		$(COMMDIR)\socket.obj \
+		$(COMMDIR)\stream.obj \
+		$(COMMDIR)\string.obj \
+		$(COMMDIR)\tbarbase.obj \
+		$(COMMDIR)\tbarsmpl.obj \
+		$(COMMDIR)\textfile.obj \
+		$(COMMDIR)\time.obj \
+		$(COMMDIR)\timercmn.obj \
+		$(COMMDIR)\tokenzr.obj \
+		$(COMMDIR)\txtstrm.obj \
+		$(COMMDIR)\unzip.obj \
+		$(COMMDIR)\url.obj \
+		$(COMMDIR)\utilscmn.obj \
+		$(COMMDIR)\valgen.obj \
+		$(COMMDIR)\validate.obj \
+		$(COMMDIR)\valtext.obj \
+		$(COMMDIR)\variant.obj \
+		$(COMMDIR)\wfstream.obj \
+		$(COMMDIR)\wincmn.obj \
+		$(COMMDIR)\wxchar.obj \
+		$(COMMDIR)\wxexpr.obj \
+		$(COMMDIR)\zipstream.obj \
+		$(COMMDIR)\zstream.obj
 
-# Don't compile for WIN16
-#  $(COMMDIR)\socket.obj \
-#  $(COMMDIR)\sckaddr.obj \
-#  $(COMMDIR)\sckfile.obj \
-#  $(COMMDIR)\sckipc.obj \
-#  $(COMMDIR)\sckstrm.obj \
-#  $(COMMDIR)\url.obj \
-#  $(COMMDIR)\http.obj \
-#  $(COMMDIR)\protocol.obj \
-
-# Don't compile
-#  $(COMMDIR)\db.obj \
-#  $(COMMDIR)\dbtable.obj \
-#  $(COMMDIR)\odbc.obj \
-
-MSWOBJS = \
-  $(MSWDIR)\accel.obj \
-  $(MSWDIR)\app.obj \
-  $(MSWDIR)\bitmap.obj \
-  $(MSWDIR)\bmpbuttn.obj \
-  $(MSWDIR)\brush.obj \
-  $(MSWDIR)\button.obj \
-  $(MSWDIR)\checkbox.obj \
-  $(MSWDIR)\checklst.obj \
-  $(MSWDIR)\caret.obj \
-  $(MSWDIR)\choice.obj \
-  $(MSWDIR)\clipbrd.obj \
-  $(MSWDIR)\colordlg.obj \
-  $(MSWDIR)\colour.obj \
-  $(MSWDIR)\combobox.obj \
-  $(MSWDIR)\control.obj \
-  $(MSWDIR)\curico.obj \
-  $(MSWDIR)\cursor.obj \
-  $(MSWDIR)\data.obj \
-  $(MSWDIR)\dc.obj \
-  $(MSWDIR)\dcmemory.obj \
-  $(MSWDIR)\dcclient.obj \
-  $(MSWDIR)\dcprint.obj \
-  $(MSWDIR)\dcscreen.obj \
-  $(MSWDIR)\dde.obj \
-  $(MSWDIR)\dialog.obj \
-  $(MSWDIR)\dib.obj \
-  $(MSWDIR)\dibutils.obj \
-  $(MSWDIR)\dirdlg.obj \
-  $(MSWDIR)\filedlg.obj \
-  $(MSWDIR)\font.obj \
-  $(MSWDIR)\fontdlg.obj \
-  $(MSWDIR)\frame.obj \
-  $(MSWDIR)\gauge95.obj \
-  $(MSWDIR)\gaugemsw.obj \
-  $(MSWDIR)\gdiobj.obj \
-  $(MSWDIR)\helpwin.obj \
-  $(MSWDIR)\icon.obj \
-  $(MSWDIR)\iniconf.obj \
-  $(MSWDIR)\listbox.obj \
-  $(MSWDIR)\main.obj \
-  $(MSWDIR)\mdi.obj \
-  $(MSWDIR)\menu.obj \
-  $(MSWDIR)\menuitem.obj \
-  $(MSWDIR)\metafile.obj \
-  $(MSWDIR)\minifram.obj \
-  $(MSWDIR)\msgdlg.obj \
-  $(MSWDIR)\nativdlg.obj \
-  $(MSWDIR)\ownerdrw.obj \
-  $(MSWDIR)\palette.obj \
-  $(MSWDIR)\pen.obj \
-  $(MSWDIR)\penwin.obj \
-  $(MSWDIR)\printdlg.obj \
-  $(MSWDIR)\printwin.obj \
-  $(MSWDIR)\radiobox.obj \
-  $(MSWDIR)\radiobut.obj \
-  $(MSWDIR)\region.obj \
-  $(MSWDIR)\registry.obj \
-  $(MSWDIR)\regconf.obj \
-  $(MSWDIR)\scrolbar.obj \
-  $(MSWDIR)\settings.obj \
-  $(MSWDIR)\slidrmsw.obj \
-  $(MSWDIR)\slider95.obj \
-  $(MSWDIR)\spinbutt.obj \
-  $(MSWDIR)\statbmp.obj \
-  $(MSWDIR)\statbox.obj \
-  $(MSWDIR)\statline.obj \
-  $(MSWDIR)\statbr95.obj \
-  $(MSWDIR)\stattext.obj \
-  $(MSWDIR)\tabctrl.obj \
-  $(MSWDIR)\taskbar.obj \
-  $(MSWDIR)\tbar95.obj \
-  $(MSWDIR)\tbarmsw.obj \
-  $(MSWDIR)\textctrl.obj \
-  $(MSWDIR)\thread.obj \
-  $(MSWDIR)\timer.obj \
-  $(MSWDIR)\tooltip.obj \
-  $(MSWDIR)\utils.obj \
-  $(MSWDIR)\utilsexc.obj \
-  $(MSWDIR)\wave.obj \
-  $(MSWDIR)\window.obj \
-  $(MSWDIR)\xpmhand.obj
-
-# Need Win95 support for these
-#  $(MSWDIR)\notebook.obj \
-#  $(MSWDIR)\listctrl.obj \
-#  $(MSWDIR)\imaglist.obj \
-#  $(MSWDIR)\treectrl.obj \
-#  $(OLEDIR)\droptgt.obj \
-#  $(OLEDIR)\dropsrc.obj \
-#  $(OLEDIR)\dataobj.obj \
-#  $(OLEDIR)\oleutils.obj \
-#  $(OLEDIR)\uuid.obj \
-#  $(OLEDIR)\automtn.obj
-
-# Doesn't compile with SC++ 6
-#  $(MSWDIR)\joystick.obj \
-#  $(MSWDIR)\pnghand.obj \
+MSWOBJS = $(MSWDIR)\accel.obj \
+		$(MSWDIR)\app.obj \
+		$(MSWDIR)\automtn.obj \
+		$(MSWDIR)\bitmap.obj \
+		$(MSWDIR)\bmpbuttn.obj \
+		$(MSWDIR)\brush.obj \
+		$(MSWDIR)\button.obj \
+		$(MSWDIR)\caret.obj \
+		$(MSWDIR)\checkbox.obj \
+		$(MSWDIR)\checklst.obj \
+		$(MSWDIR)\choice.obj \
+		$(MSWDIR)\clipbrd.obj \
+		$(MSWDIR)\colordlg.obj \
+		$(MSWDIR)\colour.obj \
+		$(MSWDIR)\combobox.obj \
+		$(MSWDIR)\control.obj \
+		$(MSWDIR)\curico.obj \
+		$(MSWDIR)\cursor.obj \
+		$(MSWDIR)\data.obj \
+		$(MSWDIR)\dataobj.obj \
+		$(MSWDIR)\dc.obj \
+		$(MSWDIR)\dcclient.obj \
+		$(MSWDIR)\dcmemory.obj \
+		$(MSWDIR)\dcprint.obj \
+		$(MSWDIR)\dcscreen.obj \
+		$(MSWDIR)\dde.obj \
+		$(MSWDIR)\dialog.obj \
+		$(MSWDIR)\dib.obj \
+		$(MSWDIR)\dibutils.obj \
+		$(MSWDIR)\dirdlg.obj \
+		$(MSWDIR)\dragimag.obj \
+		$(MSWDIR)\dropsrc.obj \
+		$(MSWDIR)\droptgt.obj \
+		$(MSWDIR)\filedlg.obj \
+		$(MSWDIR)\font.obj \
+		$(MSWDIR)\fontdlg.obj \
+		$(MSWDIR)\frame.obj \
+		$(MSWDIR)\gauge95.obj \
+		$(MSWDIR)\gaugemsw.obj \
+		$(MSWDIR)\gdiobj.obj \
+		$(MSWDIR)\helpwin.obj \
+		$(MSWDIR)\icon.obj \
+		$(MSWDIR)\iniconf.obj \
+		$(MSWDIR)\listbox.obj \
+		$(MSWDIR)\main.obj \
+		$(MSWDIR)\mdi.obj \
+		$(MSWDIR)\menu.obj \
+		$(MSWDIR)\menuitem.obj \
+		$(MSWDIR)\metafile.obj \
+		$(MSWDIR)\minifram.obj \
+		$(MSWDIR)\msgdlg.obj \
+		$(MSWDIR)\nativdlg.obj \
+		$(MSWDIR)\oleutils.obj \
+		$(MSWDIR)\ownerdrw.obj \
+		$(MSWDIR)\palette.obj \
+		$(MSWDIR)\pen.obj \
+		$(MSWDIR)\penwin.obj \
+		$(MSWDIR)\printdlg.obj \
+		$(MSWDIR)\printwin.obj \
+		$(MSWDIR)\radiobox.obj \
+		$(MSWDIR)\radiobut.obj \
+		$(MSWDIR)\regconf.obj \
+		$(MSWDIR)\region.obj \
+		$(MSWDIR)\registry.obj \
+		$(MSWDIR)\scrolbar.obj \
+		$(MSWDIR)\settings.obj \
+		$(MSWDIR)\slider95.obj \
+		$(MSWDIR)\slidrmsw.obj \
+		$(MSWDIR)\spinbutt.obj \
+		$(MSWDIR)\statbmp.obj \
+		$(MSWDIR)\statbox.obj \
+		$(MSWDIR)\statbr95.obj \
+		$(MSWDIR)\statline.obj \
+		$(MSWDIR)\stattext.obj \
+		$(MSWDIR)\tabctrl.obj \
+		$(MSWDIR)\taskbar.obj \
+		$(MSWDIR)\tbar95.obj \
+		$(MSWDIR)\tbarmsw.obj \
+		$(MSWDIR)\textctrl.obj \
+		$(MSWDIR)\thread.obj \
+		$(MSWDIR)\timer.obj \
+		$(MSWDIR)\tooltip.obj \
+		$(MSWDIR)\utils.obj \
+		$(MSWDIR)\utilsexc.obj \
+		$(MSWDIR)\uuid.obj \
+		$(MSWDIR)\wave.obj \
+		$(MSWDIR)\window.obj \
+		$(MSWDIR)\xpmhand.obj
 
 XPMOBJECTS = 	$(XPMDIR)\crbuffri.obj\
 		$(XPMDIR)\crdatfri.obj\
@@ -257,6 +246,6 @@ $(COMMDIR)\y_tab.c:     $(COMMDIR)\dosyacc.c
 $(COMMDIR)\lex_yy.c:    $(COMMDIR)\doslex.c
     copy $(COMMDIR)\doslex.c $(COMMDIR)\lex_yy.c
 
-#$(COMMDIR)\cmndata.obj:     $(COMMDIR)\cmndata.cpp
+# $(COMMDIR)\cmndata.obj:     $(COMMDIR)\cmndata.cpp
 #	*$(CC) -c $(CFLAGS) -I$(INCLUDE) $(OPTIONS) $(COMMDIR)\cmndata.cpp -o$(COMMDIR)\cmndata.obj
 
diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index 324df5d962..7cdcfa1766 100644
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -1,9 +1,15 @@
-#
-# File:		makefile.nt
-# Author:	Julian Smart
-# Created:	1997
+
+
+
+
+# This file was automatically generated by tmake at 21:00, 1999/07/14
+# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!
+
+# File:     makefile.vc
+# Author:   Julian Smart
+# Created:  1997
 # Updated:
-# Copyright:	(c) 1997, Julian Smart
+# Copyright: (c) 1997, Julian Smart
 #
 # "%W% %G%"
 #
@@ -71,214 +77,207 @@ $(CPPFLAGS) /Fo$@ /c /Tp $<
 $(CPPFLAGS) /Fo$@ /c /Tp $<
 <<
 
-GENERICOBJS= \
-  ..\generic\$D\choicdgg.obj \
-  ..\generic\$D\gridg.obj \
-  ..\generic\$D\laywin.obj \
-  ..\generic\$D\panelg.obj \
-  ..\generic\$D\progdlgg.obj \
-  ..\generic\$D\prop.obj \
-  ..\generic\$D\propform.obj \
-  ..\generic\$D\proplist.obj \
-  ..\generic\$D\sashwin.obj \
-  ..\generic\$D\scrolwin.obj \
-  ..\generic\$D\splitter.obj \
-  ..\generic\$D\statusbr.obj \
-  ..\generic\$D\tabg.obj \
-  ..\generic\$D\textdlgg.obj \
-  ..\generic\$D\extdlgg.obj \
-  ..\generic\$D\tipdlg.obj \
-  ..\generic\$D\busyinfo.obj
-
-#  ..\generic\$D\imaglist.obj \
-#  ..\generic\$D\treectrl.obj \
-#  ..\generic\$D\listctrl.obj \
-#  ..\generic\$D\notebook.obj \
+GENERICOBJS= ..\generic\$D\busyinfo.obj \
+		..\generic\$D\choicdgg.obj \
+		..\generic\$D\extdlgg.obj \
+		..\generic\$D\gridg.obj \
+		..\generic\$D\laywin.obj \
+		..\generic\$D\panelg.obj \
+		..\generic\$D\progdlgg.obj \
+		..\generic\$D\prop.obj \
+		..\generic\$D\propform.obj \
+		..\generic\$D\proplist.obj \
+		..\generic\$D\sashwin.obj \
+		..\generic\$D\scrolwin.obj \
+		..\generic\$D\splitter.obj \
+		..\generic\$D\tabg.obj \
+		..\generic\$D\textdlgg.obj \
+		..\generic\$D\tipdlg.obj
 
 # These are generic things that don't need to be compiled on MSW,
 # but sometimes it's useful to do so for testing purposes.
-NONESSENTIALOBJS= \
-  ..\generic\$D\printps.obj \
-  ..\generic\$D\prntdlgg.obj \
-  ..\generic\$D\msgdlgg.obj \
-  ..\generic\$D\helpxlp.obj \
-  ..\generic\$D\colrdlgg.obj \
-  ..\generic\$D\fontdlgg.obj
+NONESSENTIALOBJS= ..\generic\$D\colrdlgg.obj \
+		..\generic\$D\dirdlgg.obj \
+		..\generic\$D\fontdlgg.obj \
+		..\generic\$D\helpxlp.obj \
+		..\generic\$D\imaglist.obj \
+		..\generic\$D\listctrl.obj \
+		..\generic\$D\msgdlgg.obj \
+		..\generic\$D\notebook.obj \
+		..\generic\$D\printps.obj \
+		..\generic\$D\prntdlgg.obj \
+		..\generic\$D\statusbr.obj \
+		..\generic\$D\treectrl.obj
 
 COMMONOBJS = \
-  ..\common\$D\cmndata.obj \
-  ..\common\$D\config.obj \
-  ..\common\$D\dcbase.obj \
-  ..\common\$D\db.obj \
-  ..\common\$D\dbtable.obj \
-  ..\common\$D\docview.obj \
-  ..\common\$D\docmdi.obj \
-  ..\common\$D\dynarray.obj \
-  ..\common\$D\dynlib.obj \
-  ..\common\$D\event.obj \
-  ..\common\$D\file.obj \
-  ..\common\$D\filefn.obj \
-  ..\common\$D\fileconf.obj \
-  ..\common\$D\framecmn.obj \
-  ..\common\$D\ftp.obj \
-  ..\common\$D\gdicmn.obj \
-  ..\common\$D\image.obj \
-  ..\common\$D\imagbmp.obj \
-  ..\common\$D\imagjpeg.obj \
-  ..\common\$D\imagpng.obj \
-  ..\common\$D\imaggif.obj \
-  ..\common\$D\intl.obj \
-  ..\common\$D\ipcbase.obj \
-  ..\common\$D\helpbase.obj \
-  ..\common\$D\layout.obj \
-  ..\common\$D\log.obj \
-  ..\common\$D\memory.obj \
-  ..\common\$D\mimetype.obj \
-  ..\common\$D\module.obj \
-  ..\common\$D\odbc.obj \
-  ..\common\$D\object.obj \
-  ..\common\$D\prntbase.obj \
-  ..\common\$D\resource.obj \
-  ..\common\$D\tbarbase.obj \
-  ..\common\$D\tbarsmpl.obj \
-  ..\common\$D\textfile.obj \
-  ..\common\$D\timercmn.obj \
-  ..\common\$D\utilscmn.obj \
-  ..\common\$D\validate.obj \
-  ..\common\$D\valgen.obj \
-  ..\common\$D\valtext.obj \
-  ..\common\$D\date.obj \
-  ..\common\$D\hash.obj \
-  ..\common\$D\list.obj \
-  ..\common\$D\paper.obj \
-  ..\common\$D\string.obj \
-  ..\common\$D\socket.obj \
-  ..\common\$D\sckaddr.obj \
-  ..\common\$D\sckint.obj \
-  ..\common\$D\sckfile.obj \
-  ..\common\$D\sckipc.obj \
-  ..\common\$D\sckstrm.obj \
-  ..\common\$D\url.obj \
-  ..\common\$D\http.obj \
-  ..\common\$D\protocol.obj \
-  ..\common\$D\time.obj \
-  ..\common\$D\tokenzr.obj \
-  ..\common\$D\wxexpr.obj \
-  ..\common\$D\y_tab.obj \
-  ..\common\$D\extended.obj \
-  ..\common\$D\process.obj \
-  ..\common\$D\wfstream.obj \
-  ..\common\$D\mstream.obj \
-  ..\common\$D\zstream.obj \
-  ..\common\$D\stream.obj \
-  ..\common\$D\datstrm.obj \
-  ..\common\$D\objstrm.obj \
-  ..\common\$D\variant.obj \
-  ..\common\$D\dlgcmn.obj \
-  ..\common\$D\wincmn.obj \
-  ..\common\$D\txtstrm.obj \
-  ..\common\$D\wxchar.obj \
-  ..\common\$D\unzip.obj \
-  ..\common\$D\zipstream.obj \
-  ..\common\$D\filesys.obj \
-  ..\common\$D\fs_inet.obj \
-  ..\common\$D\fs_zip.obj
+		..\common\$D\extended.obj \
+		..\common\$D\y_tab.obj \
+		..\common\$D\cmndata.obj \
+		..\common\$D\config.obj \
+		..\common\$D\date.obj \
+		..\common\$D\datstrm.obj \
+		..\common\$D\db.obj \
+		..\common\$D\dbtable.obj \
+		..\common\$D\dcbase.obj \
+		..\common\$D\dlgcmn.obj \
+		..\common\$D\docmdi.obj \
+		..\common\$D\docview.obj \
+		..\common\$D\dynarray.obj \
+		..\common\$D\dynlib.obj \
+		..\common\$D\event.obj \
+		..\common\$D\file.obj \
+		..\common\$D\fileconf.obj \
+		..\common\$D\filefn.obj \
+		..\common\$D\filesys.obj \
+		..\common\$D\framecmn.obj \
+		..\common\$D\fs_inet.obj \
+		..\common\$D\fs_zip.obj \
+		..\common\$D\ftp.obj \
+		..\common\$D\gdicmn.obj \
+		..\common\$D\hash.obj \
+		..\common\$D\helpbase.obj \
+		..\common\$D\http.obj \
+		..\common\$D\imagbmp.obj \
+		..\common\$D\image.obj \
+		..\common\$D\imaggif.obj \
+		..\common\$D\imagjpeg.obj \
+		..\common\$D\imagpng.obj \
+		..\common\$D\intl.obj \
+		..\common\$D\ipcbase.obj \
+		..\common\$D\layout.obj \
+		..\common\$D\list.obj \
+		..\common\$D\log.obj \
+		..\common\$D\memory.obj \
+		..\common\$D\mimetype.obj \
+		..\common\$D\module.obj \
+		..\common\$D\mstream.obj \
+		..\common\$D\object.obj \
+		..\common\$D\objstrm.obj \
+		..\common\$D\odbc.obj \
+		..\common\$D\paper.obj \
+		..\common\$D\prntbase.obj \
+		..\common\$D\process.obj \
+		..\common\$D\protocol.obj \
+		..\common\$D\resource.obj \
+		..\common\$D\sckaddr.obj \
+		..\common\$D\sckfile.obj \
+		..\common\$D\sckint.obj \
+		..\common\$D\sckipc.obj \
+		..\common\$D\sckstrm.obj \
+		..\common\$D\socket.obj \
+		..\common\$D\stream.obj \
+		..\common\$D\string.obj \
+		..\common\$D\tbarbase.obj \
+		..\common\$D\tbarsmpl.obj \
+		..\common\$D\textfile.obj \
+		..\common\$D\time.obj \
+		..\common\$D\timercmn.obj \
+		..\common\$D\tokenzr.obj \
+		..\common\$D\txtstrm.obj \
+		..\common\$D\unzip.obj \
+		..\common\$D\url.obj \
+		..\common\$D\utilscmn.obj \
+		..\common\$D\valgen.obj \
+		..\common\$D\validate.obj \
+		..\common\$D\valtext.obj \
+		..\common\$D\variant.obj \
+		..\common\$D\wfstream.obj \
+		..\common\$D\wincmn.obj \
+		..\common\$D\wxchar.obj \
+		..\common\$D\wxexpr.obj \
+		..\common\$D\zipstream.obj \
+		..\common\$D\zstream.obj
 
-MSWOBJS = \
-  ..\msw\$D\accel.obj \
-  ..\msw\$D\app.obj \
-  ..\msw\$D\bitmap.obj \
-  ..\msw\$D\bmpbuttn.obj \
-  ..\msw\$D\brush.obj \
-  ..\msw\$D\button.obj \
-  ..\msw\$D\checkbox.obj \
-  ..\msw\$D\checklst.obj \
-  ..\msw\$D\caret.obj \
-  ..\msw\$D\choice.obj \
-  ..\msw\$D\clipbrd.obj \
-  ..\msw\$D\colordlg.obj \
-  ..\msw\$D\colour.obj \
-  ..\msw\$D\combobox.obj \
-  ..\msw\$D\control.obj \
-  ..\msw\$D\curico.obj \
-  ..\msw\$D\cursor.obj \
-  ..\msw\$D\data.obj \
-  ..\msw\$D\dc.obj \
-  ..\msw\$D\dcmemory.obj \
-  ..\msw\$D\dcclient.obj \
-  ..\msw\$D\dcprint.obj \
-  ..\msw\$D\dcscreen.obj \
-  ..\msw\$D\dde.obj \
-  ..\msw\$D\dialog.obj \
-  ..\msw\$D\dib.obj \
-  ..\msw\$D\dibutils.obj \
-  ..\msw\$D\dirdlg.obj \
-  ..\msw\$D\dragimag.obj \
-  ..\msw\$D\filedlg.obj \
-  ..\msw\$D\font.obj \
-  ..\msw\$D\fontdlg.obj \
-  ..\msw\$D\frame.obj \
-  ..\msw\$D\gauge95.obj \
-  ..\msw\$D\gaugemsw.obj \
-  ..\msw\$D\gdiobj.obj \
-  ..\msw\$D\helpwin.obj \
-  ..\msw\$D\icon.obj \
-  ..\msw\$D\iniconf.obj \
-  ..\msw\$D\joystick.obj \
-  ..\msw\$D\imaglist.obj \
-  ..\msw\$D\listbox.obj \
-  ..\msw\$D\listctrl.obj \
-  ..\msw\$D\main.obj \
-  ..\msw\$D\mdi.obj \
-  ..\msw\$D\menu.obj \
-  ..\msw\$D\menuitem.obj \
-  ..\msw\$D\metafile.obj \
-  ..\msw\$D\minifram.obj \
-  ..\msw\$D\msgdlg.obj \
-  ..\msw\$D\nativdlg.obj \
-  ..\msw\$D\notebook.obj \
-  ..\msw\$D\ownerdrw.obj \
-  ..\msw\$D\palette.obj \
-  ..\msw\$D\pen.obj \
-  ..\msw\$D\penwin.obj \
-  ..\msw\$D\pnghand.obj \
-  ..\msw\$D\printdlg.obj \
-  ..\msw\$D\printwin.obj \
-  ..\msw\$D\radiobox.obj \
-  ..\msw\$D\radiobut.obj \
-  ..\msw\$D\region.obj \
-  ..\msw\$D\registry.obj \
-  ..\msw\$D\regconf.obj \
-  ..\msw\$D\scrolbar.obj \
-  ..\msw\$D\settings.obj \
-  ..\msw\$D\slidrmsw.obj \
-  ..\msw\$D\slider95.obj \
-  ..\msw\$D\spinbutt.obj \
-  ..\msw\$D\statbmp.obj \
-  ..\msw\$D\statbox.obj \
-  ..\msw\$D\statline.obj \
-  ..\msw\$D\statbr95.obj \
-  ..\msw\$D\stattext.obj \
-  ..\msw\$D\tabctrl.obj \
-  ..\msw\$D\taskbar.obj \
-  ..\msw\$D\tbar95.obj \
-  ..\msw\$D\tbarmsw.obj \
-  ..\msw\$D\textctrl.obj \
-  ..\msw\$D\thread.obj \
-  ..\msw\$D\timer.obj \
-  ..\msw\$D\tooltip.obj \
-  ..\msw\$D\treectrl.obj \
-  ..\msw\$D\utils.obj \
-  ..\msw\$D\utilsexc.obj \
-  ..\msw\ole\$D\uuid.obj \
-  ..\msw\$D\wave.obj \
-  ..\msw\$D\window.obj \
-  ..\msw\$D\xpmhand.obj \
-  ..\msw\ole\$D\dataobj.obj \
-  ..\msw\ole\$D\automtn.obj \
-  ..\msw\ole\$D\droptgt.obj \
-  ..\msw\ole\$D\dropsrc.obj \
-  ..\msw\ole\$D\oleutils.obj
+MSWOBJS = ..\msw\$D\accel.obj \
+		..\msw\$D\app.obj \
+		..\msw\$D\automtn.obj \
+		..\msw\$D\bitmap.obj \
+		..\msw\$D\bmpbuttn.obj \
+		..\msw\$D\brush.obj \
+		..\msw\$D\button.obj \
+		..\msw\$D\caret.obj \
+		..\msw\$D\checkbox.obj \
+		..\msw\$D\checklst.obj \
+		..\msw\$D\choice.obj \
+		..\msw\$D\clipbrd.obj \
+		..\msw\$D\colordlg.obj \
+		..\msw\$D\colour.obj \
+		..\msw\$D\combobox.obj \
+		..\msw\$D\control.obj \
+		..\msw\$D\curico.obj \
+		..\msw\$D\cursor.obj \
+		..\msw\$D\data.obj \
+		..\msw\$D\dataobj.obj \
+		..\msw\$D\dc.obj \
+		..\msw\$D\dcclient.obj \
+		..\msw\$D\dcmemory.obj \
+		..\msw\$D\dcprint.obj \
+		..\msw\$D\dcscreen.obj \
+		..\msw\$D\dde.obj \
+		..\msw\$D\dialog.obj \
+		..\msw\$D\dib.obj \
+		..\msw\$D\dibutils.obj \
+		..\msw\$D\dirdlg.obj \
+		..\msw\$D\dragimag.obj \
+		..\msw\$D\dropsrc.obj \
+		..\msw\$D\droptgt.obj \
+		..\msw\$D\filedlg.obj \
+		..\msw\$D\font.obj \
+		..\msw\$D\fontdlg.obj \
+		..\msw\$D\frame.obj \
+		..\msw\$D\gauge95.obj \
+		..\msw\$D\gaugemsw.obj \
+		..\msw\$D\gdiobj.obj \
+		..\msw\$D\helpwin.obj \
+		..\msw\$D\icon.obj \
+		..\msw\$D\iniconf.obj \
+		..\msw\$D\joystick.obj \
+		..\msw\$D\listbox.obj \
+		..\msw\$D\main.obj \
+		..\msw\$D\mdi.obj \
+		..\msw\$D\menu.obj \
+		..\msw\$D\menuitem.obj \
+		..\msw\$D\metafile.obj \
+		..\msw\$D\minifram.obj \
+		..\msw\$D\msgdlg.obj \
+		..\msw\$D\nativdlg.obj \
+		..\msw\$D\oleutils.obj \
+		..\msw\$D\ownerdrw.obj \
+		..\msw\$D\palette.obj \
+		..\msw\$D\pen.obj \
+		..\msw\$D\penwin.obj \
+		..\msw\$D\pnghand.obj \
+		..\msw\$D\printdlg.obj \
+		..\msw\$D\printwin.obj \
+		..\msw\$D\radiobox.obj \
+		..\msw\$D\radiobut.obj \
+		..\msw\$D\regconf.obj \
+		..\msw\$D\region.obj \
+		..\msw\$D\registry.obj \
+		..\msw\$D\scrolbar.obj \
+		..\msw\$D\settings.obj \
+		..\msw\$D\slider95.obj \
+		..\msw\$D\slidrmsw.obj \
+		..\msw\$D\spinbutt.obj \
+		..\msw\$D\statbmp.obj \
+		..\msw\$D\statbox.obj \
+		..\msw\$D\statbr95.obj \
+		..\msw\$D\statline.obj \
+		..\msw\$D\stattext.obj \
+		..\msw\$D\tabctrl.obj \
+		..\msw\$D\taskbar.obj \
+		..\msw\$D\tbar95.obj \
+		..\msw\$D\tbarmsw.obj \
+		..\msw\$D\textctrl.obj \
+		..\msw\$D\thread.obj \
+		..\msw\$D\timer.obj \
+		..\msw\$D\tooltip.obj \
+		..\msw\$D\utils.obj \
+		..\msw\$D\utilsexc.obj \
+		..\msw\$D\uuid.obj \
+		..\msw\$D\wave.obj \
+		..\msw\$D\window.obj \
+		..\msw\$D\xpmhand.obj
 
 HTMLOBJS = \
   ..\html\$D\htmlcell.obj \
@@ -412,7 +411,7 @@ $(CPPFLAGS) $(MAKEPRECOMP) /Fo$D\dummydll.obj /c /Tp dummydll.cpp
 # (copies the file anyway)
 # we'll have to comment this rule out.
 
-#$(WXDIR)\include\wx\msw\setup.h: $(WXDIR)\include\wx\msw\setup0.h
+# $(WXDIR)\include\wx\msw\setup.h: $(WXDIR)\include\wx\msw\setup0.h
 #    cd "$(WXDIR)"\include\wx\msw
 #    if not exist setup.h copy setup0.h setup.h
 #    cd "$(WXDIR)"\src\msw
diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat
index 04db240faa..725af9a4db 100644
--- a/src/msw/makefile.wat
+++ b/src/msw/makefile.wat
@@ -1,8 +1,16 @@
+
+
+
+
+# This file was automatically generated by tmake at 21:00, 1999/07/14
+# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T!
+
 #!/binb/wmake.exe
+
 #
-# File:		makefile.wat
-# Author:	Julian Smart
-# Created:	1998
+# File:     makefile.wat
+# Author:   Julian Smart
+# Created:  1998
 #
 # Makefile : Builds wxWindows library for Watcom C++, WIN32
 
@@ -26,203 +34,208 @@ MSWDIR=$(WXDIR)\src\msw
 
 DOCDIR = $(WXDIR)\docs
 
-GENERICOBJS= choicdgg.obj &
-  gridg.obj &
-  laywin.obj &
-  panelg.obj &
-  progdlgg.obj &
-  prop.obj &
-  propform.obj &
-  proplist.obj &
-  sashwin.obj &
-  scrolwin.obj &
-  splitter.obj &
-  statusbr.obj &
-  tabg.obj &
-  textdlgg.obj &
-  tipdlg.obj
+GENERICOBJS= busyinfo.obj &
+	choicdgg.obj &
+	extdlgg.obj &
+	gridg.obj &
+	laywin.obj &
+	panelg.obj &
+	progdlgg.obj &
+	prop.obj &
+	propform.obj &
+	proplist.obj &
+	sashwin.obj &
+	scrolwin.obj &
+	splitter.obj &
+	tabg.obj &
+	textdlgg.obj &
+	tipdlg.obj
 
 # These are generic things that don't need to be compiled on MSW,
 # but sometimes it's useful to do so for testing purposes.
-NONESSENTIALOBJS= printps.obj &
-  prntdlgg.obj &
-  msgdlgg.obj &
-  helpxlp.obj &
-  colrdlgg.obj &
-  fontdlgg.obj
+NONESSENTIALOBJS= colrdlgg.obj &
+	dirdlgg.obj &
+	fontdlgg.obj &
+	helpxlp.obj &
+	imaglist.obj &
+	listctrl.obj &
+	msgdlgg.obj &
+	notebook.obj &
+	printps.obj &
+	prntdlgg.obj &
+	statusbr.obj &
+	treectrl.obj
 
-COMMONOBJS = cmndata.obj &
-  config.obj &
-  dcbase.obj &
-  docview.obj &
-  docmdi.obj &
-  dynarray.obj &
-  dynlib.obj &
-  event.obj &
-  file.obj &
-  filefn.obj &
-  fileconf.obj &
-  framecmn.obj &
-  gdicmn.obj &
-  image.obj &
-  imagbmp.obj &
-  imagpng.obj &
-  intl.obj &
-  ipcbase.obj &
-  helpbase.obj &
-  layout.obj &
-  log.obj &
-  memory.obj &
-  mimetype.obj &
-  module.obj &
-  object.obj &
-  prntbase.obj &
-  resource.obj &
-  tbarbase.obj &
-  tbarsmpl.obj &
-  textfile.obj &
-  timercmn.obj &
-  utilscmn.obj &
-  validate.obj &
-  valgen.obj &
-  valtext.obj &
-  date.obj &
-  hash.obj &
-  list.obj &
-  paper.obj &
-  string.obj &
-  socket.obj &
-  sckaddr.obj &
-  sckfile.obj &
-  sckipc.obj &
-  sckstrm.obj &
-  sckint.obj &
-  url.obj &
-  http.obj &
-  protocol.obj &
-  time.obj &
-  tokenzr.obj &
-  wxexpr.obj &
-  y_tab.obj &
-  extended.obj &
-  process.obj &
-  wfstream.obj &
-  mstream.obj &
-  zstream.obj &
-  stream.obj &
-  datstrm.obj &
-  objstrm.obj &
-  variant.obj &
-  dlgcmn.obj &
-  wincmn.obj &
-  wxchar.obj
+COMMONOBJS = &
+	y_tab.obj &
+	extended.obj &
+	cmndata.obj &
+	config.obj &
+	date.obj &
+	datstrm.obj &
+	db.obj &
+	dbtable.obj &
+	dcbase.obj &
+	dlgcmn.obj &
+	docmdi.obj &
+	docview.obj &
+	dynarray.obj &
+	dynlib.obj &
+	event.obj &
+	file.obj &
+	fileconf.obj &
+	filefn.obj &
+	filesys.obj &
+	framecmn.obj &
+	fs_inet.obj &
+	fs_zip.obj &
+	ftp.obj &
+	gdicmn.obj &
+	hash.obj &
+	helpbase.obj &
+	http.obj &
+	imagbmp.obj &
+	image.obj &
+	imaggif.obj &
+	imagpng.obj &
+	intl.obj &
+	ipcbase.obj &
+	layout.obj &
+	list.obj &
+	log.obj &
+	memory.obj &
+	mimetype.obj &
+	module.obj &
+	mstream.obj &
+	object.obj &
+	objstrm.obj &
+	odbc.obj &
+	paper.obj &
+	prntbase.obj &
+	process.obj &
+	protocol.obj &
+	resource.obj &
+	sckaddr.obj &
+	sckfile.obj &
+	sckint.obj &
+	sckipc.obj &
+	sckstrm.obj &
+	socket.obj &
+	stream.obj &
+	string.obj &
+	tbarbase.obj &
+	tbarsmpl.obj &
+	textfile.obj &
+	time.obj &
+	timercmn.obj &
+	tokenzr.obj &
+	txtstrm.obj &
+	unzip.obj &
+	url.obj &
+	utilscmn.obj &
+	valgen.obj &
+	validate.obj &
+	valtext.obj &
+	variant.obj &
+	wfstream.obj &
+	wincmn.obj &
+	wxchar.obj &
+	wxexpr.obj &
+	zipstream.obj &
+	zstream.obj
 
-# Can't compile these yet under Watcom C++
-#  imagjpeg.obj &
-#  odbc.obj &
-#  db.obj &
-#  dbtable.obj &
-
-MSWOBJS = &
-  accel.obj &
-  app.obj &
-  bitmap.obj &
-  bmpbuttn.obj &
-  brush.obj &
-  button.obj &
-  checkbox.obj &
-  checklst.obj &
-  caret.obj &
-  choice.obj &
-  clipbrd.obj &
-  colordlg.obj &
-  colour.obj &
-  combobox.obj &
-  control.obj &
-  curico.obj &
-  cursor.obj &
-  data.obj &
-  dc.obj &
-  dcmemory.obj &
-  dcclient.obj &
-  dcprint.obj &
-  dcscreen.obj &
-  dde.obj &
-  dialog.obj &
-  dib.obj &
-  dibutils.obj &
-  dirdlg.obj &
-  filedlg.obj &
-  font.obj &
-  fontdlg.obj &
-  frame.obj &
-  gauge95.obj &
-  gaugemsw.obj &
-  gdiobj.obj &
-  helpwin.obj &
-  icon.obj &
-  imaglist.obj &
-  iniconf.obj &
-  joystick.obj &
-  listbox.obj &
-  listctrl.obj &
-  main.obj &
-  mdi.obj &
-  menu.obj &
-  menuitem.obj &
-  metafile.obj &
-  minifram.obj &
-  msgdlg.obj &
-  nativdlg.obj &
-  notebook.obj &
-  ownerdrw.obj &
-  palette.obj &
-  pen.obj &
-  penwin.obj &
-  printdlg.obj &
-  printwin.obj &
-  radiobox.obj &
-  radiobut.obj &
-  region.obj &
-  registry.obj &
-  regconf.obj &
-  scrolbar.obj &
-  settings.obj &
-  slidrmsw.obj &
-  slider95.obj &
-  spinbutt.obj &
-  statbmp.obj &
-  statbox.obj &
-  statline.obj &
-  statbr95.obj &
-  stattext.obj &
-  tabctrl.obj &
-  taskbar.obj &
-  tbar95.obj &
-  tbarmsw.obj &
-  textctrl.obj &
-  thread.obj &
-  timer.obj &
-  tooltip.obj &
-  treectrl.obj &
-  utils.obj &
-  utilsexc.obj &
-  wave.obj &
-  window.obj &
-  xpmhand.obj
-
-#  pnghand.obj &
-
-OLEOBJS = &
-  droptgt.obj &
-  dropsrc.obj &
-  dataobj.obj &
-  oleutils.obj &
-  uuid.obj &
-  automtn.obj
+MSWOBJS = accel.obj &
+	app.obj &
+	automtn.obj &
+	bitmap.obj &
+	bmpbuttn.obj &
+	brush.obj &
+	button.obj &
+	caret.obj &
+	checkbox.obj &
+	checklst.obj &
+	choice.obj &
+	clipbrd.obj &
+	colordlg.obj &
+	colour.obj &
+	combobox.obj &
+	control.obj &
+	curico.obj &
+	cursor.obj &
+	data.obj &
+	dataobj.obj &
+	dc.obj &
+	dcclient.obj &
+	dcmemory.obj &
+	dcprint.obj &
+	dcscreen.obj &
+	dde.obj &
+	dialog.obj &
+	dib.obj &
+	dibutils.obj &
+	dirdlg.obj &
+	dragimag.obj &
+	dropsrc.obj &
+	droptgt.obj &
+	filedlg.obj &
+	font.obj &
+	fontdlg.obj &
+	frame.obj &
+	gauge95.obj &
+	gaugemsw.obj &
+	gdiobj.obj &
+	helpwin.obj &
+	icon.obj &
+	iniconf.obj &
+	joystick.obj &
+	listbox.obj &
+	main.obj &
+	mdi.obj &
+	menu.obj &
+	menuitem.obj &
+	metafile.obj &
+	minifram.obj &
+	msgdlg.obj &
+	nativdlg.obj &
+	oleutils.obj &
+	ownerdrw.obj &
+	palette.obj &
+	pen.obj &
+	penwin.obj &
+	printdlg.obj &
+	printwin.obj &
+	radiobox.obj &
+	radiobut.obj &
+	regconf.obj &
+	region.obj &
+	registry.obj &
+	scrolbar.obj &
+	settings.obj &
+	slider95.obj &
+	slidrmsw.obj &
+	spinbutt.obj &
+	statbmp.obj &
+	statbox.obj &
+	statbr95.obj &
+	statline.obj &
+	stattext.obj &
+	tabctrl.obj &
+	taskbar.obj &
+	tbar95.obj &
+	tbarmsw.obj &
+	textctrl.obj &
+	thread.obj &
+	timer.obj &
+	tooltip.obj &
+	utils.obj &
+	utilsexc.obj &
+	uuid.obj &
+	wave.obj &
+	window.obj &
+	xpmhand.obj
 
 # Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
-OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(OLEOBJS)
+OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS)
 
 all:        $(OBJECTS) $(LIBTARGET) $(EXTRATARGETS)
 
@@ -252,6 +265,9 @@ accel.obj:     $(MSWDIR)\accel.cpp
 app.obj:     $(MSWDIR)\app.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+automtn.obj:     $(MSWDIR)\automtn.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 bitmap.obj:     $(MSWDIR)\bitmap.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -267,15 +283,15 @@ button.obj:     $(MSWDIR)\button.cpp
 caret.obj:     $(MSWDIR)\caret.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-choice.obj:     $(MSWDIR)\choice.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
 checkbox.obj:     $(MSWDIR)\checkbox.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 checklst.obj:     $(MSWDIR)\checklst.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+choice.obj:     $(MSWDIR)\choice.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 clipbrd.obj:     $(MSWDIR)\clipbrd.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -300,16 +316,16 @@ cursor.obj:     $(MSWDIR)\cursor.cpp
 data.obj:     $(MSWDIR)\data.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-dde.obj:     $(MSWDIR)\dde.cpp
+dataobj.obj:     $(MSWDIR)\dataobj.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 dc.obj:     $(MSWDIR)\dc.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-dcmemory.obj:     $(MSWDIR)\dcmemory.cpp
+dcclient.obj:     $(MSWDIR)\dcclient.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-dcclient.obj:     $(MSWDIR)\dcclient.cpp
+dcmemory.obj:     $(MSWDIR)\dcmemory.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 dcprint.obj:     $(MSWDIR)\dcprint.cpp
@@ -318,6 +334,9 @@ dcprint.obj:     $(MSWDIR)\dcprint.cpp
 dcscreen.obj:     $(MSWDIR)\dcscreen.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+dde.obj:     $(MSWDIR)\dde.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 dialog.obj:     $(MSWDIR)\dialog.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -330,6 +349,15 @@ dibutils.obj:     $(MSWDIR)\dibutils.cpp
 dirdlg.obj:     $(MSWDIR)\dirdlg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+dragimag.obj:     $(MSWDIR)\dragimag.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+dropsrc.obj:     $(MSWDIR)\dropsrc.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+droptgt.obj:     $(MSWDIR)\droptgt.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 filedlg.obj:     $(MSWDIR)\filedlg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -357,9 +385,6 @@ helpwin.obj:     $(MSWDIR)\helpwin.cpp
 icon.obj:     $(MSWDIR)\icon.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-imaglist.obj:     $(MSWDIR)\imaglist.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
 iniconf.obj:     $(MSWDIR)\iniconf.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -369,9 +394,6 @@ joystick.obj:     $(MSWDIR)\joystick.cpp
 listbox.obj:     $(MSWDIR)\listbox.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-listctrl.obj:     $(MSWDIR)\listctrl.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
 main.obj:     $(MSWDIR)\main.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -396,7 +418,7 @@ msgdlg.obj:     $(MSWDIR)\msgdlg.cpp
 nativdlg.obj:     $(MSWDIR)\nativdlg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-notebook.obj:     $(MSWDIR)\notebook.cpp
+oleutils.obj:     $(MSWDIR)\oleutils.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 ownerdrw.obj:     $(MSWDIR)\ownerdrw.cpp
@@ -411,9 +433,6 @@ pen.obj:     $(MSWDIR)\pen.cpp
 penwin.obj:     $(MSWDIR)\penwin.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-pnghand.obj:     $(MSWDIR)\pnghand.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
 printdlg.obj:     $(MSWDIR)\printdlg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -426,25 +445,25 @@ radiobox.obj:     $(MSWDIR)\radiobox.cpp
 radiobut.obj:     $(MSWDIR)\radiobut.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+regconf.obj:     $(MSWDIR)\regconf.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 region.obj:     $(MSWDIR)\region.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 registry.obj:     $(MSWDIR)\registry.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-regconf.obj:     $(MSWDIR)\regconf.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
 scrolbar.obj:     $(MSWDIR)\scrolbar.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 settings.obj:     $(MSWDIR)\settings.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-slidrmsw.obj:     $(MSWDIR)\slidrmsw.cpp
+slider95.obj:     $(MSWDIR)\slider95.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-slider95.obj:     $(MSWDIR)\slider95.cpp
+slidrmsw.obj:     $(MSWDIR)\slidrmsw.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 spinbutt.obj:     $(MSWDIR)\spinbutt.cpp
@@ -456,10 +475,10 @@ statbmp.obj:     $(MSWDIR)\statbmp.cpp
 statbox.obj:     $(MSWDIR)\statbox.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-statline.obj:     $(MSWDIR)\statline.cpp
+statbr95.obj:     $(MSWDIR)\statbr95.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-statbr95.obj:     $(MSWDIR)\statbr95.cpp
+statline.obj:     $(MSWDIR)\statline.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 stattext.obj:     $(MSWDIR)\stattext.cpp
@@ -489,15 +508,15 @@ timer.obj:     $(MSWDIR)\timer.cpp
 tooltip.obj:     $(MSWDIR)\tooltip.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-treectrl.obj:     $(MSWDIR)\treectrl.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
 utils.obj:     $(MSWDIR)\utils.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 utilsexc.obj:     $(MSWDIR)\utilsexc.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+uuid.obj:     $(MSWDIR)\uuid.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 wave.obj:     $(MSWDIR)\wave.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -507,23 +526,7 @@ window.obj:     $(MSWDIR)\window.cpp
 xpmhand.obj:     $(MSWDIR)\xpmhand.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-droptgt.obj:     $(OLEDIR)\droptgt.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-dropsrc.obj:     $(OLEDIR)\dropsrc.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-dataobj.obj:     $(OLEDIR)\dataobj.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-oleutils.obj:     $(OLEDIR)\oleutils.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-uuid.obj:     $(OLEDIR)\uuid.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-automtn.obj:     $(OLEDIR)\automtn.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 ########################################################
 # Common objects (always compiled)
@@ -534,7 +537,10 @@ cmndata.obj:     $(COMMDIR)\cmndata.cpp
 config.obj:     $(COMMDIR)\config.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-dcbase.obj:     $(COMMDIR)\dcbase.cpp
+date.obj:     $(COMMDIR)\date.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+datstrm.obj:     $(COMMDIR)\datstrm.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 db.obj:     $(COMMDIR)\db.cpp
@@ -543,12 +549,18 @@ db.obj:     $(COMMDIR)\db.cpp
 dbtable.obj:     $(COMMDIR)\dbtable.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-docview.obj:     $(COMMDIR)\docview.cpp
+dcbase.obj:     $(COMMDIR)\dcbase.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+dlgcmn.obj:     $(COMMDIR)\dlgcmn.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 docmdi.obj:     $(COMMDIR)\docmdi.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+docview.obj:     $(COMMDIR)\docview.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 dynarray.obj:     $(COMMDIR)\dynarray.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -567,22 +579,43 @@ fileconf.obj:     $(COMMDIR)\fileconf.cpp
 filefn.obj:     $(COMMDIR)\filefn.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+filesys.obj:     $(COMMDIR)\filesys.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 framecmn.obj:     $(COMMDIR)\framecmn.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+fs_inet.obj:     $(COMMDIR)\fs_inet.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+fs_zip.obj:     $(COMMDIR)\fs_zip.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+ftp.obj:     $(COMMDIR)\ftp.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 gdicmn.obj:     $(COMMDIR)\gdicmn.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-image.obj:     $(COMMDIR)\image.cpp
+hash.obj:     $(COMMDIR)\hash.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+helpbase.obj:     $(COMMDIR)\helpbase.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+http.obj:     $(COMMDIR)\http.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 imagbmp.obj:     $(COMMDIR)\imagbmp.cpp
-  *$(CCC) $(CPPFLAGS) -i=..\png -i=..\zlib $(IFLAGS) $<
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+image.obj:     $(COMMDIR)\image.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+imaggif.obj:     $(COMMDIR)\imaggif.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 imagpng.obj:     $(COMMDIR)\imagpng.cpp
-  *$(CCC) $(CPPFLAGS) -i=..\png -i=..\zlib $(IFLAGS) $<
-
-imagjpeg.obj:     $(COMMDIR)\imagjpeg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 intl.obj:     $(COMMDIR)\intl.cpp
@@ -591,10 +624,10 @@ intl.obj:     $(COMMDIR)\intl.cpp
 ipcbase.obj:     $(COMMDIR)\ipcbase.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-helpbase.obj:     $(COMMDIR)\helpbase.cpp
+layout.obj:     $(COMMDIR)\layout.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-layout.obj:     $(COMMDIR)\layout.cpp
+list.obj:     $(COMMDIR)\list.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 log.obj:     $(COMMDIR)\log.cpp
@@ -609,18 +642,57 @@ mimetype.obj:     $(COMMDIR)\mimetype.cpp
 module.obj:     $(COMMDIR)\module.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+mstream.obj:     $(COMMDIR)\mstream.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 object.obj:     $(COMMDIR)\object.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+objstrm.obj:     $(COMMDIR)\objstrm.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 odbc.obj:     $(COMMDIR)\odbc.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+paper.obj:     $(COMMDIR)\paper.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 prntbase.obj:     $(COMMDIR)\prntbase.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+process.obj:     $(COMMDIR)\process.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+protocol.obj:     $(COMMDIR)\protocol.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 resource.obj:     $(COMMDIR)\resource.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+sckaddr.obj:     $(COMMDIR)\sckaddr.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+sckfile.obj:     $(COMMDIR)\sckfile.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+sckint.obj:     $(COMMDIR)\sckint.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+sckipc.obj:     $(COMMDIR)\sckipc.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+sckstrm.obj:     $(COMMDIR)\sckstrm.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+socket.obj:     $(COMMDIR)\socket.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+stream.obj:     $(COMMDIR)\stream.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+string.obj:     $(COMMDIR)\string.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 tbarbase.obj:     $(COMMDIR)\tbarbase.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -630,103 +702,40 @@ tbarsmpl.obj:     $(COMMDIR)\tbarsmpl.cpp
 textfile.obj:     $(COMMDIR)\textfile.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+time.obj:     $(COMMDIR)\time.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 timercmn.obj:     $(COMMDIR)\timercmn.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-utilscmn.obj:     $(COMMDIR)\utilscmn.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-validate.obj:     $(COMMDIR)\validate.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-valgen.obj:     $(COMMDIR)\valgen.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-valtext.obj:     $(COMMDIR)\valtext.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-date.obj:     $(COMMDIR)\date.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-wxexpr.obj:     $(COMMDIR)\wxexpr.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-hash.obj:     $(COMMDIR)\hash.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-list.obj:     $(COMMDIR)\list.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-paper.obj:     $(COMMDIR)\paper.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-string.obj:     $(COMMDIR)\string.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-socket.obj:     $(COMMDIR)\socket.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-sckint.obj:     $(COMMDIR)\sckint.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-sckaddr.obj:     $(COMMDIR)\sckaddr.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-sckfile.obj:     $(COMMDIR)\sckfile.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-sckipc.obj:     $(COMMDIR)\sckipc.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-sckstrm.obj:     $(COMMDIR)\sckstrm.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-url.obj:     $(COMMDIR)\url.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-http.obj:     $(COMMDIR)\http.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-protocol.obj:     $(COMMDIR)\protocol.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
 tokenzr.obj:     $(COMMDIR)\tokenzr.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-matrix.obj:     $(COMMDIR)\matrix.cpp
+txtstrm.obj:     $(COMMDIR)\txtstrm.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-time.obj:     $(COMMDIR)\time.cpp
+unzip.obj:     $(COMMDIR)\unzip.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-stream.obj:     $(COMMDIR)\stream.cpp
+url.obj:     $(COMMDIR)\url.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-wfstream.obj:     $(COMMDIR)\wfstream.cpp
+utilscmn.obj:     $(COMMDIR)\utilscmn.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-mstream.obj:     $(COMMDIR)\mstream.cpp
+valgen.obj:     $(COMMDIR)\valgen.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-zstream.obj:     $(COMMDIR)\zstream.cpp
+validate.obj:     $(COMMDIR)\validate.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-datstrm.obj:     $(COMMDIR)\datstrm.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-objstrm.obj:     $(COMMDIR)\objstrm.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-extended.obj:     $(COMMDIR)\extended.c
-  *$(CC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\extended.c
-
-process.obj:     $(COMMDIR)\process.cpp
+valtext.obj:     $(COMMDIR)\valtext.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 variant.obj:     $(COMMDIR)\variant.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-dlgcmn.obj:     $(COMMDIR)\dlgcmn.cpp
+wfstream.obj:     $(COMMDIR)\wfstream.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 wincmn.obj:     $(COMMDIR)\wincmn.cpp
@@ -735,6 +744,20 @@ wincmn.obj:     $(COMMDIR)\wincmn.cpp
 wxchar.obj:     $(COMMDIR)\wxchar.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+wxexpr.obj:     $(COMMDIR)\wxexpr.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+zipstream.obj:     $(COMMDIR)\zipstream.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+zstream.obj:     $(COMMDIR)\zstream.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
+
+
+extended.obj:     $(COMMDIR)\extended.c
+  *$(CC) $(CPPFLAGS) $(IFLAGS) $(COMMDIR)\extended.c
+
 y_tab.obj:     $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c
   *$(CC) $(CPPFLAGS) $(IFLAGS) -DUSE_DEFINE $(COMMDIR)\y_tab.c
 
@@ -750,33 +773,24 @@ $(COMMDIR)\lex_yy.c:    $(COMMDIR)\doslex.c
 # Generic objects (not always compiled, depending on
 # whether platforms have native implementations)
 
+busyinfo.obj:     $(GENDIR)\busyinfo.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 choicdgg.obj:     $(GENDIR)\choicdgg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-colrdlgg.obj:     $(GENDIR)\colrdgg.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
-fontdlgg.obj:     $(GENDIR)\fontdlgg.cpp
+extdlgg.obj:     $(GENDIR)\extdlgg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 gridg.obj:     $(GENDIR)\gridg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-helpxlp.obj:     $(GENDIR)\helpxlp.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
 laywin.obj:     $(GENDIR)\laywin.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-msgdlgg.obj:     $(GENDIR)\msgdlgg.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
 panelg.obj:     $(GENDIR)\panelg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-printps.obj:     $(GENDIR)\printps.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
 progdlgg.obj:     $(GENDIR)\progdlgg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -789,9 +803,6 @@ propform.obj:     $(GENDIR)\propform.cpp
 proplist.obj:     $(GENDIR)\proplist.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-prntdlgg.obj:     $(GENDIR)\prntdlgg.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
 sashwin.obj:     $(GENDIR)\sashwin.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
@@ -801,18 +812,17 @@ scrolwin.obj:     $(GENDIR)\scrolwin.cpp
 splitter.obj:     $(GENDIR)\splitter.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-statusbr.obj:     $(GENDIR)\statusbr.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-
 tabg.obj:     $(GENDIR)\tabg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-textdlgg.obj: $(GENDIR)\textdlgg.cpp
+textdlgg.obj:     $(GENDIR)\textdlgg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-tipdlg.obj: $(GENDIR)\tipdlg.cpp
+tipdlg.obj:     $(GENDIR)\tipdlg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+
+
 crbuffri.obj: $(XPMDIR)\crbuffri.c
   *$(CC) $(CPPFLAGS) $(IFLAGS) $<
 
diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp
index 9fdb36b9ef..0a3471b403 100644
--- a/src/msw/textctrl.cpp
+++ b/src/msw/textctrl.cpp
@@ -9,34 +9,47 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
+// ============================================================================
+// declarations
+// ============================================================================
+
 #ifdef __GNUG__
-#pragma implementation "textctrl.h"
+    #pragma implementation "textctrl.h"
 #endif
 
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
 #ifndef WX_PRECOMP
-#include "wx/textctrl.h"
-#include "wx/settings.h"
-#include "wx/brush.h"
-#include "wx/utils.h"
-#include "wx/log.h"
+    #include "wx/textctrl.h"
+    #include "wx/settings.h"
+    #include "wx/brush.h"
+    #include "wx/utils.h"
+    #include "wx/log.h"
 #endif
 
 #if wxUSE_CLIPBOARD
-#include "wx/app.h"
-#include "wx/clipbrd.h"
+    #include "wx/app.h"
+    #include "wx/clipbrd.h"
 #endif
 
+#include "wx/textfile.h"
+
+#include <windowsx.h>
+
 #include "wx/msw/private.h"
 
-#include <windows.h>
+#include <string.h>
 #include <stdlib.h>
+#include <sys/types.h>
 
 #if wxUSE_IOSTREAMH
 #   include <fstream.h>
@@ -44,112 +57,93 @@
 #   include <fstream>
 #endif
 
-#include <sys/types.h>
-#ifndef __MWERKS__
-#include <sys/stat.h>
-#else
-#include <stat.h>
-#endif
-#if defined(__BORLANDC__) && !defined(__WIN32__)
-#include <alloc.h>
-#else
-#if !defined(__GNUWIN32__) && !defined(__SALFORDC__)
-#include <malloc.h>
-#endif
-#define farmalloc malloc
-#define farfree free
-#endif
-#include <windowsx.h>
-
-#include <string.h>
-
 #if wxUSE_RICHEDIT && !defined(__GNUWIN32__)
     #include <richedit.h>
 #endif
 
 #if !USE_SHARED_LIBRARY
 
+// ----------------------------------------------------------------------------
+// event tables and other macros
+// ----------------------------------------------------------------------------
+
 IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxControl)
 
 BEGIN_EVENT_TABLE(wxTextCtrl, wxControl)
-  EVT_CHAR(wxTextCtrl::OnChar)
-  EVT_DROP_FILES(wxTextCtrl::OnDropFiles)
+    EVT_CHAR(wxTextCtrl::OnChar)
+    EVT_DROP_FILES(wxTextCtrl::OnDropFiles)
 
-  EVT_MENU(wxID_CUT, wxTextCtrl::OnCut)
-  EVT_MENU(wxID_COPY, wxTextCtrl::OnCopy)
-  EVT_MENU(wxID_PASTE, wxTextCtrl::OnPaste)
-  EVT_MENU(wxID_UNDO, wxTextCtrl::OnUndo)
-  EVT_MENU(wxID_REDO, wxTextCtrl::OnRedo)
+    EVT_MENU(wxID_CUT, wxTextCtrl::OnCut)
+    EVT_MENU(wxID_COPY, wxTextCtrl::OnCopy)
+    EVT_MENU(wxID_PASTE, wxTextCtrl::OnPaste)
+    EVT_MENU(wxID_UNDO, wxTextCtrl::OnUndo)
+    EVT_MENU(wxID_REDO, wxTextCtrl::OnRedo)
 
-  EVT_UPDATE_UI(wxID_CUT, wxTextCtrl::OnUpdateCut)
-  EVT_UPDATE_UI(wxID_COPY, wxTextCtrl::OnUpdateCopy)
-  EVT_UPDATE_UI(wxID_PASTE, wxTextCtrl::OnUpdatePaste)
-  EVT_UPDATE_UI(wxID_UNDO, wxTextCtrl::OnUpdateUndo)
-  EVT_UPDATE_UI(wxID_REDO, wxTextCtrl::OnUpdateRedo)
+    EVT_UPDATE_UI(wxID_CUT, wxTextCtrl::OnUpdateCut)
+    EVT_UPDATE_UI(wxID_COPY, wxTextCtrl::OnUpdateCopy)
+    EVT_UPDATE_UI(wxID_PASTE, wxTextCtrl::OnUpdatePaste)
+    EVT_UPDATE_UI(wxID_UNDO, wxTextCtrl::OnUpdateUndo)
+    EVT_UPDATE_UI(wxID_REDO, wxTextCtrl::OnUpdateRedo)
 END_EVENT_TABLE()
 
 #endif // USE_SHARED_LIBRARY
 
-// Text item
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// creation
+// ----------------------------------------------------------------------------
+
 wxTextCtrl::wxTextCtrl()
-#ifndef NO_TEXT_WINDOW_STREAM
-          : streambuf()
-#endif
 {
 #if wxUSE_RICHEDIT
-  m_isRich = FALSE;
+    m_isRich = FALSE;
 #endif
 }
 
 bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
                         const wxString& value,
                         const wxPoint& pos,
-                        const wxSize& size, long style,
+                        const wxSize& size,
+                        long style,
                         const wxValidator& validator,
                         const wxString& name)
 {
-  SetName(name);
-  SetValidator(validator);
-  if (parent) parent->AddChild(this);
+    // base initialization
+    if ( !CreateBase(parent, id, pos, size, style, name) )
+        return FALSE;
 
-  m_windowStyle = style;
+    SetValidator(validator);
+    if ( parent )
+        parent->AddChild(this);
 
-  // Should this be taken from the system colours?
-//  SetBackgroundColour(wxColour(255, 255, 255));
+    // set colours
+    SetupColours();
 
-  SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW));
+    // translate wxWin style flags to MSW ones, checking for consistency while
+    // doing it
+    long msStyle = ES_LEFT | WS_VISIBLE | WS_CHILD | WS_TABSTOP;
+    if ( m_windowStyle & wxTE_MULTILINE )
+    {
+        wxASSERT_MSG( !(m_windowStyle & wxTE_PROCESS_ENTER),
+                      _T("wxTE_PROCESS_ENTER style is ignored for multiline "
+                         "text controls (they always process it)") );
 
-  SetForegroundColour(parent->GetForegroundColour()) ;
+        msStyle |= ES_MULTILINE | ES_WANTRETURN | WS_VSCROLL;
+        m_windowStyle |= wxTE_PROCESS_ENTER;
+    }
+    else
+        msStyle |= ES_AUTOHSCROLL;
 
-  if ( id == -1 )
-    m_windowId = (int)NewControlId();
-  else
-  m_windowId = id;
+    if (m_windowStyle & wxTE_READONLY)
+        msStyle |= ES_READONLY;
 
-  int x = pos.x;
-  int y = pos.y;
-  int width = size.x;
-  int height = size.y;
-
-  long msStyle = ES_LEFT | WS_VISIBLE | WS_CHILD | WS_TABSTOP;
-  if (m_windowStyle & wxTE_MULTILINE)
-  {
-    wxASSERT_MSG( !(m_windowStyle & wxTE_PROCESS_ENTER),
-                  _T("wxTE_PROCESS_ENTER style is ignored for multiline controls") );
-
-    msStyle |= ES_MULTILINE | ES_WANTRETURN | WS_VSCROLL ; // WS_BORDER
-    m_windowStyle |= wxTE_PROCESS_ENTER;
-  }
-  else
-    msStyle |= ES_AUTOHSCROLL ;
-
-  if (m_windowStyle & wxTE_READONLY)
-    msStyle |= ES_READONLY;
-
-  if (m_windowStyle & wxHSCROLL)
-    msStyle |= (WS_HSCROLL | ES_AUTOHSCROLL) ;
-  if (m_windowStyle & wxTE_PASSWORD) // hidden input
-    msStyle |= ES_PASSWORD;
+    if (m_windowStyle & wxHSCROLL)
+        msStyle |= (WS_HSCROLL | ES_AUTOHSCROLL);
+    if (m_windowStyle & wxTE_PASSWORD) // hidden input
+        msStyle |= ES_PASSWORD;
 
     // we always want the characters and the arrows
     m_lDlgCode = DLGC_WANTCHARS | DLGC_WANTARROWS;
@@ -166,83 +160,87 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
     if ( m_windowStyle & wxTE_PROCESS_TAB )
         m_lDlgCode |= DLGC_WANTTAB;
 
-  const wxChar *windowClass = _T("EDIT");
+    // do create the control - either an EDIT or RICHEDIT
+    const wxChar *windowClass = _T("EDIT");
 
 #if wxUSE_RICHEDIT
-  if ( m_windowStyle & wxTE_MULTILINE )
-  {
-    msStyle |= ES_AUTOVSCROLL;
-    m_isRich = TRUE;
-    windowClass = _T("RichEdit") ;
-  }
-  else
-    m_isRich = FALSE;
+    // multiline edit controls are RICHEDITs except for those which have a
+    // simple border (VZ: why??)
+    if ( (m_windowStyle & wxTE_MULTILINE) &&
+         !(m_windowStyle & wxSIMPLE_BORDER) )
+    {
+        msStyle |= ES_AUTOVSCROLL;
+        m_isRich = TRUE;
+        windowClass = _T("RICHEDIT");
+    }
+    else
+        m_isRich = FALSE;
 #endif
 
-  bool want3D;
-  WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D) ;
+    bool want3D;
+    WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D);
 
-  // If we're in Win95, and we want a simple 2D border,
-  // then make it an EDIT control instead.
-#if wxUSE_RICHEDIT
-  if (m_windowStyle & wxSIMPLE_BORDER)
-  {
-    windowClass = _T("EDIT");
-    m_isRich = FALSE;
-  }
-#endif
+    // Even with extended styles, need to combine with WS_BORDER for them to
+    // look right.
+    if ( want3D || wxStyleHasBorder(m_windowStyle) )
+        msStyle |= WS_BORDER;
 
-  // Even with extended styles, need to combine with WS_BORDER
-  // for them to look right.
-  if ( want3D || wxStyleHasBorder(m_windowStyle) )
-    msStyle |= WS_BORDER;
+    // NB: don't use pos and size as CreateWindowEx arguments because they
+    //     might be -1 in which case we should use the default values (and
+    //     SetSize called below takes care of it)
+    m_hWnd = (WXHWND)::CreateWindowEx(exStyle,
+                                      windowClass,
+                                      NULL,
+                                      msStyle,
+                                      0, 0, 0, 0,
+                                      GetHwndOf(parent),
+                                      (HMENU)m_windowId,
+                                      wxGetInstance(),
+                                      NULL);
 
-  m_hWnd = (WXHWND)::CreateWindowEx(exStyle, windowClass, NULL,
-                        msStyle,
-                        0, 0, 0, 0, (HWND) ((wxWindow*)parent)->GetHWND(), (HMENU)m_windowId,
-                        wxGetInstance(), NULL);
-
-  wxCHECK_MSG( m_hWnd, FALSE, _T("Failed to create text ctrl") );
+    wxCHECK_MSG( m_hWnd, FALSE, _T("Failed to create text ctrl") );
 
 #if wxUSE_CTL3D
-  if ( want3D )
-  {
-    Ctl3dSubclassCtl((HWND)m_hWnd);
-    m_useCtl3D = TRUE;
-  }
+    if ( want3D )
+    {
+        Ctl3dSubclassCtl(GetHwnd());
+        m_useCtl3D = TRUE;
+    }
 #endif
 
 #if wxUSE_RICHEDIT
-  if (m_isRich)
-  {
-    // Have to enable events
-    ::SendMessage((HWND)m_hWnd, EM_SETEVENTMASK, 0,
-                  ENM_CHANGE | ENM_DROPFILES | ENM_SELCHANGE | ENM_UPDATE);
-  }
+    if (m_isRich)
+    {
+        // Have to enable events
+        ::SendMessage(GetHwnd(), EM_SETEVENTMASK, 0,
+                      ENM_CHANGE | ENM_DROPFILES | ENM_SELCHANGE | ENM_UPDATE);
+    }
 #endif
 
-  SubclassWin(GetHWND());
+    SubclassWin(GetHWND());
 
-  if ( parent->GetFont().Ok() && parent->GetFont().Ok() )
-  {
-    SetFont(parent->GetFont());
-  }
-  else
-  {
-    SetFont(wxSystemSettings::GetSystemFont(wxSYS_SYSTEM_FONT));
-  }
+    // set font, position, size and initial value
+    wxFont& fontParent = parent->GetFont();
+    if ( fontParent.Ok() )
+    {
+        SetFont(fontParent);
+    }
+    else
+    {
+        SetFont(wxSystemSettings::GetSystemFont(wxSYS_SYSTEM_FONT));
+    }
 
-  SetSize(x, y, width, height);
-
-  // Causes a crash for Symantec C++ and WIN32 for some reason
+    // Causes a crash for Symantec C++ and WIN32 for some reason
 #if !(defined(__SC__) && defined(__WIN32__))
-  if ( !value.IsEmpty() )
-  {
-    SetValue(value);
-  }
+    if ( !value.IsEmpty() )
+    {
+        SetValue(value);
+    }
 #endif
 
-  return TRUE;
+    SetSize(pos.x, pos.y, size.x, size.y);
+
+    return TRUE;
 }
 
 // Make sure the window style (etc.) reflects the HWND style (roughly)
@@ -251,34 +249,19 @@ void wxTextCtrl::AdoptAttributesFromHWND()
   wxWindow::AdoptAttributesFromHWND();
 
   HWND hWnd = GetHwnd();
-  long style = GetWindowLong((HWND) hWnd, GWL_STYLE);
+  long style = GetWindowLong(hWnd, GWL_STYLE);
 
   // retrieve the style to see whether this is an edit or richedit ctrl
 #if wxUSE_RICHEDIT
   wxChar buf[256];
 
-#ifndef __WIN32__
-  GetClassName((HWND) hWnd, buf, 256);
-#else
-#ifdef UNICODE
-  GetClassNameW((HWND) hWnd, buf, 256);
-#else
-#ifdef __TWIN32__
-  GetClassName((HWND) hWnd, buf, 256);
-#else
-  GetClassNameA((HWND) hWnd, buf, 256);
-#endif
-#endif
-#endif
+  GetClassName(hWnd, buf, WXSIZEOF(buf));
 
-  wxString str(buf);
-  str.UpperCase();
-
-  if (str == _T("EDIT"))
+  if ( wxStricmp(buf, _T("EDIT")) == 0 )
     m_isRich = FALSE;
   else
     m_isRich = TRUE;
-#endif
+#endif // wxUSE_RICHEDIT
 
   if (style & ES_MULTILINE)
     m_windowStyle |= wxTE_MULTILINE;
@@ -292,10 +275,15 @@ void wxTextCtrl::AdoptAttributesFromHWND()
 
 void wxTextCtrl::SetupColours()
 {
-  SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW));
-  SetForegroundColour(GetParent()->GetForegroundColour());
+    // FIXME why is bg colour not inherited from parent?
+    SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW));
+    SetForegroundColour(GetParent()->GetForegroundColour());
 }
 
+// ----------------------------------------------------------------------------
+// set/get the controls text
+// ----------------------------------------------------------------------------
+
 wxString wxTextCtrl::GetValue() const
 {
     return wxGetWindowText(GetHWND());
@@ -303,51 +291,37 @@ wxString wxTextCtrl::GetValue() const
 
 void wxTextCtrl::SetValue(const wxString& value)
 {
-  // If newlines are denoted by just 10, must stick 13 in front.
-  int singletons = 0;
-  int len = value.Length();
-  int i;
-  for (i = 0; i < len; i ++)
-  {
-    if ((i > 0) && (value[i] == 10) && (value[i-1] != 13))
-      singletons ++;
-  }
-  if (singletons > 0)
-  {
-    wxChar *tmp = new wxChar[len + singletons + 1];
-    int j = 0;
-    for (i = 0; i < len; i ++)
-    {
-      if ((i > 0) && (value[i] == 10) && (value[i-1] != 13))
-      {
-        tmp[j] = 13;
-        j ++;
-      }
-      tmp[j] = value[i];
-      j ++;
-    }
-    tmp[j] = 0;
-    SetWindowText(GetHwnd(), tmp);
-    delete[] tmp;
-  }
-  else
-    SetWindowText(GetHwnd(), (const wxChar *)value);
+    wxString valueDos = wxTextFile::Translate(value, wxTextFileType_Dos);
 
-  AdjustSpaceLimit();
+    SetWindowText(GetHwnd(), valueDos);
+
+    AdjustSpaceLimit();
 }
 
-wxSize wxTextCtrl::DoGetBestSize()
+void wxTextCtrl::WriteText(const wxString& value)
 {
-    int cx, cy;
-    wxGetCharSize(GetHWND(), &cx, &cy, &GetFont());
+    wxString valueDos = wxTextFile::Translate(value, wxTextFileType_Dos);
 
-    int wText = DEFAULT_ITEM_WIDTH;
-    int hText = EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy);
+    SendMessage(GetHwnd(), EM_REPLACESEL, 0, (LPARAM)valueDos.c_str());
 
-    return wxSize(wText, hText);
+    AdjustSpaceLimit();
 }
 
+void wxTextCtrl::AppendText(const wxString& text)
+{
+    SetInsertionPointEnd();
+    WriteText(text);
+}
+
+void wxTextCtrl::Clear()
+{
+    SetWindowText(GetHwnd(), _T(""));
+}
+
+// ----------------------------------------------------------------------------
 // Clipboard operations
+// ----------------------------------------------------------------------------
+
 void wxTextCtrl::Copy()
 {
     if (CanCopy())
@@ -375,59 +349,103 @@ void wxTextCtrl::Paste()
     }
 }
 
+bool wxTextCtrl::CanCopy() const
+{
+    // Can copy if there's a selection
+    long from, to;
+    GetSelection(& from, & to);
+    return (from != to);
+}
+
+bool wxTextCtrl::CanCut() const
+{
+    // Can cut if there's a selection
+    long from, to;
+    GetSelection(& from, & to);
+    return (from != to);
+}
+
+bool wxTextCtrl::CanPaste() const
+{
+#if wxUSE_RICHEDIT
+    if (m_isRich)
+    {
+        int dataFormat = 0; // 0 == any format
+        return (::SendMessage( GetHwnd(), EM_CANPASTE, (WPARAM) (UINT) dataFormat, 0) != 0);
+    }
+#endif
+    if (!IsEditable())
+        return FALSE;
+
+    // Standard edit control: check for straight text on clipboard
+    bool isTextAvailable = FALSE;
+    if ( ::OpenClipboard(GetHwndOf(wxTheApp->GetTopWindow())) )
+    {
+        isTextAvailable = (::IsClipboardFormatAvailable(CF_TEXT) != 0);
+        ::CloseClipboard();
+    }
+
+    return isTextAvailable;
+}
+
+// ----------------------------------------------------------------------------
+// Accessors
+// ----------------------------------------------------------------------------
+
 void wxTextCtrl::SetEditable(bool editable)
 {
-  HWND hWnd = GetHwnd();
-  SendMessage(hWnd, EM_SETREADONLY, (WPARAM)!editable, (LPARAM)0L);
+    HWND hWnd = GetHwnd();
+    SendMessage(hWnd, EM_SETREADONLY, (WPARAM)!editable, (LPARAM)0L);
 }
 
 void wxTextCtrl::SetInsertionPoint(long pos)
 {
-  HWND hWnd = GetHwnd();
+    HWND hWnd = GetHwnd();
 #ifdef __WIN32__
 #if wxUSE_RICHEDIT
-  if ( m_isRich)
-  {
-    CHARRANGE range;
-    range.cpMin = pos;
-    range.cpMax = pos;
-    SendMessage(hWnd, EM_EXSETSEL, 0, (LPARAM) &range);
-    SendMessage(hWnd, EM_SCROLLCARET, (WPARAM)0, (LPARAM)0);
-  }
-  else
-#endif
-  {
-    SendMessage(hWnd, EM_SETSEL, pos, pos);
-    SendMessage(hWnd, EM_SCROLLCARET, (WPARAM)0, (LPARAM)0);
-  }
-#else
-  SendMessage(hWnd, EM_SETSEL, 0, MAKELPARAM(pos, pos));
-#endif
-  char *nothing = "";
-  SendMessage(hWnd, EM_REPLACESEL, 0, (LPARAM)nothing);
+    if ( m_isRich)
+    {
+        CHARRANGE range;
+        range.cpMin = pos;
+        range.cpMax = pos;
+        SendMessage(hWnd, EM_EXSETSEL, 0, (LPARAM) &range);
+        SendMessage(hWnd, EM_SCROLLCARET, (WPARAM)0, (LPARAM)0);
+    }
+    else
+#endif // wxUSE_RICHEDIT
+    {
+        SendMessage(hWnd, EM_SETSEL, pos, pos);
+        SendMessage(hWnd, EM_SCROLLCARET, (WPARAM)0, (LPARAM)0);
+    }
+#else // Win16
+    SendMessage(hWnd, EM_SETSEL, 0, MAKELPARAM(pos, pos));
+#endif // Win32/16
+
+    static const char *nothing = "";
+    SendMessage(hWnd, EM_REPLACESEL, 0, (LPARAM)nothing);
 }
 
 void wxTextCtrl::SetInsertionPointEnd()
 {
-  long pos = GetLastPosition();
-  SetInsertionPoint(pos);
+    long pos = GetLastPosition();
+    SetInsertionPoint(pos);
 }
 
 long wxTextCtrl::GetInsertionPoint() const
 {
 #if wxUSE_RICHEDIT
-  if (m_isRich)
-  {
-    CHARRANGE range;
-    range.cpMin = 0;
-    range.cpMax = 0;
-    SendMessage(GetHwnd(), EM_EXGETSEL, 0, (LPARAM) &range);
-    return range.cpMin;
-  }
+    if (m_isRich)
+    {
+        CHARRANGE range;
+        range.cpMin = 0;
+        range.cpMax = 0;
+        SendMessage(GetHwnd(), EM_EXGETSEL, 0, (LPARAM) &range);
+        return range.cpMin;
+    }
 #endif
 
-  DWORD Pos=(DWORD)SendMessage(GetHwnd(), EM_GETSEL, 0, 0L);
-  return Pos&0xFFFF;
+    DWORD Pos = (DWORD)SendMessage(GetHwnd(), EM_GETSEL, 0, 0L);
+    return Pos & 0xFFFF;
 }
 
 long wxTextCtrl::GetLastPosition() const
@@ -447,6 +465,43 @@ long wxTextCtrl::GetLastPosition() const
     return (long)(charIndex + lineLength);
 }
 
+// If the return values from and to are the same, there is no
+// selection.
+void wxTextCtrl::GetSelection(long* from, long* to) const
+{
+#if wxUSE_RICHEDIT
+    if (m_isRich)
+    {
+        CHARRANGE charRange;
+        ::SendMessage(GetHwnd(), EM_EXGETSEL, 0, (LPARAM) (CHARRANGE*) & charRange);
+
+        *from = charRange.cpMin;
+        *to = charRange.cpMax;
+
+        return;
+    }
+#endif
+    DWORD dwStart, dwEnd;
+    WPARAM wParam = (WPARAM) (DWORD*) & dwStart; // receives starting position
+    LPARAM lParam = (LPARAM) (DWORD*) & dwEnd;   // receives ending position
+
+    ::SendMessage(GetHwnd(), EM_GETSEL, wParam, lParam);
+
+    *from = dwStart;
+    *to = dwEnd;
+}
+
+bool wxTextCtrl::IsEditable() const
+{
+    long style = ::GetWindowLong(GetHwnd(), GWL_STYLE);
+
+    return ((style & ES_READONLY) == 0);
+}
+
+// ----------------------------------------------------------------------------
+// Editing
+// ----------------------------------------------------------------------------
+
 void wxTextCtrl::Replace(long from, long to, const wxString& value)
 {
 #if wxUSE_CLIPBOARD
@@ -492,9 +547,9 @@ void wxTextCtrl::SetSelection(long from, long to)
     HWND hWnd = GetHwnd();
     long fromChar = from;
     long toChar = to;
-    // if from and to are both -1, it means
-    // (in wxWindows) that all text should be selected.
-    // This translates into Windows convention
+
+    // if from and to are both -1, it means (in wxWindows) that all text should
+    // be selected. Translate into Windows convention
     if ((from == -1) && (to == -1))
     {
       fromChar = 0;
@@ -512,142 +567,15 @@ void wxTextCtrl::SetSelection(long from, long to)
 
 bool wxTextCtrl::LoadFile(const wxString& file)
 {
-  if (!wxFileExists(WXSTRINGCAST file))
+    if ( wxTextCtrlBase::LoadFile(file) )
+    {
+        // update the size limit if needed
+        AdjustSpaceLimit();
+
+        return TRUE;
+    }
+
     return FALSE;
-
-  m_fileName = file;
-
-  Clear();
-
-//  ifstream input(WXSTRINGCAST file, ios::nocreate | ios::in);
-  ifstream input(MBSTRINGCAST file.mb_str(wxConvFile), ios::in);
-
-  if (!input.bad())
-  {
-      // Previously a SETSEL/REPLACESEL call-pair were done to insert
-      // line by line into the control. Apart from being very slow this
-      // was limited to 32K of text by the external interface presenting
-      // positions as signed shorts. Now load in one chunk...
-      // Note use of 'farmalloc' as in Borland 3.1 'size_t' is 16-bits...
-
-#ifdef __SALFORDC__
-      struct _stat stat_buf;
-      if (stat(MBSTRINGCAST file.mb_str(wxConvFile), &stat_buf) < 0)
-        return FALSE;
-#else
-      struct stat stat_buf;
-      if (stat(file.mb_str(wxConvFile), &stat_buf) < 0)
-        return FALSE;
-#endif
-
-//      wxChar *tmp_buffer = (wxChar*)farmalloc(stat_buf.st_size+1);
-      // This may need to be a bigger buffer than the file size suggests,
-      // if it's a UNIX file. Give it an extra 1000 just in case.
-      wxChar *tmp_buffer = (wxChar*)farmalloc((size_t)(stat_buf.st_size+1+1000));
-      char *read_buffer = new char[512];
-      long no_lines = 0;
-      long pos = 0;
-      while (!input.eof() && input.peek() != EOF)
-      {
-        input.getline(read_buffer, 500);
-  int len = strlen(read_buffer);
-  wxBuffer[len] = 13;
-  wxBuffer[len+1] = 10;
-  wxBuffer[len+2] = 0;
-#if wxUSE_UNICODE
-  pos += wxConvCurrent->MB2WC(tmp_buffer+pos, read_buffer, (size_t)-1);
-#else
-  strcpy(tmp_buffer+pos, read_buffer);
-  pos += strlen(read_buffer);
-#endif
-  no_lines++;
-      }
-      delete[] read_buffer;
-
-      SetWindowText(GetHwnd(), tmp_buffer);
-      SendMessage(GetHwnd(), EM_SETMODIFY, FALSE, 0L);
-      farfree(tmp_buffer);
-
-      // update the size limit if needed
-      AdjustSpaceLimit();
-
-      return TRUE;
-  }
-  return FALSE;
-}
-
-// If file is null, try saved file name first
-// Returns TRUE if succeeds.
-bool wxTextCtrl::SaveFile(const wxString& file)
-{
-    wxString theFile(file);
-
-    if (theFile == _T(""))
-        theFile = m_fileName;
-
-    if (theFile == _T(""))
-        return FALSE;
-
-    m_fileName = theFile;
-
-    ofstream output(MBSTRINGCAST theFile.mb_str(wxConvFile));
-    if (output.bad())
-        return FALSE;
-
-    // This will only save 64K max
-    unsigned long nbytes = SendMessage(GetHwnd(), WM_GETTEXTLENGTH, 0, 0);
-    char *tmp_buffer = (char*)farmalloc((size_t)(nbytes+1));
-    SendMessage(GetHwnd(), WM_GETTEXT, (WPARAM)(nbytes+1), (LPARAM)tmp_buffer);
-    char *pstr = tmp_buffer;
-
-    // Convert \r\n to just \n
-    while (*pstr)
-    {
-      if (*pstr != '\r')
-        output << *pstr;
-      pstr++;
-    }
-
-    farfree(tmp_buffer);
-    SendMessage(GetHwnd(), EM_SETMODIFY, FALSE, 0L);
-
-    return TRUE;
-}
-
-void wxTextCtrl::WriteText(const wxString& text)
-{
-    // Covert \n to \r\n
-    int len = text.Length();
-    char *newtext = new char[(len*2)+1];
-    int i = 0;
-    int j = 0;
-    while (i < len)
-    {
-      if (text[i] == '\n')
-      {
-        newtext[j] = '\r';
-        j ++;
-      }
-      newtext[j] = text[i];
-      i ++;
-      j ++;
-    }
-    newtext[j] = 0;
-    SendMessage(GetHwnd(), EM_REPLACESEL, 0, (LPARAM)newtext);
-    delete[] newtext;
-
-    AdjustSpaceLimit();
-}
-
-void wxTextCtrl::AppendText(const wxString& text)
-{
-    SetInsertionPointEnd();
-    WriteText(text);
-}
-
-void wxTextCtrl::Clear()
-{
-    SetWindowText(GetHwnd(), _T(""));
 }
 
 bool wxTextCtrl::IsModified() const
@@ -658,14 +586,9 @@ bool wxTextCtrl::IsModified() const
 // Makes 'unmodified'
 void wxTextCtrl::DiscardEdits()
 {
-  SendMessage(GetHwnd(), EM_SETMODIFY, FALSE, 0L);
+    SendMessage(GetHwnd(), EM_SETMODIFY, FALSE, 0L);
 }
 
-/*
- * Some of the following functions are yet to be implemented
- *
- */
-
 int wxTextCtrl::GetNumberOfLines() const
 {
     return (int)SendMessage(GetHwnd(), EM_GETLINECOUNT, (WPARAM)0, (LPARAM)0);
@@ -727,7 +650,7 @@ int wxTextCtrl::GetLineLength(long lineNo) const
 
 wxString wxTextCtrl::GetLineText(long lineNo) const
 {
-    size_t len = (size_t)GetLineLength(lineNo);
+    size_t len = (size_t)GetLineLength(lineNo) + 1;
     char *buf = (char *)malloc(len);
     *(WORD *)buf = len;
     int noChars = (int)SendMessage(GetHwnd(), EM_GETLINE, lineNo, (LPARAM)buf);
@@ -740,45 +663,10 @@ wxString wxTextCtrl::GetLineText(long lineNo) const
     return str;
 }
 
-bool wxTextCtrl::CanCopy() const
-{
-    // Can copy if there's a selection
-    long from, to;
-    GetSelection(& from, & to);
-    return (from != to) ;
-}
-
-bool wxTextCtrl::CanCut() const
-{
-    // Can cut if there's a selection
-    long from, to;
-    GetSelection(& from, & to);
-    return (from != to) ;
-}
-
-bool wxTextCtrl::CanPaste() const
-{
-#if wxUSE_RICHEDIT
-    if (m_isRich)
-    {
-        int dataFormat = 0; // 0 == any format
-        return (::SendMessage( GetHwnd(), EM_CANPASTE, (WPARAM) (UINT) dataFormat, 0) != 0);
-    }
-#endif
-    if (!IsEditable())
-        return FALSE;
-
-    // Standard edit control: check for straight text on clipboard
-    bool isTextAvailable = FALSE;
-    if (::OpenClipboard((HWND) wxTheApp->GetTopWindow()->GetHWND()))
-    {
-        isTextAvailable = (::IsClipboardFormatAvailable(CF_TEXT) != 0);
-        ::CloseClipboard();
-    }
-    return isTextAvailable;
-}
-
+// ----------------------------------------------------------------------------
 // Undo/redo
+// ----------------------------------------------------------------------------
+
 void wxTextCtrl::Undo()
 {
     if (CanUndo())
@@ -806,255 +694,47 @@ bool wxTextCtrl::CanRedo() const
     return (::SendMessage(GetHwnd(), EM_CANUNDO, 0, 0) != 0);
 }
 
-// If the return values from and to are the same, there is no
-// selection.
-void wxTextCtrl::GetSelection(long* from, long* to) const
-{
-#if wxUSE_RICHEDIT
-    if (m_isRich)
-    {
-        CHARRANGE charRange;
-        ::SendMessage(GetHwnd(), EM_EXGETSEL, 0, (LPARAM) (CHARRANGE*) & charRange);
-
-        *from = charRange.cpMin;
-        *to = charRange.cpMax;
-
-        return;
-    }
-#endif
-    DWORD dwStart, dwEnd;
-    WPARAM wParam = (WPARAM) (DWORD*) & dwStart; // receives starting position
-    LPARAM lParam = (LPARAM) (DWORD*) & dwEnd;   // receives ending position
-
-    ::SendMessage(GetHwnd(), EM_GETSEL, wParam, lParam);
-
-    *from = dwStart;
-    *to = dwEnd;
-}
-
-bool wxTextCtrl::IsEditable() const
-{
-    long style = ::GetWindowLong(GetHwnd(), GWL_STYLE);
-
-    return ((style & ES_READONLY) == 0);
-}
+// ----------------------------------------------------------------------------
+// implemenation details
+// ----------------------------------------------------------------------------
 
 void wxTextCtrl::Command(wxCommandEvent & event)
 {
-  SetValue (event.GetString());
-  ProcessCommand (event);
+    SetValue(event.GetString());
+    ProcessCommand (event);
 }
 
 void wxTextCtrl::OnDropFiles(wxDropFilesEvent& event)
 {
-  // By default, load the first file into the text window.
-  if (event.GetNumberOfFiles() > 0)
-  {
-    LoadFile(event.GetFiles()[0]);
-  }
-}
-
-// The streambuf code was partly taken from chapter 3 by Jerry Schwarz of
-// AT&T's "C++ Lanuage System Release 3.0 Library Manual" - Stein Somers
-
-//=========================================================================
-// Called then the buffer is full (gcc 2.6.3)
-// or when "endl" is output (Borland 4.5)
-//=========================================================================
-// Class declaration using multiple inheritance doesn't work properly for
-// Borland. See note in textctrl.h.
-#ifndef NO_TEXT_WINDOW_STREAM
-int wxTextCtrl::overflow(int c)
-{
-  // Make sure there is a holding area
-  // this is not needed in <iostream> usage as it automagically allocates
-  // it, but does someone want to emulate it for safety's sake?
-#if wxUSE_IOSTREAMH
-  if ( allocate()==EOF )
-  {
-    wxLogError("Streambuf allocation failed");
-    return EOF;
-  }
-#endif
-
-  // Verify that there are no characters in get area
-  if ( gptr() && gptr() < egptr() )
-  {
-     wxError("Who's trespassing my get area?","Internal error");
-     return EOF;
-  }
-
-  // Reset get area
-  setg(0,0,0);
-
-  // Make sure there is a put area
-  if ( ! pptr() )
-  {
-/* This doesn't seem to be fatal so comment out error message */
-//    wxError("Put area not opened","Internal error");
-
-#if wxUSE_IOSTREAMH
-	  setp( base(), base() );
-#else
-	  setp( pbase(), pbase() );
-#endif
-  }
-
-  // Determine how many characters have been inserted but no consumed
-  int plen = pptr() - pbase();
-
-  // Now Jerry relies on the fact that the buffer is at least 2 chars
-  // long, but the holding area "may be as small as 1" ???
-  // And we need an additional \0, so let's keep this inefficient but
-  // safe copy.
-
-  // If c!=EOF, it is a character that must also be comsumed
-  int xtra = c==EOF? 0 : 1;
-
-  // Write temporary C-string to wxTextWindow
-  {
-  char *txt = new char[plen+xtra+1];
-  memcpy(txt, pbase(), plen);
-  txt[plen] = (char)c;     // append c
-  txt[plen+xtra] = '\0';   // append '\0' or overwrite c
-    // If the put area already contained \0, output will be truncated there
-  AppendText(txt);
-    delete[] txt;
-  }
-
-  // Reset put area
-  setp(pbase(), epptr());
-
-#if defined(__WATCOMC__)
-  return __NOT_EOF;
-#elif defined(zapeof)     // HP-UX (all cfront based?)
-  return zapeof(c);
-#else
-  return c!=EOF ? c : 0;  // this should make everybody happy
-#endif
-
-/* OLD CODE
-  int len = pptr() - pbase();
-  char *txt = new char[len+1];
-  strncpy(txt, pbase(), len);
-  txt[len] = '\0';
-  (*this) << txt;
-  setp(pbase(), epptr());
-  delete[] txt;
-  return EOF;
-*/
-}
-
-//=========================================================================
-// called then "endl" is output (gcc) or then explicit sync is done (Borland)
-//=========================================================================
-int wxTextCtrl::sync()
-{
-  // Verify that there are no characters in get area
-  if ( gptr() && gptr() < egptr() )
-  {
-     wxError("Who's trespassing my get area?","Internal error");
-     return EOF;
-  }
-
-  if ( pptr() && pptr() > pbase() ) return overflow(EOF);
-
-  return 0;
-/* OLD CODE
-  int len = pptr() - pbase();
-  char *txt = new char[len+1];
-  strncpy(txt, pbase(), len);
-  txt[len] = '\0';
-  (*this) << txt;
-  setp(pbase(), epptr());
-  delete[] txt;
-  return 0;
-*/
-}
-
-//=========================================================================
-// Should not be called by a "ostream". Used by a "istream"
-//=========================================================================
-int wxTextCtrl::underflow()
-{
-  return EOF;
-}
-#endif
-
-wxTextCtrl& wxTextCtrl::operator<<(const wxString& s)
-{
-    AppendText(s);
-    return *this;
-}
-
-wxTextCtrl& wxTextCtrl::operator<<(float f)
-{
-    wxString str;
-    str.Printf(_T("%.2f"), f);
-    AppendText(str);
-    return *this;
-}
-
-wxTextCtrl& wxTextCtrl::operator<<(double d)
-{
-    wxString str;
-    str.Printf(_T("%.2f"), d);
-    AppendText(str);
-    return *this;
-}
-
-wxTextCtrl& wxTextCtrl::operator<<(int i)
-{
-    wxString str;
-    str.Printf(_T("%d"), i);
-    AppendText(str);
-    return *this;
-}
-
-wxTextCtrl& wxTextCtrl::operator<<(long i)
-{
-    wxString str;
-    str.Printf(_T("%ld"), i);
-    AppendText(str);
-    return *this;
-}
-
-wxTextCtrl& wxTextCtrl::operator<<(const char c)
-{
-    char buf[2];
-
-    buf[0] = c;
-    buf[1] = 0;
-    AppendText(buf);
-    return *this;
+    // By default, load the first file into the text window.
+    if (event.GetNumberOfFiles() > 0)
+    {
+        LoadFile(event.GetFiles()[0]);
+    }
 }
 
 WXHBRUSH wxTextCtrl::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
-      WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
+                                WXUINT message, WXWPARAM wParam,
+                                WXLPARAM lParam)
 {
 #if wxUSE_CTL3D
-  if ( m_useCtl3D )
-  {
-    HBRUSH hbrush = Ctl3dCtlColorEx(message, wParam, lParam);
-    return (WXHBRUSH) hbrush;
-  }
+    if ( m_useCtl3D )
+    {
+        HBRUSH hbrush = Ctl3dCtlColorEx(message, wParam, lParam);
+        return (WXHBRUSH) hbrush;
+    }
 #endif
 
-  if (GetParent()->GetTransparentBackground())
-    SetBkMode((HDC) pDC, TRANSPARENT);
-  else
-    SetBkMode((HDC) pDC, OPAQUE);
+    HDC hdc = (HDC)pDC;
+    SetBkMode(hdc, GetParent()->GetTransparentBackground() ? TRANSPARENT
+                                                           : OPAQUE);
 
-  ::SetBkColor((HDC) pDC, RGB(GetBackgroundColour().Red(), GetBackgroundColour().Green(), GetBackgroundColour().Blue()));
-  ::SetTextColor((HDC) pDC, RGB(GetForegroundColour().Red(), GetForegroundColour().Green(), GetForegroundColour().Blue()));
+    ::SetBkColor(hdc, RGB(GetBackgroundColour().Red(), GetBackgroundColour().Green(), GetBackgroundColour().Blue()));
+    ::SetTextColor(hdc, RGB(GetForegroundColour().Red(), GetForegroundColour().Green(), GetForegroundColour().Blue()));
 
-  wxBrush *backgroundBrush = wxTheBrushList->FindOrCreateBrush(GetBackgroundColour(), wxSOLID);
+    wxBrush *backgroundBrush = wxTheBrushList->FindOrCreateBrush(GetBackgroundColour(), wxSOLID);
 
-  // Note that this will be cleaned up in wxApp::OnIdle, if backgroundBrush
-  // has a zero usage count.
-  // NOT NOW - will be cleaned up at end of app.
-//  backgroundBrush->RealizeResource();
-  return (WXHBRUSH) backgroundBrush->GetResourceHandle();
+    return (WXHBRUSH) backgroundBrush->GetResourceHandle();
 }
 
 void wxTextCtrl::OnChar(wxKeyEvent& event)
@@ -1170,32 +850,32 @@ void wxTextCtrl::AdjustSpaceLimit()
 #endif
 }
 
-// For Rich Edit controls. Do we need it?
-#if 0
-#if wxUSE_RICHEDIT
-bool wxTextCtrl::MSWOnNotify(WXWPARAM wParam, WXLPARAM lParam)
+bool wxTextCtrl::AcceptsFocus() const
 {
-  wxCommandEvent event(0, m_windowId);
-  int eventType = 0;
-  NMHDR *hdr1 = (NMHDR *) lParam;
-  switch ( hdr1->code )
-  {
-    // Insert case code here
-    default :
-      return wxControl::MSWOnNotify(wParam, lParam);
-      break;
-  }
-
-  event.SetEventObject( this );
-  event.SetEventType(eventType);
-
-  if ( !GetEventHandler()->ProcessEvent(event) )
-    return FALSE;
-
-    return TRUE;
+    // we don't want focus if we can't be edited
+    return IsEditable() && wxControl::AcceptsFocus();
 }
-#endif
-#endif
+
+wxSize wxTextCtrl::DoGetBestSize()
+{
+    int cx, cy;
+    wxGetCharSize(GetHWND(), &cx, &cy, &GetFont());
+
+    int wText = DEFAULT_ITEM_WIDTH;
+
+    int hText = EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy);
+    if ( m_windowStyle & wxTE_MULTILINE )
+    {
+        hText *= wxMin(GetNumberOfLines(), 5);
+    }
+    //else: for single line control everything is ok
+
+    return wxSize(wText, hText);
+}
+
+// ----------------------------------------------------------------------------
+// standard handlers for standard edit menu events
+// ----------------------------------------------------------------------------
 
 void wxTextCtrl::OnCut(wxCommandEvent& event)
 {
@@ -1247,8 +927,3 @@ void wxTextCtrl::OnUpdateRedo(wxUpdateUIEvent& event)
     event.Enable( CanRedo() );
 }
 
-bool wxTextCtrl::AcceptsFocus() const
-{
-    // we don't want focus if we can't be edited
-    return IsEditable() && wxControl::AcceptsFocus();
-}
diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 0ef636447c..0442867815 100644
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -1828,8 +1828,8 @@ long wxWindow::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
         case WM_MBUTTONUP:
         case WM_MBUTTONDBLCLK:
             {
-                int x = LOWORD(lParam);
-                int y = HIWORD(lParam);
+                short x = LOWORD(lParam);
+                short y = HIWORD(lParam);
 
                 processed = HandleMouseEvent(message, x, y, wParam);
             }