update to make digitalmars compile/link image sample

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

diff --git a/src/common/datetime.cpp b/src/common/datetime.cpp
index 45a15e0c880532fc76d7c419c582fe38500beef3..7ff53bacf56e6ddaf64207e2bf2ce0cab2b73bca 100644 (file)
--- a/src/common/datetime.cpp
+++ b/src/common/datetime.cpp
@@ -3530,7 +3530,8 @@ const wxChar *wxDateTime::ParseTime(const wxChar *time)
         size_t len = timeString.length();
         if ( timeString.CmpNoCase(wxString(time, len)) == 0 )
         {
         size_t len = timeString.length();
         if ( timeString.CmpNoCase(wxString(time, len)) == 0 )
         {

-            Set(stdTimes[n].hour, 0, 0);
+            // casts required by DigitalMars
+            Set(stdTimes[n].hour, wxDateTime_t(0), wxDateTime_t(0));

 
             return time + len;
         }
 
             return time + len;
         }

diff --git a/src/common/regex.cpp b/src/common/regex.cpp
index cbaa57991dc9acfad1fdb91d09a2936e13bf5b53..6f041f7680d08136547ff9fd7f322da40374a738 100644 (file)
--- a/src/common/regex.cpp
+++ b/src/common/regex.cpp
@@ -39,7 +39,7 @@
 #endif //WX_PRECOMP
 
 // FreeBSD & Watcom require this, it probably doesn't hurt for others
 #endif //WX_PRECOMP
 
 // FreeBSD & Watcom require this, it probably doesn't hurt for others

-#if defined(__UNIX__) || defined(__WATCOMC__)
+#if defined(__UNIX__) || defined(__WATCOMC__) || defined(__DIGITALMARS__)

     #include <sys/types.h>
 #endif
 
     #include <sys/types.h>
 #endif
 

diff --git a/src/common/valgen.cpp b/src/common/valgen.cpp
index b4814ac7b05b1db33ea568245adb057f771ae0e6..6b8e98e061529cc915b8690576f0fd45008dd160 100644 (file)
--- a/src/common/valgen.cpp
+++ b/src/common/valgen.cpp
@@ -44,13 +44,13 @@
   #include "wx/slider.h"
 #endif
 
   #include "wx/slider.h"
 #endif
 

-#if wxUSE_SPINCTRL && !defined(__WIN16__)
+ 

   #include "wx/spinctrl.h"
   #include "wx/spinctrl.h"

-#endif
-#if wxUSE_SPINBTN && !defined(__WIN16__)
+
+#if wxUSE_SPINBTN 

   #include "wx/spinbutt.h"
 #endif
   #include "wx/spinbutt.h"
 #endif

-#if wxUSE_CHECKLISTBOX && !defined(__WIN16__)
+#if wxUSE_CHECKLISTBOX 

   #include "wx/checklst.h"
 #endif
 
   #include "wx/checklst.h"
 #endif
 

diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp
index 891d11d7aa9472ab8f1cd516b7cb527d300c4367..b42f9d6d9ee0a19f81421dbe1eb061d7841234ad 100644 (file)
--- a/src/generic/dirctrlg.cpp
+++ b/src/generic/dirctrlg.cpp
@@ -614,7 +614,9 @@ void wxGenericDirCtrl::OnExpandItem(wxTreeEvent &event)
 
     // VS: this is needed because the event handler is called from wxTreeCtrl
     //     ctor when wxTR_HIDE_ROOT was specified
 
     // VS: this is needed because the event handler is called from wxTreeCtrl
     //     ctor when wxTR_HIDE_ROOT was specified

-    if (m_rootId == 0)
+
+    if (!m_rootId.IsOk())
+

         m_rootId = m_treeCtrl->GetRootItem();
 
     ExpandDir(parentId);
         m_rootId = m_treeCtrl->GetRootItem();
 
     ExpandDir(parentId);

diff --git a/src/makeprog.sc b/src/makeprog.sc
index 1e5289068e0a1ca30c3131893e2504bb466935d7..31562629b778d0a0a61c691c95209d6fb5fc2210 100644 (file)
--- a/src/makeprog.sc
+++ b/src/makeprog.sc
@@ -7,7 +7,7 @@ INCLUDE=$(INCDIR)
 include $(WXDIR)\src\makesc.env
 
 $(TARGET).exe: $(TARGET).obj $(TARGET).res
 include $(WXDIR)\src\makesc.env
 
 $(TARGET).exe: $(TARGET).obj $(TARGET).res

-       link $(LDFLAGS) $*, $@, $*, $(LIBS)
+       link $(LDFLAGS) /DELEXECUTABLE /RC $*, $@, $*, $(LIBS)

     
 
 sc32.def:
     
 
 sc32.def:

diff --git a/src/makesc.env b/src/makesc.env
index d7919768af08da2e8972e777602b5203941fdb31..3e76e640f4244710e613e316e14aa34153059f5c 100644 (file)
--- a/src/makesc.env
+++ b/src/makesc.env
@@ -8,6 +8,8 @@ MSWINCDIR = $(WXDIR)\include\wx\msw
 ARCHINCDIR = $(WXDIR)\lib\$(SC_SUFFIX)
 LIBDIR = $(WXDIR)\lib
 WXLIB = $(LIBDIR)\wx$(SC_SUFFIX).lib
 ARCHINCDIR = $(WXDIR)\lib\$(SC_SUFFIX)
 LIBDIR = $(WXDIR)\lib
 WXLIB = $(LIBDIR)\wx$(SC_SUFFIX).lib

+WINSOCKLIB = $(LIBDIR)\winsock$(SC_SUFFIX).lib
+SUPPORTLIBS = $(LIBDIR)\png$(SC_SUFFIX).lib $(LIBDIR)\tiff$(SC_SUFFIX).lib $(LIBDIR)\jpeg$(SC_SUFFIX).lib $(LIBDIR)\zlib$(SC_SUFFIX).lib

 
 SRCSUFF = cpp
 OBJSUFF = obj
 
 SRCSUFF = cpp
 OBJSUFF = obj


@@ -21,19 +23,12 @@ INCLUDE=-I$(INCDIR) -I$(ARCHINCDIR) -I$(WXDIR)/src/regex;$(WXDIR)/src/png;$(WXDI
 CC=dmc
 RC=rcc
 
 CC=dmc
 RC=rcc
 

-# WIN16 settings
-#CFLAGS = -Jm -ml -W -D__WXMSW__ -D__SC__ -D__WXDEBUG__ -D__WINDOWS__ -D__WIN16__ $(EXTRACPPFLAGS)
-#LINKER = link
-#LDFLAGS = -ml -W -L$(LINKER).exe $(EXTRALDFLAGS)
-#LIBS=$(WXLIB) $(EXTRALIBS) libw.lib commdlg.lib ddeml.lib shell.lib # $(LIB)\ctl3dv2.lib
-#DEFFILE=sc16.def
-

 # WIN32 settings
 # -H ... fix to use directory
 CFLAGS = -o -mn -W -H -D__NT__ -DWIN32 -D__WIN32__ -D__WIN95__ -D__WINDOWS__ -D__WXMSW__ -D__SC__ -D__WXDEBUG__ $(EXTRACPPFLAGS)
 LINKER = link
 # WIN32 settings
 # -H ... fix to use directory
 CFLAGS = -o -mn -W -H -D__NT__ -DWIN32 -D__WIN32__ -D__WIN95__ -D__WINDOWS__ -D__WXMSW__ -D__SC__ -D__WXDEBUG__ $(EXTRACPPFLAGS)
 LINKER = link

-LDFLAGS = /DELEXECUTABLE /RC $(EXTRALDFLAGS)
-LIBS=$(WXLIB) $(EXTRALIBS) advapi32 comctl32 comdlg32 ctl3d32 gc  gdi32 kernel32 ole32 oleaut32 snn user32 uuid 
+LDFLAGS = $(EXTRALDFLAGS)
+LIBS=$(WXLIB) $(EXTRALIBS) $(SUPPORTLIBS) advapi32 comctl32 comdlg32 ctl3d32 gc  gdi32 kernel32 ole32 oleaut32 snn user32 uuid $(WINSOCKLIB)

 DEFFILE=sc32.def
 
 .$(SRCSUFF).obj:
 DEFFILE=sc32.def
 
 .$(SRCSUFF).obj:

diff --git a/src/msw/makefile.sc b/src/msw/makefile.sc
index 798f7a323bb79808d3b717c96e302455fc9bc31a..852d757876f99186dfc7ecb1c91058e68d0178d8 100644 (file)
--- a/src/msw/makefile.sc
+++ b/src/msw/makefile.sc
@@ -331,7 +331,8 @@ MAKEARCHDIR:
     @if not exist $(ARCHINCDIR)\wx\setup.h copy $(MSWINCDIR)\setup.h $(ARCHINCDIR)\wx\setup.h
 
 MAKEWINSOCKLIB:
     @if not exist $(ARCHINCDIR)\wx\setup.h copy $(MSWINCDIR)\setup.h $(ARCHINCDIR)\wx\setup.h
 
 MAKEWINSOCKLIB:

-    implib /system /v /suffix /Ic:\wx\dm\include\win32 $(WINSOCKLIB) $(WINDIR)\system32\winsock.dll
+      @if not exist $(WINSOCKLIB) implib  /s $(WINSOCKLIB) $(WINDIR)\system32\winsock.dll
+##    implib /system /v /suffix /Ic:\wx\dm\include\win32 $(WINSOCKLIB) $(WINDIR)\system32\winsock.dll

 ##    implib  /s $(WINSOCKLIB) $(WINDIR)\system32\winsock.dll
 ##@if not exist $(WINSOCKLIB)  
 
 ##    implib  /s $(WINSOCKLIB) $(WINDIR)\system32\winsock.dll
 ##@if not exist $(WINSOCKLIB)  
 

diff --git a/src/tiff/tiffcomp.h b/src/tiff/tiffcomp.h
index 2f7d0dd2cb3666bd1b7228df48629e288450e81d..dde87646578800f1c4e9ea775e0c1bdf8aa36bcc 100644 (file)
--- a/src/tiff/tiffcomp.h
+++ b/src/tiff/tiffcomp.h
@@ -60,9 +60,13 @@
 #endif
 #endif
 
 #endif
 #endif
 

+#if defined (__SC__) && !defined (__DMC__)
+    #define __SYMANTEC__
+#endif
+

 #include <stdio.h>
 
 #include <stdio.h>
 

-#if defined(__PPCC__) || defined(__SC__) || defined(__MRC__)
+#if defined(__PPCC__) || defined(__SYMANTEC__) || defined(__MRC__)

 #include <types.h>
 #elif !defined(__MWERKS__) && !defined(THINK_C) && !defined(__acornriscos) && !defined(applec)
 #include <sys/types.h>
 #include <types.h>
 #elif !defined(__MWERKS__) && !defined(THINK_C) && !defined(__acornriscos) && !defined(applec)
 #include <sys/types.h>


@@ -83,7 +87,7 @@
  * additional includes are also done to pull in the
  * appropriate definitions we're looking for.
  */
  * additional includes are also done to pull in the
  * appropriate definitions we're looking for.
  */

-#if defined(__MWERKS__) || defined(THINK_C) || defined(__PPCC__) || defined(__SC__) || defined(__MRC__)
+#if defined(__MWERKS__) || defined(THINK_C) || defined(__PPCC__) || defined(__SYMANTEC__) || defined(__MRC__)

 #include <stdlib.h>
 #define        BSDTYPES
 #define        HAVE_UNISTD_H   0
 #include <stdlib.h>
 #define        BSDTYPES
 #define        HAVE_UNISTD_H   0


@@ -137,7 +141,7 @@ typedef     unsigned long u_long;
  * stack (when coerced by the compiler).
  */
 /* Note: on MacPowerPC "extended" is undefined. So only use it for 68K-Macs */
  * stack (when coerced by the compiler).
  */
 /* Note: on MacPowerPC "extended" is undefined. So only use it for 68K-Macs */

-#if defined(__SC__) || defined(THINK_C)
+#if defined(__SYMANTEC__) || defined(THINK_C)

 typedef extended dblparam_t;
 #else
 typedef double dblparam_t;
 typedef extended dblparam_t;
 #else
 typedef double dblparam_t;