From 1f4514b3787036f88017615880447451d9581913 Mon Sep 17 00:00:00 2001
From: Chris Elliott <biol75@york.ac.uk>
Date: Mon, 1 Sep 2003 12:54:58 +0000
Subject: [PATCH] partial fix for digital mars compilation

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@23342 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 samples/multimon/Makefile.sc       |   2 +-
 samples/multimon/mondrian.ico      | Bin 0 -> 766 bytes
 samples/multimon/multimon_test.cpp |   4 +++-
 samples/multimon/multimon_test.rc  |   6 ++++++
 4 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 samples/multimon/mondrian.ico
 create mode 100644 samples/multimon/multimon_test.rc

diff --git a/samples/multimon/Makefile.sc b/samples/multimon/Makefile.sc
index 394a960d8c..5af185f363 100644
--- a/samples/multimon/Makefile.sc
+++ b/samples/multimon/Makefile.sc
@@ -1,5 +1,5 @@
 #Makefile from wxHatch for Symantec/Digital Mars compiler 
-WXDIR=..\..\..\wxWindows
+WXDIR=..\..
 TARGET=multimon_test
 OBJECTS = $(TARGET).obj 
 EXTRALIBS =
diff --git a/samples/multimon/mondrian.ico b/samples/multimon/mondrian.ico
new file mode 100644
index 0000000000000000000000000000000000000000..2310c5d275a87af295d5ea8dc79ea417a5e74c53
GIT binary patch
literal 766
zcmZQzU<5)11px*Sc)`TLAO@s0fLH;D9e|jTfdxnc0Z<M**w4TKL=5})Lnt5#WHKB$
zaDbtqp#doIAB-6O{|B*v7zjZ^AOa2W|NsACHyAJ}De?dRKnp(HN~rljcR;{k;{zQE
i@;}UZ|9Q?Fpp*~yJCwmWbLIrN`9Qm9%}2L?p!oo$cZ4ed

literal 0
HcmV?d00001

diff --git a/samples/multimon/multimon_test.cpp b/samples/multimon/multimon_test.cpp
index 6d51f3cf88..f52b3bdc32 100644
--- a/samples/multimon/multimon_test.cpp
+++ b/samples/multimon/multimon_test.cpp
@@ -10,7 +10,9 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #include <wx/wx.h>
-#define wxUSE_DISPLAY 1
+#if ! wxUSE_DISPLAY 
+#error "wxUSE_DISPLAY must be set to 1 in $WXWIN\lib\_sc\wx\setup.h"
+#endif
 #include <wx/display.h>
 
 class TestApp : public wxApp
diff --git a/samples/multimon/multimon_test.rc b/samples/multimon/multimon_test.rc
new file mode 100644
index 0000000000..3bf71d6da0
--- /dev/null
+++ b/samples/multimon/multimon_test.rc
@@ -0,0 +1,6 @@
+mondrian ICON "mondrian.ico"
+#include "wx/msw/wx.rc"
+
+#define MINIMAL_QUIT 	1
+#define MINIMAL_ABOUT 	102
+