From 0f02d3d0ec5c415e222929d9fe587a603772fade Mon Sep 17 00:00:00 2001
From: Jouk Jansen <joukj@hrem.nano.tudelft.nl>
Date: Thu, 12 Jul 2001 15:02:40 +0000
Subject: [PATCH] Committing in .
Modified Files:
wxWindows/setup.h_vms wxWindows/src/common/appcmn.cpp
wxWindows/src/common/descrip.mms
wxWindows/src/generic/propform.cpp
wxWindows/src/gtk/descrip.mms
wxWindows/utils/dialoged/src/winstyle.cpp
-Fixed VMS compile support
-added some include's
----------------------------------------------------------------------
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10984 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
setup.h_vms | 16 ++++++++++++++++
src/common/appcmn.cpp | 2 +-
src/common/descrip.mms | 3 +++
src/generic/propform.cpp | 1 +
src/gtk/descrip.mms | 3 ---
src/gtk1/descrip.mms | 3 ---
utils/dialoged/src/winstyle.cpp | 1 +
7 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/setup.h_vms b/setup.h_vms
index f35965a700..56aa2d91c3 100644
--- a/setup.h_vms
+++ b/setup.h_vms
@@ -500,6 +500,10 @@
* Use standard GUI logger
*/
#define wxUSE_LOGGUI 1
+/*
+ * Use old log dialog instead of new wxLogGui
+ */
+#define wxUSE_LOG_DIALOG 1
/*
* Use wxStopWatch
*/
@@ -624,6 +628,10 @@
#else
#define wxUSE_DRAG_AND_DROP 0
#endif
+/*
+ * Use OLE (MSW only)
+*/
+#define wxUSE_OLE 0
/*
* Use spline
*/
@@ -972,6 +980,14 @@
/* Define if you have the <langinfo.h> header file. */
#define HAVE_LANGINFO_H 1
+/* Define if you have the <w32api.h> header file (mingw,cygwin). */
+#undef HAVE_W32API_H
+
+/*
+ * Use MS HTML Help controller (win32)
+ */
+#define wxUSE_MS_HTML_HELP 0
+
/* Define this if you are using gtk and gdk contains support for X11R6 XIM */
#undef HAVE_XIM
diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp
index 3de3b7cd2b..49dfb98eed 100644
--- a/src/common/appcmn.cpp
+++ b/src/common/appcmn.cpp
@@ -206,7 +206,7 @@ void wxAppBase::OnInitCmdLine(wxCmdLineParser& parser)
OPTION_VERBOSE,
gettext_noop("generate verbose log messages")
},
-#endif wxUSE_LOG
+#endif // wxUSE_LOG
#ifdef __WXUNIVERSAL__
{
diff --git a/src/common/descrip.mms b/src/common/descrip.mms
index 3fcf5e2fd0..132ebfbc38 100644
--- a/src/common/descrip.mms
+++ b/src/common/descrip.mms
@@ -120,6 +120,7 @@ OBJECTS1=framecmn.obj,\
strconv.obj,\
stream.obj,\
string.obj,\
+ sysopt.obj,\
tbarbase.obj,\
textcmn.obj,\
textfile.obj,\
@@ -223,6 +224,7 @@ SOURCES = \
socket.cpp,\
strconv.cpp,\
stream.cpp,\
+ sysopt.cpp,\
string.cpp,\
tbarbase.cpp,\
textcmn.cpp,\
@@ -357,6 +359,7 @@ sizer.obj : sizer.cpp
socket.obj : socket.cpp
strconv.obj : strconv.cpp
stream.obj : stream.cpp
+sysopt.obj : sysopt.cpp
string.obj : string.cpp
tbarbase.obj : tbarbase.cpp
textcmn.obj : textcmn.cpp
diff --git a/src/generic/propform.cpp b/src/generic/propform.cpp
index bfd528acc3..bfa779c272 100644
--- a/src/generic/propform.cpp
+++ b/src/generic/propform.cpp
@@ -25,6 +25,7 @@
#ifndef WX_PRECOMP
#endif
+#include "wx/wx.h"
#include "wx/propform.h"
#include <ctype.h>
diff --git a/src/gtk/descrip.mms b/src/gtk/descrip.mms
index 096fcf489e..b66c42069e 100644
--- a/src/gtk/descrip.mms
+++ b/src/gtk/descrip.mms
@@ -20,7 +20,6 @@ CC_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/iee=denorm
cc $(CFLAGS)$(CC_DEFINE) $(MMS$TARGET_NAME).c
OBJECTS = \
- accel.obj,\
app.obj,\
bitmap.obj,\
bmpbuttn.obj,\
@@ -81,7 +80,6 @@ OBJECTS = \
window.obj
SOURCES =\
- accel.cpp,\
app.cpp,\
bitmap.cpp,\
bmpbuttn.cpp,\
@@ -145,7 +143,6 @@ all : $(SOURCES)
$(MMS)$(MMSQUALIFIERS) $(OBJECTS)
library [--.lib]libwx_gtk.olb $(OBJECTS)
-accel.obj : accel.cpp
app.obj : app.cpp
bitmap.obj : bitmap.cpp
bmpbuttn.obj : bmpbuttn.cpp
diff --git a/src/gtk1/descrip.mms b/src/gtk1/descrip.mms
index 096fcf489e..b66c42069e 100644
--- a/src/gtk1/descrip.mms
+++ b/src/gtk1/descrip.mms
@@ -20,7 +20,6 @@ CC_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/iee=denorm
cc $(CFLAGS)$(CC_DEFINE) $(MMS$TARGET_NAME).c
OBJECTS = \
- accel.obj,\
app.obj,\
bitmap.obj,\
bmpbuttn.obj,\
@@ -81,7 +80,6 @@ OBJECTS = \
window.obj
SOURCES =\
- accel.cpp,\
app.cpp,\
bitmap.cpp,\
bmpbuttn.cpp,\
@@ -145,7 +143,6 @@ all : $(SOURCES)
$(MMS)$(MMSQUALIFIERS) $(OBJECTS)
library [--.lib]libwx_gtk.olb $(OBJECTS)
-accel.obj : accel.cpp
app.obj : app.cpp
bitmap.obj : bitmap.cpp
bmpbuttn.obj : bmpbuttn.cpp
diff --git a/utils/dialoged/src/winstyle.cpp b/utils/dialoged/src/winstyle.cpp
index b0b1dae327..fbff2fd54e 100644
--- a/utils/dialoged/src/winstyle.cpp
+++ b/utils/dialoged/src/winstyle.cpp
@@ -22,6 +22,7 @@
#ifndef WX_PRECOMP
#include "wx/wx.h"
+#include "wx/listctrl.h"
#endif
#include <ctype.h>
--
2.47.2