Changes for 16-bit BC++ (not there yet), GnuWin32; typetest sample

fixed; some documentation fixes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1271 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1998-12-28 12:35:49 +00:00
parent 754330c05f
commit 6244848856
85 changed files with 1475 additions and 1064 deletions
--- a/src/common/dynlib.cpp
+++ b/src/common/dynlib.cpp
@@ -175,8 +175,12 @@ wxLibrary *wxLibraries::LoadLibrary(const wxString& name)

 #ifdef UNICODE
  HMODULE handle = LoadLibraryW(lib_name);
+#else
+#ifdef __WIN16__
+  HMODULE handle = ::LoadLibrary(lib_name);
 #else
  HMODULE handle = LoadLibraryA(lib_name);
+#endif
 #endif
  if (!handle)
    return NULL;
--- a/src/common/image.cpp
+++ b/src/common/image.cpp
@@ -688,6 +688,9 @@ bool wxBMPHandler::LoadFile( wxImage *image, const wxString& name )
 #define BI_RGB       0
 #define BI_RLE8      1
 #define BI_RLE4      2
+#endif
+
+#ifndef BI_BITFIELDS
 #define BI_BITFIELDS 3
 #endif

--- a/src/common/list.cpp
+++ b/src/common/list.cpp
@@ -145,7 +145,7 @@ int wxNodeBase::IndexOf() const
 // wxListBase
 // -----------------------------------------------------------------------------

-void wxListBase::Init(wxKeyType keyType = wxKEY_NONE)
+void wxListBase::Init(wxKeyType keyType)
 {
  m_nodeFirst =
  m_nodeLast = (wxNodeBase *) NULL;
--- a/src/common/socket.cpp
+++ b/src/common/socket.cpp
@@ -469,12 +469,22 @@ void wxSocketBase::Discard()
 bool wxSocketBase::GetPeer(wxSockAddress& addr_man) const
 {
  struct sockaddr my_addr;
+#ifdef __WXMSW__
+  int len_addr = sizeof(my_addr);
+#else
  size_t len_addr = sizeof(my_addr);
+#endif

  if (m_fd < 0)
    return FALSE;

-  if (getpeername(m_fd, (struct sockaddr *)&my_addr, (socklen_t *)&len_addr) < 0)
+  if (getpeername(m_fd, (struct sockaddr *)&my_addr,
+#ifdef __WXMSW__
+    &len_addr)
+#else
+    (socklen_t *)&len_addr)
+#endif
+     < 0)
    return FALSE;

  addr_man.Disassemble(&my_addr, len_addr);
@@ -484,12 +494,23 @@ bool wxSocketBase::GetPeer(wxSockAddress& addr_man) const
 bool wxSocketBase::GetLocal(wxSockAddress& addr_man) const
 {
  struct sockaddr my_addr;
+#ifdef __WXMSW__
+  int len_addr = sizeof(my_addr);
+#else
  size_t len_addr = sizeof(my_addr);
+#endif

  if (m_fd < 0)
    return FALSE;

-  if (getsockname(m_fd, (struct sockaddr *)&my_addr, (socklen_t *)&len_addr) < 0)
+  if (getsockname(m_fd, (struct sockaddr *)&my_addr,
+#ifdef __WXMSW__
+    &len_addr)
+#else
+    (socklen_t *)&len_addr)
+#endif
+     < 0)
+
    return FALSE;

  addr_man.Disassemble(&my_addr, len_addr);
--- a/src/common/string.cpp
+++ b/src/common/string.cpp
@@ -1116,6 +1116,8 @@ size_t wxString::find(const char* sz, size_t nStart, size_t n) const
 }
 #endif

+// Gives a duplicate symbol (presumably a case-insensitivity problem)
+#if !defined(__BORLANDC__)
 size_t wxString::find(char ch, size_t nStart) const
 {
  wxASSERT( nStart <= Len() );
@@ -1124,6 +1126,7 @@ size_t wxString::find(char ch, size_t nStart) const

  return p == NULL ? npos : p - c_str();
 }
+#endif

 size_t wxString::rfind(const wxString& str, size_t nStart) const
 {
--- a/src/common/variant.cpp
+++ b/src/common/variant.cpp
@@ -627,9 +627,18 @@ bool wxVariantDataChar::Read(wxString& str)
 * wxVariantDataString
 */

+#if defined(__BORLANDC__) && defined(__WIN16__)
+// Change name because of truncation
+#define wxVariantDataString wxVariantStringData
+#endif
+
 class WXDLLEXPORT wxVariantDataString: public wxVariantData
 {
+#if defined(__BORLANDC__) && defined(__WIN16__)
+DECLARE_DYNAMIC_CLASS(wxVariantStringData)
+#else
 DECLARE_DYNAMIC_CLASS(wxVariantDataString)
+#endif
 public:
    wxVariantDataString() { }
    wxVariantDataString(const wxString& value) { m_value = value; }
@@ -705,7 +714,11 @@ bool wxVariantDataString::Read(wxString& str)
    return TRUE;
 }

+#if defined(__BORLANDC__) && defined(__WIN16__)
+IMPLEMENT_DYNAMIC_CLASS(wxVariantStringData, wxVariantData)
+#else
 IMPLEMENT_DYNAMIC_CLASS(wxVariantDataString, wxVariantData)
+#endif

 /*
 * wxVariantDataTime
--- a/src/generic/notebook.cpp
+++ b/src/generic/notebook.cpp
@@ -626,7 +626,12 @@ void wxNotebookTabView::OnTabActivate(int activateId, int deactivateId)
  if (!m_notebook)
    return;

+// Because of name truncation!
+#if defined(__BORLANDC__) && defined(__WIN16__)
+  wxNotebookEvent event(wxEVT_COMMAND_NB_PAGE_CHANGED, m_notebook->GetId());
+#else
  wxNotebookEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, m_notebook->GetId());
+#endif

  // Translate from wxTabView's ids (which aren't position-dependent)
  // to wxNotebook's (which are).
--- a/src/makebcc.env
+++ b/src/makebcc.env
@@ -2,10 +2,9 @@

 WXDIR = $(WXWIN)

-CFG = $(WXDIR)\src\wxwin.cfg
-WXLIB = $(WXDIR)\lib
-WXINC = $(WXDIR)\include\msw
-WXBASEINC = $(WXDIR)\include\base
+CFG = $(WXDIR)\src\msw\wxwin.cfg
+WXLIBDIR = $(WXDIR)\lib
+WXINC = $(WXDIR)\include

 !ifndef FINAL
 FINAL=0
@@ -14,7 +13,7 @@ FINAL=0
 !if "$(FINAL)" == "0"
 LINKFLAGS=/v/Vt /Twe /L$(WXDIR)\lib;$(BCCDIR)\lib
 OPT = -Od
-DEBUG_FLAGS= -v -D__WXDEBUG__ -DWXDEBUG=1
+DEBUG_FLAGS= -v -D__WXDEBUG__
 !else
 LINKFLAGS=/Twe /L$(WXDIR)\lib;$(BCCDIR)\lib
 OPT = -O2
@@ -24,10 +23,13 @@ CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)

 CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)

-LIBTARGET= $(WXLIB)\wx.lib
+WXLIB= $(WXLIBDIR)\wx.lib

 SRCSUFF = cpp
 OBJSUFF = obj

 .$(SRCSUFF).obj:
        bcc $(CPPFLAGS) -c {$< }
+
+.c.obj:
+	bcc $(CPPFLAGS) -DUSE_DEFINE -P- -c {$< }
--- a/src/makeprog.bcc
+++ b/src/makeprog.bcc
@@ -0,0 +1,47 @@
+# makeprog.bcc
+# Incude file for samples
+
+!include $(WXDIR)\src\makebcc.env
+
+WXLIB = $(WXDIR)\lib\wx.lib
+LIBS=$(WXLIB) mathwl cwl import
+
+!ifndef FINAL
+FINAL=0
+!endif
+
+!if "$(FINAL)" == "0"
+LINKFLAGS=/v/Vt /Twe /L$(WXDIR)\lib;$(BCCDIR)\lib
+OPT = -Od
+DEBUG_FLAGS= -v
+!else
+LINKFLAGS=/Twe /L$(WXDIR)\lib;$(BCCDIR)\lib
+OPT = -O2
+DEBUG_FLAGS =
+!endif
+CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
+
+all:    $(TARGET).exe
+
+$(TARGET).exe:      $(WXLIB) $(OBJECTS) $(TARGET).def $(TARGET).res
+        tlink $(LINKFLAGS) @&&!
+c0wl.obj $(OBJECTS)
+$(TARGET)
+nul
+$(LIBS)
+$(TARGET).def
+!
+        rc -K $(TARGET).res
+
+.$(SRCSUFF).obj:
+	bcc $(CPPFLAGS) -c {$< }
+
+$(TARGET).res :      $(TARGET).rc $(WXDIR)\include\wx\msw\wx.rc
+    rc -r /i$(BCCDIR)\include /i$(WXDIR)\include $(TARGET)
+
+clean:
+        -erase *.obj
+        -erase *.exe
+        -erase *.res
+        -erase *.map
+        -erase *.rws
--- a/src/msw/app.cpp
+++ b/src/msw/app.cpp
@@ -43,9 +43,15 @@
  #include "wx/resource.h"
 #endif

-#if wxUSE_DRAG_AND_DROP
+// To UG: there's no point in putting this #if here
+// if you don't do the same for the Ole calls further down.
+// Also, OLE is used not just for drag and drop (it's used by automatn.cpp).
+// #if wxUSE_DRAG_AND_DROP
+#ifndef __GNUWIN32__
 #include <ole2.h>
 #endif
+// #endif
+
 #include <string.h>
 #include <ctype.h>

--- a/src/msw/data.cpp
+++ b/src/msw/data.cpp
@@ -144,6 +144,7 @@ const char *wxFileSelectorPromptStr = "Select a file";
 const char *wxFileSelectorDefaultWildcardStr = "*.*";
 const char *wxInternalErrorStr = "wxWindows Internal Error";
 const char *wxFatalErrorStr = "wxWindows Fatal Error";
+const char *wxTreeCtrlNameStr = "treeCtrl";

 // See wx/utils.h
 const char *wxFloatToStringStr = "%.2f";
--- a/src/msw/dibutils.cpp
+++ b/src/msw/dibutils.cpp
@@ -173,9 +173,13 @@ PDIB DibOpenFile(LPSTR szFile)
 		  HRSRC h;

          // TODO: Unicode version
+#ifdef __WIN16__
+		  h = FindResource(GetCurrentInstance(), szFile, RT_BITMAP);
+#else
 		  h = FindResourceA(GetCurrentInstance(), szFile, RT_BITMAP);
+#endif

-#if defined(WIN32) || defined(_WIN32)
+#if defined(__WIN32__)
 		  //!!! can we call GlobalFree() on this? is it the right format.
 		  //!!! can we write to this resource?
 		  if (h)
--- a/src/msw/iniconf.cpp
+++ b/src/msw/iniconf.cpp
@@ -141,7 +141,7 @@ void wxIniConfig::SetPath(const wxString& strPath)
  // other functions assume that all this is true, i.e. there are no trailing
  // underscores at the end except if the group is the root one
  wxASSERT( (m_strPath.IsEmpty() || m_strPath.Last() != PATH_SEP_REPLACE) &&
-            (m_strGroup == PATH_SEP_REPLACE ||
+            (m_strGroup == wxString(PATH_SEP_REPLACE) ||
             m_strGroup.Last() != PATH_SEP_REPLACE) );
 }

@@ -152,7 +152,7 @@ const wxString& wxIniConfig::GetPath() const
  // always return abs path
  s_str = wxCONFIG_PATH_SEPARATOR;

-  if ( m_strGroup == PATH_SEP_REPLACE ) {
+  if ( m_strGroup == (const char*) PATH_SEP_REPLACE ) {
    // we're at the root level, nothing to do
  }
  else {
@@ -183,7 +183,7 @@ wxString wxIniConfig::GetKeyName(const wxString& szKey) const
 {
  wxString strKey;

-  if ( m_strGroup != PATH_SEP_REPLACE )
+  if ( m_strGroup != wxString(PATH_SEP_REPLACE) )
    strKey << m_strGroup << PATH_SEP_REPLACE;
  if ( !m_strPath.IsEmpty() )
    strKey << m_strPath << PATH_SEP_REPLACE;
--- a/src/msw/makefile.b32
+++ b/src/msw/makefile.b32
@@ -72,22 +72,27 @@ DOCDIR = $(WXDIR)\docs

 GENERICOBJS= \
  $(MSWDIR)\choicdgg.obj \
-  $(MSWDIR)\colrdlgg.obj \
-  $(MSWDIR)\fontdlgg.obj \
  $(MSWDIR)\gridg.obj \
-  $(MSWDIR)\helpxlp.obj \
+  $(MSWDIR)\imaglist.obj \
  $(MSWDIR)\laywin.obj \
-  $(MSWDIR)\msgdlgg.obj \
  $(MSWDIR)\panelg.obj \
  $(MSWDIR)\sashwin.obj \
  $(MSWDIR)\scrolwin.obj \
  $(MSWDIR)\splitter.obj \
  $(MSWDIR)\statusbr.obj \
  $(MSWDIR)\tabg.obj \
-  $(MSWDIR)\textdlgg.obj
+  $(MSWDIR)\textdlgg.obj \

+# Not needed:
+#  $(MSWDIR)\colrdlgg.obj \
+#  $(MSWDIR)\fontdlgg.obj \
+#  $(MSWDIR)\helpxlp.obj \
+#  $(MSWDIR)\msgdlgg.obj \
 #  $(MSWDIR)\printps.obj \
 #  $(MSWDIR)\prntdlgg.obj \
+#  $(MSWDIR)\listctrl.obj \
+#  $(MSWDIR)\notebook.obj \
+#  $(MSWDIR)\treectrl.obj

 COMMONOBJS = \
  $(MSWDIR)\config.obj \
@@ -220,16 +225,16 @@ MSWOBJS = \
  $(MSWDIR)\spinbutt.obj \
  $(MSWDIR)\statbmp.obj \
  $(MSWDIR)\statbox.obj \
-  $(MSWDIR)\statbr95.obj \
  $(MSWDIR)\stattext.obj \
+  $(MSWDIR)\statbr95.obj \
  $(MSWDIR)\tabctrl.obj \
-  $(MSWDIR)\taskbar.obj \
-  $(MSWDIR)\tbar95.obj \
  $(MSWDIR)\tbarmsw.obj \
  $(MSWDIR)\textctrl.obj \
  $(MSWDIR)\thread.obj \
  $(MSWDIR)\timer.obj \
  $(MSWDIR)\treectrl.obj \
+  $(MSWDIR)\taskbar.obj \
+  $(MSWDIR)\tbar95.obj \
  $(MSWDIR)\utils.obj \
  $(MSWDIR)\utilsexc.obj \
  $(MSWDIR)\wave.obj \
@@ -253,15 +258,15 @@ all:	all_libs all_execs

 !if "$(DLL)" == "0"

-$(LIBTARGET): $(DUMMY).obj $(OBJECTS) $(BASEOBJECTS)
+$(LIBTARGET): $(DUMMY).obj $(OBJECTS)
        erase $(LIBTARGET)
 	tlib $(LIBTARGET) /P512 @&&!
-+$(OBJECTS:.obj =.obj -+) -+$(BASEOBJECTS:.obj =.obj -+) -+$(PERIPH_LIBS:.lib =.lib -+)
+-+$(OBJECTS:.obj =.obj -+) -+$(PERIPH_LIBS:.lib =.lib -+)
 !

 !else

-$(LIBTARGET): $(DUMMY).obj $(OBJECTS) $(BASEOBJECTS)
+$(LIBTARGET): $(DUMMY).obj $(OBJECTS)
 	erase $(LIBTARGET)
 	erase $(WXLIBDIR)\wx.dll
        tlink32 $(LINK_FLAGS) /v @&&!
@@ -648,7 +653,7 @@ ctl3d:  $(CFG)
        cd $(WXDIR)\src\msw

 wxxpm:	$(CFG)
-	cd $(WXDIR)\src\common\wxxpm
+	cd $(WXDIR)\src\xpm
 	make -f makefile.b32 -DCFG=$(CFG) -DFINAL=$(FINAL) -DWXWIN=$(WXDIR) -DDEBUG=$(DEBUG)
 	cd $(WXDIR)\src\msw

--- a/src/msw/makefile.bcc
+++ b/src/msw/makefile.bcc
@@ -31,377 +31,685 @@ WXDIR = $(WXWIN)
 !include $(WXDIR)\src\makebcc.env

 THISDIR = $(WXDIR)\src\msw
-WXLIB = $(WXDIR)\lib
-WXINC = $(WXDIR)\include\msw
-WXBASESRC = $(WXDIR)\src\base
-WXBASEINC = $(WXDIR)\include\base

 # Please set these according to the settings in wx_setup.h, so we can include
 # the appropriate libraries in wx.lib
 USE_CTL3D=1
-USE_ITSYBITS=1
-USE_GAUGE=1
-USE_IMAGE_LOADING_IN_MSW=1
 USE_XPM_IN_MSW=0
-USE_WX_RESOURCES=1
-USE_RESOURCE_LOADING_IN_MSW=1
-USE_GNU_WXSTRING=1

 PERIPH_LIBS=
 PERIPH_TARGET=
 PERIPH_CLEAN_TARGET=

 !if "$(USE_CTL3D)" == "1"
-PERIPH_LIBS=$(WXDIR)\lib\ctl3dv2.lib $(PERIPH_LIBS)
-PERIPH_TARGET=ctl3d $(PERIPH_TARGET)
-PERIPH_CLEAN_TARGET=clean_ctl3d $(PERIPH_CLEAN_TARGET)
-!endif
-
-!if "$(USE_ITSYBITS)" == "1"
-PERIPH_LIBS=$(WXDIR)\contrib\itsybits\itsy.lib $(PERIPH_LIBS)
-PERIPH_TARGET=itsy $(PERIPH_TARGET)
-PERIPH_CLEAN_TARGET=clean_itsy $(PERIPH_CLEAN_TARGET)
-!endif
-
-!if "$(USE_GAUGE)" == "1"
-PERIPH_LIBS=$(WXDIR)\contrib\gauge\gauge.lib $(PERIPH_LIBS)
-PERIPH_TARGET=gauge $(PERIPH_TARGET)
-PERIPH_CLEAN_TARGET=clean_gauge $(PERIPH_CLEAN_TARGET)
+PERIPH_LIBS=$(BCCDIR)\lib\ctl3dv2.lib $(PERIPH_LIBS)
 !endif

 !if "$(USE_XPM_IN_MSW)" == "1"
-PERIPH_LIBS=$(WXDIR)\contrib\wxxpm\xpm.lib $(PERIPH_LIBS)
+PERIPH_LIBS=$(WXDIR)\xpm.lib $(PERIPH_LIBS)
 PERIPH_TARGET=xpm $(PERIPH_TARGET)
 PERIPH_CLEAN_TARGET=clean_xpm $(PERIPH_CLEAN_TARGET)
 !endif

-!if "$(USE_IMAGE_LOADING_IN_MSW)" == "1"
-PERIPH_LIBS=$(WXDIR)\utils\dib\dib.lib $(PERIPH_LIBS)
-PERIPH_TARGET=dib $(PERIPH_TARGET)
-PERIPH_CLEAN_TARGET=clean_dib $(PERIPH_CLEAN_TARGET)
-!endif
-
-!if "$(USE_WX_RESOURCES)" == "1"
-PERIPH_LIBS=$(WXDIR)\utils\prologio\lib\prologio.lib $(PERIPH_LIBS)
-PERIPH_TARGET=prologio $(PERIPH_TARGET)
-PERIPH_CLEAN_TARGET=clean_proio $(PERIPH_CLEAN_TARGET)
-!endif
-
-!if "$(USE_RESOURCE_LOADING_IN_MSW)" == "1"
-PERIPH_LIBS=$(WXDIR)\utils\rcparser\lib\rcparser.lib $(PERIPH_LIBS)
-PERIPH_TARGET=rcparser $(PERIPH_TARGET)
-PERIPH_CLEAN_TARGET=clean_rcp $(PERIPH_CLEAN_TARGET)
-!endif
-
-WXSTRINGOBJ=..\base\wxstring.obj
-
-!if "$(USE_GNU_WXSTRING)" == "1"
-PERIPH_LIBS=$(WXDIR)\contrib\wxstring\wxstring.lib $(PERIPH_LIBS)
-PERIPH_TARGET=wxstring $(PERIPH_TARGET)
-PERIPH_CLEAN_TARGET=clean_wxstring $(PERIPH_CLEAN_TARGET)
-WXSTRINGOBJ=
-!endif
+# TODO: add these libraries
+# PERIPH_LIBS=$(WXDIR)\lib\zlib.lib $(WXDIR)\lib\winpng.lib $(PERIPH_LIBS)
+# PERIPH_TARGET=zlib png $(PERIPH_TARGET)
+# PERIPH_CLEAN_TARGET=clean_zlib clean_png $(PERIPH_CLEAN_TARGET)

 CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)

-LIBTARGET= $(WXLIB)\wx.lib
+LIBTARGET= $(WXLIBDIR)\wx.lib
 DUMMY=dummy

-BASEHEADERS = $(WXBASEINC)\wx_defs.h \
-  $(WXBASEINC)\wb_buttn.h \
-  $(WXBASEINC)\wb_canvs.h \
-  $(WXBASEINC)\wb_check.h \
-  $(WXBASEINC)\wb_choic.h \
-  $(WXBASEINC)\wb_dc.h \
-  $(WXBASEINC)\wb_dccan.h \
-  $(WXBASEINC)\wb_dcmem.h \
-  $(WXBASEINC)\wb_dialg.h \
-  $(WXBASEINC)\wb_frame.h \
-  $(WXBASEINC)\wb_gdi.h \
-  $(WXBASEINC)\wb_ipc.h \
-  $(WXBASEINC)\wb_ipcob.h \
-  $(WXBASEINC)\wb_item.h \
-  $(WXBASEINC)\wb_lbox.h \
-  $(WXBASEINC)\wb_main.h \
-  $(WXBASEINC)\wb_menu.h \
-  $(WXBASEINC)\wb_messg.h \
-  $(WXBASEINC)\wb_mf.h \
-  $(WXBASEINC)\wb_mnuit.h \
-  $(WXBASEINC)\wb_mtxt.h \
-  $(WXBASEINC)\wb_panel.h \
-  $(WXBASEINC)\wb_slidr.h \
-  $(WXBASEINC)\wb_text.h \
-  $(WXBASEINC)\wb_timer.h \
-  $(WXBASEINC)\wb_txt.h \
-  $(WXBASEINC)\wb_win.h \
-  $(WXBASEINC)\wx_dcps.h \
-  $(WXBASEINC)\wx_form.h \
-  $(WXBASEINC)\wx_hash.h \
-  $(WXBASEINC)\wx_help.h \
-  $(WXBASEINC)\wx_list.h \
-  $(WXBASEINC)\wxstring.h \
-  $(WXBASEINC)\wx_mgstr.h \
-  $(WXBASEINC)\wx_obj.h \
-  $(WXBASEINC)\wx_stdev.h \
-  $(WXBASEINC)\wx_sysev.h \
-  $(WXBASEINC)\wx_types.h \
-  $(WXBASEINC)\wx_utils.h
+GENDIR=..\generic
+COMMDIR=..\common
+OLEDIR=.\ole
+MSWDIR=.

-LOCALHEADERS = \
-  $(WXINC)\wx_buttn.h \
-  $(WXINC)\wx_canvs.h \
-  $(WXINC)\wx_check.h \
-  $(WXINC)\wx_choic.h \
-  $(WXINC)\wx_combo.h \
-  $(WXINC)\wx_dc.h \
-  $(WXINC)\wx_dccan.h \
-  $(WXINC)\wx_dcmem.h \
-  $(WXINC)\wx_dialg.h \
-  $(WXINC)\wx_frame.h \
-  $(WXINC)\wx_gdi.h \
-  $(WXINC)\wx_ipc.h \
-  $(WXINC)\wx_ipcob.h \
-  $(WXINC)\wx_item.h \
-  $(WXINC)\wx_lbox.h \
-  $(WXINC)\wx_main.h \
-  $(WXINC)\wx_menu.h \
-  $(WXINC)\wx_messg.h \
-  $(WXINC)\wx_mf.h \
-  $(WXINC)\wx_mnuit.h \
-  $(WXINC)\wx_mtxt.h \
-  $(WXINC)\wx_panel.h \
-  $(WXINC)\wx_privt.h \
-  $(WXINC)\wx_slidr.h \
-  $(WXINC)\wx_text.h \
-  $(WXINC)\wx_timer.h \
-  $(WXINC)\wx_txt.h \
-  $(WXINC)\wx_win.h
+DOCDIR = $(WXDIR)\docs

-OBJECTS1 = wx_win.obj wx_frame.obj wx_panel.obj wx_utils.obj wx_main.obj\
-  wx_item.obj
+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)\msgdlgg.obj \
+  $(MSWDIR)\notebook.obj \
+  $(MSWDIR)\panelg.obj \
+  $(MSWDIR)\sashwin.obj \
+  $(MSWDIR)\scrolwin.obj \
+  $(MSWDIR)\splitter.obj \
+  $(MSWDIR)\statusbr.obj \
+  $(MSWDIR)\tabg.obj \
+  $(MSWDIR)\textdlgg.obj \
+  $(MSWDIR)\treectrl.obj

-OBJECTS2 = wx_text.obj wx_gdi.obj wx_dialg.obj wx_canvs.obj wx_dc.obj wx_mf.obj
+#  $(MSWDIR)\printps.obj \
+#  $(MSWDIR)\prntdlgg.obj \

-OBJECTS3 = wx_ipc.obj wx_timer.obj wx_clipb.obj wx_stat.obj wx_scrol.obj wx_vlbox.obj
+COMMONOBJS = \
+  $(MSWDIR)\config.obj \
+  $(MSWDIR)\cmndata.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)\postscrp.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)\valtext.obj \
+  $(MSWDIR)\variant.obj \
+  $(MSWDIR)\date.obj \
+  $(MSWDIR)\hash.obj \
+  $(MSWDIR)\list.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

-OBJECTS4 = wx_buttn.obj wx_messg.obj wx_check.obj wx_choic.obj wx_rbox.obj wx_lbox.obj \
- wx_group.obj wx_gauge.obj wx_txt.obj wx_mtxt.obj wx_slidr.obj wx_menu.obj wx_db.obj\
- wx_cmdlg.obj wx_combo.obj
+#  $(MSWDIR)\socket.obj \
+#  $(MSWDIR)\sckaddr.obj \
+#  $(MSWDIR)\protocol.obj \
+#  $(MSWDIR)\url.obj \
+#  $(MSWDIR)\http.obj \
+#  $(MSWDIR)\ftp.obj \
+#  $(MSWDIR)\sckfile.obj \
+#  $(MSWDIR)\sckipc.obj \
+#  $(MSWDIR)\odbc.obj \

-OBJECTS = $(OBJECTS1) $(OBJECTS2) $(OBJECTS3) $(OBJECTS4)
+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)\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)\imaglist.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)\stattext.obj \
+  $(MSWDIR)\tbarmsw.obj \
+  $(MSWDIR)\textctrl.obj \
+  $(MSWDIR)\timer.obj \
+  $(MSWDIR)\utils.obj \
+  $(MSWDIR)\utilsexc.obj \
+  $(MSWDIR)\wave.obj \
+  $(MSWDIR)\window.obj \

-BASEOBJECTS1 = ..\base\wb_data.obj ..\base\wb_win.obj ..\base\wb_frame.obj ..\base\wb_panel.obj\
-  ..\base\wb_utils.obj ..\base\wb_main.obj ..\base\wb_res.obj
+# Unfortunately this causes a crash when the oleauto sample starts.
+#  $(MSWDIR)\automtn.obj

-BASEOBJECTS2 = ..\base\wb_item.obj ..\base\wb_list.obj ..\base\wb_obj.obj\
-  ..\base\wb_ps.obj ..\base\wx_doc.obj ..\base\wx_tbar.obj ..\base\wx_bbar.obj
+# Not used for 16-bit compilation
+#  $(MSWDIR)\gauge95.obj \
+#  $(MSWDIR)\treectrl.obj \
+#  $(MSWDIR)\oleutils.obj \
+#  $(MSWDIR)\dataobj.obj \
+#  $(MSWDIR)\uuid.obj
+#  $(MSWDIR)\droptgt.obj \
+#  $(MSWDIR)\dropsrc.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 \

-BASEOBJECTS3 = ..\base\wb_text.obj ..\base\wb_gdi.obj ..\base\wb_dialg.obj\
-  ..\base\wb_canvs.obj ..\base\wx_date.obj ..\base\wx_time.obj ..\base\wx_frac.obj
+OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS)

-BASEOBJECTS4 = ..\base\wb_dc.obj ..\base\wb_mf.obj ..\base\wb_hash.obj\
-  ..\base\wb_ipc.obj ..\base\wx_lay.obj ..\base\wx_mem.obj ..\base\wb_cmdlg.obj
+default:	wx

-BASEOBJECTS5 = ..\base\wb_form.obj ..\base\wb_timer.obj ..\base\wb_help.obj\
-  ..\base\wb_vlbox.obj ..\base\wb_scrol.obj ..\base\wb_stat.obj
+wx:    $(CFG) $(DUMMY).obj $(OBJECTS) $(PERIPH_TARGET) $(LIBTARGET)

-BASEOBJECTS6 = ..\base\wb_sysev.obj ..\base\wb_stdev.obj ..\base\wb_types.obj\
-  ..\base\wb_mgstr.obj ..\base\wb_print.obj $(WXSTRINGOBJ)
-
-BASEOBJECTS = $(BASEOBJECTS1) $(BASEOBJECTS2) $(BASEOBJECTS3)\
-  $(BASEOBJECTS4) $(BASEOBJECTS5) $(BASEOBJECTS6)
-
-
-all:    $(CFG) $(DUMMY).obj base $(OBJECTS) $(PERIPH_TARGET) $(LIBTARGET)
-
-base:
-	cd $(WXBASESRC)
-	make -f makefile.bcc -DCFG=$(CFG) -DWXDIR=$(WXDIR) DEBUG=$(DEBUG) -DDEBUG_FLAGS=$(DEBUG_FLAGS) -DOPT=$(OPT) -DFINAL=$(FINAL)
-	cd $(THISDIR)
-
-$(LIBTARGET): $(DUMMY).obj $(OBJECTS) $(BASEOBJECTS) $(PERIPH_LIBS)
+$(LIBTARGET): $(DUMMY).obj $(OBJECTS) $(PERIPH_LIBS)
 	erase $(LIBTARGET)
-	tlib $(WXLIB)\wx.lib /P512 @&&!
-+$(OBJECTS:.obj =.obj +) +$(BASEOBJECTS:.obj =.obj +) +$(PERIPH_LIBS:.lib =.lib +)
+	tlib $(LIBTARGET) /P1024 @&&!
+$(OBJECTS:.obj =.obj +) +$(PERIPH_LIBS:.lib =.lib +)
 !

-dummy.obj: dummy.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\base\wx.h
-	
+dummy.obj: dummy.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\wx\wx.h
+dummydll.obj: dummydll.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\wx\wx.h

-dummydll.obj: dummydll.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\base\wx.h
+$(MSWDIR)\y_tab.obj:     $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c

-wx_obj.obj:     $(WXBASEINC)\wx_obj.h
+#        cl @<<
+#$(CPPFLAGS2) /c $*.c -DUSE_DEFINE -DYY_USE_PROTOS /Fo$@
+#<<

-wx_win.obj:     $(WXBASEINC)\wx_defs.h $(WXINC)\wx_win.h $(WXBASEINC)\wx_obj.h \
-  $(WXBASEINC)\wx_utils.h wx_win.$(SRCSUFF) $(WXINC)\wx_gdi.h $(WXINC)\wx_privt.h
+$(COMMDIR)\y_tab.c:     $(COMMDIR)\dosyacc.c
+        copy $(COMMDIR)\dosyacc.c $(COMMDIR)\y_tab.c

-wx_main.obj:   $(WXBASEINC)\wx_defs.h $(WXBASEINC)\wx_obj.h $(WXINC)\wx_frame.h $(WXBASEINC)\wx_utils.h \
-  $(WXINC)\wx_main.h wx_main.$(SRCSUFF) $(WXINC)\wx_privt.h
+$(COMMDIR)\lex_yy.c:    $(COMMDIR)\doslex.c
+    copy $(COMMDIR)\doslex.c $(COMMDIR)\lex_yy.c

-wx_frame.obj:   $(WXBASEINC)\wx_defs.h $(WXINC)\wx_win.h $(WXBASEINC)\wx_obj.h $(WXBASEINC)\wx_utils.h $(WXINC)\wx_frame.h wx_frame.$(SRCSUFF)\
-		$(WXBASEINC)\wx_stdev.h $(WXINC)\wx_privt.h
+#$(OBJECTS):	$(WXDIR)\include\wx\setup.h

-wx_panel.obj:   $(WXBASEINC)\wx_defs.h $(WXINC)\wx_win.h $(WXBASEINC)\wx_obj.h $(WXBASEINC)\wx_utils.h $(WXINC)\wx_frame.h $(WXINC)\wx_panel.h\
-		wx_panel.$(SRCSUFF) $(WXBASEINC)\wx_stdev.h $(WXINC)\wx_privt.h
+$(MSWDIR)\accel.obj:     $(MSWDIR)\accel.$(SRCSUFF)

-wx_text.obj:    $(WXBASEINC)\wx_defs.h $(WXINC)\wx_win.h $(WXBASEINC)\wx_obj.h $(WXBASEINC)\wx_utils.h $(WXINC)\wx_frame.h $(WXINC)\wx_text.h\
-		wx_text.$(SRCSUFF) $(WXBASEINC)\wx_stdev.h $(WXINC)\wx_privt.h
+$(MSWDIR)\app.obj:     $(MSWDIR)\app.$(SRCSUFF)

-wx_canvs.obj:    $(WXBASEINC)\wx_defs.h $(WXINC)\wx_win.h $(WXBASEINC)\wx_obj.h $(WXBASEINC)\wx_utils.h $(WXINC)\wx_frame.h $(WXINC)\wx_canvs.h\
-		 wx_canvs.$(SRCSUFF) $(WXBASEINC)\wx_stdev.h $(WXINC)\wx_gdi.h\
-		 $(WXINC)\wx_dc.h $(WXINC)\wx_privt.h
+$(MSWDIR)\bitmap.obj:     $(MSWDIR)\bitmap.$(SRCSUFF)

-wx_dc.obj:    $(WXBASEINC)\wx_defs.h $(WXINC)\wx_win.h $(WXBASEINC)\wx_obj.h $(WXBASEINC)\wx_utils.h $(WXINC)\wx_frame.h $(WXINC)\wx_canvs.h\
-		 wx_dc.$(SRCSUFF) $(WXBASEINC)\wx_stdev.h $(WXINC)\wx_gdi.h $(WXINC)\wx_dc.h\
-	$(WXINC)\wx_dccan.h $(WXINC)\wx_dcmem.h
+$(MSWDIR)\bmpbuttn.obj:     $(MSWDIR)\bmpbuttn.$(SRCSUFF)

-wx_mf.obj:    $(WXBASEINC)\wx_defs.h $(WXINC)\wx_win.h $(WXBASEINC)\wx_obj.h\
-		 wx_mf.$(SRCSUFF) $(WXBASEINC)\wx_stdev.h $(WXINC)\wx_gdi.h $(WXINC)\wx_mf.h
-	
-wx_item.obj:    $(WXBASEINC)\wx_defs.h $(WXINC)\wx_win.h $(WXBASEINC)\wx_obj.h $(WXBASEINC)\wx_utils.h $(WXINC)\wx_frame.h $(WXINC)\wx_item.h\
-		wx_item.$(SRCSUFF) $(WXBASEINC)\wx_stdev.h $(WXINC)\wx_privt.h
-	
-wx_utils.obj:   $(WXBASEINC)\wx_defs.h $(WXBASEINC)\wx_obj.h $(WXBASEINC)\wx_utils.h wx_utils.$(SRCSUFF)
-	
-wx_ipc.obj:   $(WXBASEINC)\wx_defs.h $(WXBASEINC)\wx_obj.h $(WXBASEINC)\wx_utils.h $(WXINC)\wx_ipc.h wx_ipc.$(SRCSUFF)
-	
-wx_gdi.obj:   $(WXBASEINC)\wx_defs.h $(WXINC)\wx_gdi.h $(WXBASEINC)\wx_utils.h wx_gdi.$(SRCSUFF)
-	
-wx_dialg.obj:   $(WXBASEINC)\wx_defs.h wx_dialg.$(SRCSUFF) $(WXINC)\wx_dialg.h $(WXINC)\wx_win.h\
-  $(WXBASEINC)\wx_utils.h $(WXINC)\wx_panel.h $(WXINC)\wx_privt.h
-	
-wx_timer.obj:   $(WXBASEINC)\wx_defs.h wx_timer.$(SRCSUFF) $(WXINC)\wx_timer.h
-	
-wx_clipb.obj:   $(WXBASEINC)\wx_defs.h wx_clipb.$(SRCSUFF) $(WXINC)\wx_clipb.h
+$(MSWDIR)\brush.obj:     $(MSWDIR)\brush.$(SRCSUFF)

-wx_stat.obj:   $(WXBASEINC)\wx_defs.h wx_stat.$(SRCSUFF)
-wx_vlbox.obj:   $(WXBASEINC)\wx_defs.h wx_vlbox.$(SRCSUFF)
-wx_messg.obj:   $(WXBASEINC)\wx_defs.h wx_messg.$(SRCSUFF) $(WXINC)\wx_messg.h
-wx_buttn.obj:   $(WXBASEINC)\wx_defs.h wx_buttn.$(SRCSUFF) $(WXINC)\wx_buttn.h
-wx_check.obj:   $(WXBASEINC)\wx_defs.h wx_check.$(SRCSUFF) $(WXINC)\wx_check.h
-wx_choic.obj:   $(WXBASEINC)\wx_defs.h wx_choic.$(SRCSUFF) $(WXINC)\wx_choic.h
-wx_combo.obj:   $(WXBASEINC)\wx_defs.h wx_combo.$(SRCSUFF) $(WXINC)\wx_combo.h
-wx_group.obj:   $(WXBASEINC)\wx_defs.h wx_group.$(SRCSUFF) $(WXINC)\wx_group.h
-wx_gauge.obj:   $(WXBASEINC)\wx_defs.h wx_gauge.$(SRCSUFF) $(WXINC)\wx_gauge.h
-wx_lbox.obj:   $(WXBASEINC)\wx_defs.h wx_lbox.$(SRCSUFF) $(WXINC)\wx_lbox.h
-wx_rbox.obj:   $(WXBASEINC)\wx_defs.h wx_rbox.$(SRCSUFF) $(WXINC)\wx_rbox.h
-wx_menu.obj:   $(WXBASEINC)\wx_defs.h wx_menu.$(SRCSUFF) $(WXINC)\wx_menu.h
-wx_txt.obj:   $(WXBASEINC)\wx_defs.h wx_txt.$(SRCSUFF) $(WXINC)\wx_txt.h
-wx_mtxt.obj:   $(WXBASEINC)\wx_defs.h wx_mtxt.$(SRCSUFF) $(WXINC)\wx_mtxt.h
-wx_slidr.obj:   $(WXBASEINC)\wx_defs.h wx_slidr.$(SRCSUFF) $(WXINC)\wx_slidr.h
-wx_db.obj:   $(WXBASEINC)\wx_defs.h wx_db.$(SRCSUFF) $(WXINC)\wx_db.h
-wx_cmdlg.obj:   $(WXBASEINC)\wx_defs.h wx_cmdlg.$(SRCSUFF) $(WXINC)\wx_cmdlg.h
+$(MSWDIR)\button.obj:     $(MSWDIR)\button.$(SRCSUFF)

-$(WXINC)\wx_win.h:  $(WXBASEINC)\wb_win.h
-$(WXINC)\wx_main.h:  $(WXBASEINC)\wb_main.h
-$(WXINC)\wx_frame.h:  $(WXBASEINC)\wb_frame.h
-$(WXINC)\wx_panel.h:  $(WXBASEINC)\wb_panel.h
-$(WXINC)\wx_text.h:  $(WXBASEINC)\wb_text.h
-$(WXINC)\wx_dialg.h:  $(WXBASEINC)\wb_dialg.h
-$(WXINC)\wx_ipc.h:  $(WXBASEINC)\wb_ipc.h
-$(WXINC)\wx_gdi.h:  $(WXBASEINC)\wb_gdi.h
-$(WXINC)\wx_event.h:  $(WXBASEINC)\wb_event.h
-$(WXINC)\wx_canvs.h:  $(WXBASEINC)\wb_canvs.h
-$(WXINC)\wx_mf.h:  $(WXBASEINC)\wb_mf.h
-$(WXINC)\wx_item.h:  $(WXBASEINC)\wb_item.h
-$(WXINC)\wx_buttn.h:  $(WXBASEINC)\wb_buttn.h
-$(WXINC)\wx_messg.h:  $(WXBASEINC)\wb_messg.h
-$(WXINC)\wx_choic.h:  $(WXBASEINC)\wb_choic.h
-$(WXINC)\wx_combo.h:  $(WXBASEINC)\wb_combo.h
-$(WXINC)\wx_check.h:  $(WXBASEINC)\wb_check.h
-$(WXINC)\wx_lbox.h:  $(WXBASEINC)\wb_lbox.h
-$(WXINC)\wx_txt.h:  $(WXBASEINC)\wb_txt.h
-$(WXINC)\wx_mtxt.h:  $(WXBASEINC)\wb_mtxt.h
-$(WXINC)\wx_slidr.h:  $(WXBASEINC)\wb_slidr.h
-$(WXINC)\wx_menu.h:  $(WXBASEINC)\wb_menu.h
+$(MSWDIR)\choice.obj:     $(MSWDIR)\choice.$(SRCSUFF)

-# Peripheral components
+$(MSWDIR)\checkbox.obj:     $(MSWDIR)\checkbox.$(SRCSUFF)

-ctl3d:
-    cd $(WXDIR)\contrib\ctl3d\borland
-    make -f makefile.bcc DEBUG=$(DEBUG) 
+$(MSWDIR)\checklst.obj:     $(MSWDIR)\checklst.$(SRCSUFF)
+
+$(MSWDIR)\clipbrd.obj:     $(MSWDIR)\clipbrd.$(SRCSUFF)
+
+$(MSWDIR)\colordlg.obj:     $(MSWDIR)\colordlg.$(SRCSUFF)
+
+$(MSWDIR)\colour.obj:     $(MSWDIR)\colour.$(SRCSUFF)
+
+$(MSWDIR)\combobox.obj:     $(MSWDIR)\combobox.$(SRCSUFF)
+
+$(MSWDIR)\control.obj:     $(MSWDIR)\control.$(SRCSUFF)
+
+$(MSWDIR)\curico.obj:     $(MSWDIR)\curico.$(SRCSUFF)
+
+$(MSWDIR)\cursor.obj:     $(MSWDIR)\cursor.$(SRCSUFF)
+
+$(MSWDIR)\data.obj:     $(MSWDIR)\data.$(SRCSUFF)
+
+$(MSWDIR)\dde.obj:     $(MSWDIR)\dde.$(SRCSUFF)
+
+$(MSWDIR)\dc.obj:     $(MSWDIR)\dc.$(SRCSUFF)
+
+$(MSWDIR)\dcmemory.obj:     $(MSWDIR)\dcmemory.$(SRCSUFF)
+
+$(MSWDIR)\dcclient.obj:     $(MSWDIR)\dcclient.$(SRCSUFF)
+
+$(MSWDIR)\dcprint.obj:     $(MSWDIR)\dcprint.$(SRCSUFF)
+
+$(MSWDIR)\dcscreen.obj:     $(MSWDIR)\dcscreen.$(SRCSUFF)
+
+$(MSWDIR)\dialog.obj:     $(MSWDIR)\dialog.$(SRCSUFF)
+
+$(MSWDIR)\dib.obj:     $(MSWDIR)\dib.$(SRCSUFF)
+
+$(MSWDIR)\dirdlg.obj:     $(MSWDIR)\dirdlg.$(SRCSUFF)
+
+$(MSWDIR)\filedlg.obj:     $(MSWDIR)\filedlg.$(SRCSUFF)
+
+$(MSWDIR)\font.obj:     $(MSWDIR)\font.$(SRCSUFF)
+
+$(MSWDIR)\fontdlg.obj:     $(MSWDIR)\fontdlg.$(SRCSUFF)
+
+$(MSWDIR)\frame.obj:     $(MSWDIR)\frame.$(SRCSUFF)
+
+$(MSWDIR)\gaugemsw.obj:     $(MSWDIR)\gaugemsw.$(SRCSUFF)
+
+$(MSWDIR)\gauge95.obj:     $(MSWDIR)\gauge95.$(SRCSUFF)
+
+$(MSWDIR)\gdiobj.obj:     $(MSWDIR)\gdiobj.$(SRCSUFF)
+
+$(MSWDIR)\icon.obj:     $(MSWDIR)\icon.$(SRCSUFF)
+
+$(MSWDIR)\imaglist.obj:     $(MSWDIR)\imaglist.$(SRCSUFF)
+
+$(MSWDIR)\joystick.obj:     $(MSWDIR)\joystick.$(SRCSUFF)
+
+$(MSWDIR)\listbox.obj:     $(MSWDIR)\listbox.$(SRCSUFF)
+
+$(MSWDIR)\listctrl.obj:     $(MSWDIR)\listctrl.$(SRCSUFF)
+
+$(MSWDIR)\main.obj:     $(MSWDIR)\main.$(SRCSUFF)
+
+$(MSWDIR)\mdi.obj:     $(MSWDIR)\mdi.$(SRCSUFF)
+
+$(MSWDIR)\menu.obj:     $(MSWDIR)\menu.$(SRCSUFF)
+
+$(MSWDIR)\menuitem.obj:     $(MSWDIR)\menu.$(SRCSUFF)
+
+$(MSWDIR)\metafile.obj:     $(MSWDIR)\metafile.$(SRCSUFF)
+
+$(MSWDIR)\minifram.obj:     $(MSWDIR)\minifram.$(SRCSUFF)
+
+$(MSWDIR)\msgdlg.obj:     $(MSWDIR)\msgdlg.$(SRCSUFF)
+
+$(MSWDIR)\nativdlg.obj:     $(MSWDIR)\nativdlg.$(SRCSUFF)
+
+# $(MSWDIR)\notebook.obj:     $(MSWDIR)\notebook.$(SRCSUFF)
+
+$(MSWDIR)\ownerdrw.obj:     $(MSWDIR)\ownerdrw.$(SRCSUFF)
+
+$(MSWDIR)\palette.obj:     $(MSWDIR)\palette.$(SRCSUFF)
+
+$(MSWDIR)\pen.obj:     $(MSWDIR)\pen.$(SRCSUFF)
+
+$(MSWDIR)\penwin.obj:     $(MSWDIR)\penwin.$(SRCSUFF)
+
+$(MSWDIR)\printdlg.obj:     $(MSWDIR)\printdlg.$(SRCSUFF)
+
+$(MSWDIR)\printwin.obj:     $(MSWDIR)\printwin.$(SRCSUFF)
+
+$(MSWDIR)\radiobox.obj:     $(MSWDIR)\radiobox.$(SRCSUFF)
+
+$(MSWDIR)\radiobut.obj:     $(MSWDIR)\radiobut.$(SRCSUFF)
+
+$(MSWDIR)\region.obj:     $(MSWDIR)\region.$(SRCSUFF)
+
+$(MSWDIR)\registry.obj:     $(MSWDIR)\registry.$(SRCSUFF)
+
+$(MSWDIR)\regconf.obj:     $(MSWDIR)\regconf.$(SRCSUFF)
+
+$(MSWDIR)\scrolbar.obj:     $(MSWDIR)\scrolbar.$(SRCSUFF)
+
+$(MSWDIR)\settings.obj:     $(MSWDIR)\settings.$(SRCSUFF)
+
+$(MSWDIR)\slidrmsw.obj:     $(MSWDIR)\slidrmsw.$(SRCSUFF)
+
+$(MSWDIR)\slider95.obj:     $(MSWDIR)\slider95.$(SRCSUFF)
+
+$(MSWDIR)\spinbutt.obj:     $(MSWDIR)\spinbutt.$(SRCSUFF)
+
+$(MSWDIR)\statbmp.obj:     $(MSWDIR)\statbmp.$(SRCSUFF)
+
+$(MSWDIR)\statbox.obj:     $(MSWDIR)\statbox.$(SRCSUFF)
+
+$(MSWDIR)\statbr95.obj:     $(MSWDIR)\statbr95.$(SRCSUFF)
+
+$(MSWDIR)\stattext.obj:     $(MSWDIR)\stattext.$(SRCSUFF)
+
+$(MSWDIR)\tabctrl.obj:     $(MSWDIR)\tabctrl.$(SRCSUFF)
+
+$(MSWDIR)\taskbar.obj:     $(MSWDIR)\taskbar.$(SRCSUFF)
+
+$(MSWDIR)\tbar95.obj:     $(MSWDIR)\tbar95.$(SRCSUFF)
+
+$(MSWDIR)\tbarmsw.obj:     $(MSWDIR)\tbarmsw.$(SRCSUFF)
+
+$(MSWDIR)\textctrl.obj:     $(MSWDIR)\textctrl.$(SRCSUFF)
+
+$(MSWDIR)\thread.obj:     $(MSWDIR)\thread.$(SRCSUFF)
+
+$(MSWDIR)\timer.obj:     $(MSWDIR)\timer.$(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)\docview.obj:     $(COMMDIR)\docview.$(SRCSUFF)
+
+$(MSWDIR)\docmdi.obj:     $(COMMDIR)\docmdi.$(SRCSUFF)
+
+$(MSWDIR)\dynarray.obj:     $(COMMDIR)\dynarray.$(SRCSUFF)
+
+$(MSWDIR)\dynlib.obj:   $(COMMDIR)\dynlib.$(SRCSUFF)
+
+$(MSWDIR)\event.obj:     $(COMMDIR)\event.$(SRCSUFF)
+
+$(MSWDIR)\file.obj:     $(COMMDIR)\file.$(SRCSUFF)
+
+$(MSWDIR)\fileconf.obj:     $(COMMDIR)\fileconf.$(SRCSUFF)
+
+$(MSWDIR)\filefn.obj:     $(COMMDIR)\filefn.$(SRCSUFF)
+
+$(MSWDIR)\framecmn.obj:     $(COMMDIR)\framecmn.$(SRCSUFF)
+
+$(MSWDIR)\gdicmn.obj:     $(COMMDIR)\gdicmn.$(SRCSUFF)
+
+$(MSWDIR)\image.obj:     $(COMMDIR)\image.$(SRCSUFF)
+
+$(MSWDIR)\intl.obj:     $(COMMDIR)\intl.$(SRCSUFF)
+
+$(MSWDIR)\ipcbase.obj:     $(COMMDIR)\ipcbase.$(SRCSUFF)
+
+$(MSWDIR)\helpbase.obj:     $(COMMDIR)\helpbase.$(SRCSUFF)
+
+$(MSWDIR)\layout.obj:     $(COMMDIR)\layout.$(SRCSUFF)
+
+$(MSWDIR)\log.obj:     $(COMMDIR)\log.$(SRCSUFF)
+
+$(MSWDIR)\memory.obj:     $(COMMDIR)\memory.$(SRCSUFF)
+
+$(MSWDIR)\module.obj:     $(COMMDIR)\module.$(SRCSUFF)
+
+$(MSWDIR)\object.obj:     $(COMMDIR)\object.$(SRCSUFF)
+
+$(MSWDIR)\odbc.obj:     $(COMMDIR)\odbc.$(SRCSUFF)
+
+$(MSWDIR)\postscrp.obj:     $(COMMDIR)\postscrp.$(SRCSUFF)
+
+$(MSWDIR)\prntbase.obj:     $(COMMDIR)\prntbase.$(SRCSUFF)
+
+$(MSWDIR)\resource.obj:     $(COMMDIR)\resource.$(SRCSUFF)
+
+$(MSWDIR)\tbarbase.obj:     $(COMMDIR)\tbarbase.$(SRCSUFF)
+
+$(MSWDIR)\tbarsmpl.obj:     $(COMMDIR)\tbarsmpl.$(SRCSUFF)
+
+$(MSWDIR)\textfile.obj:     $(COMMDIR)\textfile.$(SRCSUFF)
+
+$(MSWDIR)\timercmn.obj:     $(COMMDIR)\timercmn.$(SRCSUFF)
+
+$(MSWDIR)\utilscmn.obj:     $(COMMDIR)\utilscmn.$(SRCSUFF)
+
+$(MSWDIR)\validate.obj:     $(COMMDIR)\validate.$(SRCSUFF)
+
+$(MSWDIR)\valtext.obj:     $(COMMDIR)\valtext.$(SRCSUFF)
+
+$(MSWDIR)\date.obj:     $(COMMDIR)\date.$(SRCSUFF)
+
+$(MSWDIR)\wxexpr.obj:     $(COMMDIR)\wxexpr.$(SRCSUFF)
+
+$(MSWDIR)\hash.obj:     $(COMMDIR)\hash.$(SRCSUFF)
+
+$(MSWDIR)\list.obj:     $(COMMDIR)\list.$(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)\wincmn.obj:	$(COMMDIR)\wincmn.$(SRCSUFF)
+
+$(MSWDIR)\extended.obj:	$(COMMDIR)\extended.c
+
+$(MSWDIR)\tokenzr.obj:	$(COMMDIR)\tokenzr.$(SRCSUFF)
+
+$(MSWDIR)\socket.obj:	$(COMMDIR)\socket.$(SRCSUFF)
+
+$(MSWDIR)\sckaddr.obj:	$(COMMDIR)\sckaddr.$(SRCSUFF)
+
+$(MSWDIR)\protocol.obj: $(COMMDIR)\protocol.$(SRCSUFF)
+
+$(MSWDIR)\url.obj:	$(COMMDIR)\url.$(SRCSUFF)
+
+$(MSWDIR)\http.obj:	$(COMMDIR)\http.$(SRCSUFF)
+
+$(MSWDIR)\ftp.obj:	$(COMMDIR)\ftp.$(SRCSUFF)
+
+$(MSWDIR)\sckfile.obj:	$(COMMDIR)\sckfile.$(SRCSUFF)
+
+$(MSWDIR)\sckipc.obj:	$(COMMDIR)\sckipc.$(SRCSUFF)
+
+########################################################
+# Generic objects (not always compiled, depending on
+# whether platforms have native implementations)
+
+$(MSWDIR)\choicdgg.obj:     $(GENDIR)\choicdgg.$(SRCSUFF)
+
+$(MSWDIR)\colrdlgg.obj:     $(GENDIR)\colrdlgg.$(SRCSUFF)
+
+$(MSWDIR)\fontdlgg.obj:     $(GENDIR)\fontdlgg.$(SRCSUFF)
+
+$(MSWDIR)\gridg.obj:     $(GENDIR)\gridg.$(SRCSUFF)
+
+$(MSWDIR)\helpxlp.obj:     $(GENDIR)\helpxlp.$(SRCSUFF)
+
+$(MSWDIR)\laywin.obj:     $(GENDIR)\laywin.$(SRCSUFF)
+
+$(MSWDIR)\msgdlgg.obj:     $(GENDIR)\msgdlgg.$(SRCSUFF)
+
+$(MSWDIR)\panelg.obj:     $(GENDIR)\panelg.$(SRCSUFF)
+
+$(MSWDIR)\printps.obj:     $(GENDIR)\printps.$(SRCSUFF)
+
+$(MSWDIR)\prntdlgg.obj:     $(GENDIR)\prntdlgg.$(SRCSUFF)
+
+$(MSWDIR)\sashwin.obj:     $(GENDIR)\sashwin.$(SRCSUFF)
+
+$(MSWDIR)\scrolwin.obj:     $(GENDIR)\scrolwin.$(SRCSUFF)
+
+$(MSWDIR)\splitter.obj:     $(GENDIR)\splitter.$(SRCSUFF)
+
+$(MSWDIR)\statusbr.obj:     $(GENDIR)\statusbr.$(SRCSUFF)
+
+$(MSWDIR)\textdlgg.obj:     $(GENDIR)\textdlgg.$(SRCSUFF)
+
+$(MSWDIR)\tabg.obj:     $(GENDIR)\tabg.$(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
+    make -f makefile.b32
    cd $(WXDIR)\src\msw

-clean_ctl3d:
-    cd $(WXDIR)\contrib\ctl3d\borland
-    make -f makefile.bcc clean
+all_samples:
+    cd $(WXDIR)\samples
+    make -f makefile.b32
    cd $(WXDIR)\src\msw

-itsy:
-    cd $(WXDIR)\contrib\itsybits
-    make -f makefile.bcc DEBUG=$(DEBUG) 
+all_execs:
+    cd $(WXDIR)\utils
+    make -f makefile.b32 all_execs
    cd $(WXDIR)\src\msw

-clean_itsy:
-    cd $(WXDIR)\contrib\itsybits
-    make -f makefile.bcc clean
+all_libs:
    cd $(WXDIR)\src\msw
+    make -f makefile.b32 ctl3d dib fafa gauge hytext itsy prologio rcparser wx wxgraph\
+          wxstring wxtree mfutils # wxxpm

-gauge:
-    cd $(WXDIR)\contrib\gauge
-    make -f makefile.bcc DEBUG=$(DEBUG) 
+all_contribs:
    cd $(WXDIR)\src\msw
+    make -f makefile.b32 ctl3d fafa wxstring itsy gauge # wxxpm

-clean_gauge:
-    cd $(WXDIR)\contrib\gauge
-    make -f makefile.bcc clean
-    cd $(WXDIR)\src\msw
+# CONTRIB
+ctl3d:  $(CFG)
+        cd $(WXDIR)\src\msw\ctl3d\borland
+        make -f makefile.b32 -DCFG=$(CFG)
+        cd $(WXDIR)\src\msw

-xpm:
-    cd $(WXDIR)\contrib\wxxpm
-    make -f makefile.bcc DEBUG=$(DEBUG) 
-    cd $(WXDIR)\src\msw
+wxxpm:	$(CFG)
+	cd $(WXDIR)\src\xpm
+	make -f makefile.b32 -DCFG=$(CFG) -DFINAL=$(FINAL) -DWXWIN=$(WXDIR) -DDEBUG=$(DEBUG)
+	cd $(WXDIR)\src\msw

-clean_xpm:
-    cd $(WXDIR)\contrib\wxxpm
-    make -f makefile.bcc clean
-    cd $(WXDIR)\src\msw
+png:    $(CFG)
+        cd $(WXDIR)\src\png
+        make -f makefile.b32 
+        cd $(WXDIR)\src\msw

-dib:
-    cd $(WXDIR)\utils\dib
-    make -f makefile.bcc DEBUG=$(DEBUG) 
-    cd $(WXDIR)\src\msw
+clean_png:
+        cd $(WXDIR)\src\png
+        make -f makefile.b32 clean
+        cd $(WXDIR)\src\msw

-clean_dib:
-    cd $(WXDIR)\utils\dib
-    make -f makefile.bcc clean
-    cd $(WXDIR)\src\msw
+zlib:   $(CFG)
+        cd $(WXDIR)\src\zlib
+        make -f makefile.b32 lib
+        cd $(WXDIR)\src\msw

-prologio:
-    cd $(WXDIR)\utils\prologio\src
-    make -f makefile.bcc DEBUG=$(DEBUG) 
-    cd $(WXDIR)\src\msw
+clean_zlib:
+        cd $(WXDIR)\src\zlib
+        make -f makefile.b32 clean
+        cd $(WXDIR)\src\msw

-clean_proio:
-    cd $(WXDIR)\utils\prologio\src
-    make -f makefile.bcc clean
-    cd $(WXDIR)\src\msw
+$(CFG): makefile.bcc
+	copy &&!
+-H=$(WXDIR)\src\msw\borland.pch
+-2
+-P
+-d
+-w-hid
+-w-par
+-w-pia
+-w-aus
+-w-rch
+-ml
+-Od
+-WE
+-Fs-
+-Vf
+-Ff=4
+-I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/png;$(WXDIR)/src/zlib
+-I$(WXDIR)\include\wx\msw\gnuwin32
+-L$(BCCDIR)\lib
+-D__WXWIN__
+-D__WXMSW__
+-D__WINDOWS__
+-D__WIN16__
+! $(CFG)
+!if "$(BOR_VER)" == "3.1"
+	echo -Ff=4 >>$(CFG)
+!elif "$(BOR_VER)" == "4"
+	echo -Ff=512 >>$(CFG)
+	echo -dc >>$(CFG)
+!else
+	echo -Ff=512 >>$(CFG)
+	echo -dc >>$(CFG)
+!endif

-rcparser:
-    cd $(WXDIR)\utils\rcparser\src
-    make -f makefile.bcc DEBUG=$(DEBUG) 
-    cd $(WXDIR)\src\msw
-
-wxstring:
-    cd $(WXDIR)\contrib\wxstring
-    make -f makefile.bcc OPTIONS="$(OPTIONS)" DEBUG="$(DEBUG)"
-    cd $(WXDIR)\src\msw
-
-clean_wxstring:
-    cd $(WXDIR)\contrib\wxstring
-    make -f makefile.bcc clean
-    cd $(WXDIR)\src\msw
-
-clean_rcp:
-    cd $(WXDIR)\utils\rcparser\src
-    make -f makefile.bcc clean
-    cd $(WXDIR)\src\msw
+# -O was: -Oxt

 clean: $(PERIPH_CLEAN_TARGET)
    erase $(LIBTARGET)
-    cd $(WXDIR)\src\base
-    erase *.obj
-    cd $(WXDIR)\src\msw
    erase *.obj
+    erase *.pch
+    erase *.csm
+    erase *.cfg
+	erase ..\common\y_tab.c
+    erase ..\common\lex_yy.c

 cleanall: clean
+
+
--- a/src/msw/makefile.g95
+++ b/src/msw/makefile.g95
@@ -29,8 +29,6 @@ include $(WXDIR)/src/makeg95.env
 #               USE_GAUGE should be 1
 #   xpm:      XPM pixmap support
 #               USE_XPM_IN_X should be 1
-#   image:    GIF, BMP image reading
-#               USE_IMAGE_LOADING_IN_X should be 1
 #   wxstring: string class
 #               USE_GNU_WXSTRING should be 1
 #
--- a/src/msw/makefile.nt
+++ b/src/msw/makefile.nt
@@ -1376,7 +1376,8 @@ clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib
 cleanall: clean

 # Making documents
-docs:   hlp
+docs:   allhlp allhtml allpdfrtf
+alldocs: docs
 hlp:    wxhlp portinghlp # faqhlp
 wxhlp:  $(DOCDIR)/winhelp/wx.hlp
 faqhlp: $(DOCDIR)/winhelp/faq.hlp
@@ -1400,8 +1401,6 @@ portinghlp: $(DOCDIR)/winhelp/porting.hlp
 portingpdfrtf: $(DOCDIR)/pdf/porting.rtf
 portingps:	$(WXDIR)\docs\ps\porting.ps

-alldocs: allhlp allhtml allpdfrtf # allps # TeX can't cope with references!
-
 allhlp: wxhlp portinghlp # faqhlp
        cd $(WXDIR)\utils\wxprop\src
        nmake -f makefile.nt hlp
@@ -1678,3 +1677,10 @@ $(WXDIR)\docs\ps\faq.ps:	$(WXDIR)\docs\latex\faq\faq.dvi
 # In order to force document reprocessing
 touchmanual:
    -touch $(WXDIR)\docs\latex\wx\manual.tex
+
+updatedocs: touchmanual alldocs
+
+# Start Word, running the GeneratePDF macro. MakeManual.dot should be in the
+# Office StartUp folder, and PDFMaker should be installed.
+updatepdf:  # touchmanual pdfrtf
+    start /w "winword d:\wx2\wxWindows\docs\latex\pdf\wx.rtf /mGeneratePDF"
--- a/src/msw/makefile.wat
+++ b/src/msw/makefile.wat
@@ -14,7 +14,7 @@ WXLIB = $(WXDIR)\lib

 LIBTARGET   = $(WXLIB)\wx.lib
 DUMMY=dummydll
-ODBCLIB     = ..\..\contrib\odbc\odbc32.lib
+# ODBCLIB     = ..\..\contrib\odbc\odbc32.lib

 EXTRATARGETS = # wxxpm
 EXTRATARGETSCLEAN = # clean_wxxpm
@@ -68,7 +68,6 @@ COMMONOBJS = cmndata.obj &
  log.obj &
  memory.obj &
  module.obj &
-  odbc.obj &
  object.obj &
  prntbase.obj &
  resource.obj &
@@ -106,7 +105,8 @@ COMMONOBJS = cmndata.obj &
  variant.obj &
  wincmn.obj

-# Can't compile this yet under Watcom C++
+# Can't compile these yet under Watcom C++
+#  odbc.obj &
 #  db.obj &
 #  dbtable.obj &

@@ -227,8 +227,9 @@ $(LIBTARGET) : $(OBJECTS)
 	
 clean:   .SYMBOLIC
    -erase *.obj
-    -erase $(LIBLARGET)
+    -erase $(LIBTARGET)
    -erase *.pch
+    -erase *.err

 cleanall:   clean

--- a/src/msw/pnghand.cpp
+++ b/src/msw/pnghand.cpp
@@ -122,7 +122,11 @@ wxPNGReader::Create(int width, int height, int depth, int colortype)
  ColorType = (colortype>=0) ? colortype: ((Depth>8) ? COLORTYPE_COLOR: 0);

  if (lpbi)  {
+#ifdef __WIN16__
+	 GlobalFreePtr((unsigned int) lpbi);
+#else
 	 GlobalFreePtr(lpbi);
+#endif
 //	 delete Palette;
  }
  RawImage = 0;
@@ -137,7 +141,11 @@ wxPNGReader::Create(int width, int height, int depth, int colortype)
 wxPNGReader::~wxPNGReader ( )
 {
  if (lpbi)  {
+#ifdef __WIN16__
+	 GlobalFreePtr((unsigned int) lpbi);
+#else
 	 GlobalFreePtr(lpbi);
+#endif
 	 delete Palette;
  }
 }
--- a/src/msw/treectrl.cpp
+++ b/src/msw/treectrl.cpp
@@ -813,7 +813,7 @@ void wxTreeCtrl::SortChildren(const wxTreeItemId& item)
    }
    else
    {
-        TVSORTCB tvSort;
+        TV_SORTCB tvSort;
        tvSort.hParent = (HTREEITEM)(WXHTREEITEM)item;
        tvSort.lpfnCompare = (PFNTVCOMPARE)TreeView_CompareCallback;
        tvSort.lParam = (LPARAM)this;