Committing in .

 Modified Files:
 	wxWindows/descrip.mms wxWindows/setup.h_vms
 	wxWindows/distrib/msw/makefile.rsp
 	wxWindows/src/common/descrip.mms
 Added Files:
 	wxWindows/samples/richedit/descrip.mms

 Updated OpenVMS compile support

 ----------------------------------------------------------------------

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

diff --git a/descrip.mms b/descrip.mms
index b39f2bc227ee47e478b2f552abcdda86f0540675..4607daa1ebcfcefdc69b067abe40b18d14187b92 100644 (file)
--- a/descrip.mms
+++ b/descrip.mms
@@ -60,6 +60,8 @@ gtk : [.include.wx]setup.h
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
        set default [-.resource]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
        set default [-.resource]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)

+       set default [-.richedit]
+       $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)

        set default [--.utils.dialoged.src]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
        set default [--]
        set default [--.utils.dialoged.src]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
        set default [--]

diff --git a/distrib/msw/makefile.rsp b/distrib/msw/makefile.rsp
index f8183e4c3727bb2f58e3c3c9a63e07eaca8f7edf..3e5a5ad1b73ea1901baffee050f801d67b3d922a 100644 (file)
--- a/distrib/msw/makefile.rsp
+++ b/distrib/msw/makefile.rsp
@@ -131,17 +131,24 @@ lib/vms.opt
 lib/vms_gtk.opt
 contrib/samples/mmedia/descrip.mms
 demos/bombs/descrip.mms
 lib/vms_gtk.opt
 contrib/samples/mmedia/descrip.mms
 demos/bombs/descrip.mms

+samples/calendar/descrip.mms

 samples/caret/descrip.mms
 samples/checklst/descrip.mms
 samples/config/descrip.mms
 samples/controls/descrip.mms
 samples/dialogs/descrip.mms
 samples/caret/descrip.mms
 samples/checklst/descrip.mms
 samples/config/descrip.mms
 samples/controls/descrip.mms
 samples/dialogs/descrip.mms

+samples/dnd/descrip.mms
+samples/drawing/descrip.mms

 samples/image/descrip.mms
 samples/image/descrip.mms

+samples/mdi/descrip.mms

 samples/menu/descrip.mms
 samples/minimal/descrip.mms
 samples/menu/descrip.mms
 samples/minimal/descrip.mms

+samples/resource/descrip.mms
+samples/richedit/descrip.mms

 src/common/descrip.mms
 src/generic/descrip.mms
 src/gtk/descrip.mms
 src/common/descrip.mms
 src/generic/descrip.mms
 src/gtk/descrip.mms

+src/html/descrip.mms

 src/motif/descrip.mms
 src/png/scripts/descrip.mms
 src/unix/descrip.mms
 src/motif/descrip.mms
 src/png/scripts/descrip.mms
 src/unix/descrip.mms

diff --git a/samples/richedit/descrip.mms b/samples/richedit/descrip.mms
new file mode 100644 (file)
index 0000000..b3f3c81
--- /dev/null
+++ b/samples/richedit/descrip.mms
@@ -0,0 +1,55 @@
+#*****************************************************************************
+#                                                                            *
+# Make file for VMS                                                          *
+# Author : J.Jansen (joukj@hrem.stm.tudelft.nl)                              *
+# Date : 15 October 2001                                                     *
+#                                                                            *
+#*****************************************************************************
+.first
+       define wx [--.include.wx]
+
+.ifdef __WXMOTIF__
+CXX_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)\
+          /assume=(nostdnew,noglobal_array_new)
+.else
+.ifdef __WXGTK__
+CXX_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm\
+          /assume=(nostdnew,noglobal_array_new)
+.else
+CXX_DEFINE =
+.endif
+.endif
+
+.suffixes : .cpp
+
+.cpp.obj :
+       cxx $(CXXFLAGS)$(CXX_DEFINE) $(MMS$TARGET_NAME).cpp
+
+all :
+.ifdef __WXMOTIF__
+       $(MMS)$(MMSQUALIFIERS) wxlayout.exe
+.else
+.ifdef __WXGTK__
+       $(MMS)$(MMSQUALIFIERS) wxlayout_gtk.exe
+.endif
+.endif
+
+.ifdef __WXMOTIF__
+wxlayout.exe : wxlayout.obj,kbList.obj,wxllist.obj,wxlparser.obj,wxlwindow.obj
+
+       cxxlink wxlayout,kbList.obj,wxllist.obj,wxlparser.obj,wxlwindow.obj,\
+       [--.lib]vms/opt
+.else
+.ifdef __WXGTK__
+wxlayout_gtk.exe : wxlayout.obj,kbList.obj,wxllist.obj,wxlparser.obj,\
+       wxlwindow.obj
+       cxxlink/exec=wxlayout_gtk.exe wxlayout,kbList.obj,wxllist.obj,\
+       wxlparser.obj,wxlwindow.obj,[--.lib]vms_gtk/opt
+.endif
+.endif
+
+wxlayout.obj : wxlayout.cpp
+kbList.obj : kblist.cpp
+wxllist.obj : wxllist.cpp
+wxlparser.obj : wxlparser.cpp
+wxlwindow.obj : wxlwindow.cpp

diff --git a/setup.h_vms b/setup.h_vms
index 78fec5983008d2857a54c9903414eea586f09621..602cd4946dcfcb57fe28cdc0895eae5d6e325939 100644 (file)
--- a/setup.h_vms
+++ b/setup.h_vms
@@ -85,6 +85,7 @@
 #undef __SOLARIS__
 #undef __SUNOS__
 #define __ALPHA__
 #undef __SOLARIS__
 #undef __SUNOS__
 #define __ALPHA__

+#undef __IA64__

 #undef __OSF__
 #undef __DARWIN__
 #undef __NETBSD__
 #undef __OSF__
 #undef __DARWIN__
 #undef __NETBSD__


@@ -111,8 +112,9 @@
 #undef WINVER
 
 /* enable native status bar under Win32 */
 #undef WINVER
 
 /* enable native status bar under Win32 */

-#ifdef __WIN95__
+#if defined(__WIN95__) && !defined(__WXUNIVERSAL__)

 #define wxUSE_NATIVE_STATUSBAR 1
 #define wxUSE_NATIVE_STATUSBAR 1

+#define wxUSE_OWNER_DRAWN 1

 #endif
 
 /* enable rich edit under Win32 */
 #endif
 
 /* enable rich edit under Win32 */


@@ -451,7 +453,6 @@
 #define wxUSE_TOOLBAR_SIMPLE 1
 
 #if defined(__WXWINE__) || defined(__GNUWIN32__) || defined(__WXPM__)
 #define wxUSE_TOOLBAR_SIMPLE 1
 
 #if defined(__WXWINE__) || defined(__GNUWIN32__) || defined(__WXPM__)

-#define wxUSE_OWNER_DRAWN 1 

   #if wxUSE_TOOLBAR
     #define wxUSE_BUTTONBAR 1
   #endif
   #if wxUSE_TOOLBAR
     #define wxUSE_BUTTONBAR 1
   #endif

diff --git a/src/common/descrip.mms b/src/common/descrip.mms
index ea0f7cba5c893a3651a3db4c71b38cc3c17fefca..80b609c340b7c733268699e69eade7b2b5ea2844 100644 (file)
--- a/src/common/descrip.mms
+++ b/src/common/descrip.mms
@@ -120,6 +120,7 @@ OBJECTS1=framecmn.obj,\
                serbase.obj,\
                sizer.obj,\
                socket.obj,\
                serbase.obj,\
                sizer.obj,\
                socket.obj,\

+               statbar.obj,\

                strconv.obj,\
                stream.obj,\
                string.obj,\
                strconv.obj,\
                stream.obj,\
                string.obj,\


@@ -230,6 +231,7 @@ SOURCES = \
                serbase.cpp,\
                sizer.cpp,\
                socket.cpp,\
                serbase.cpp,\
                sizer.cpp,\
                socket.cpp,\

+               statbar.cpp,\

                strconv.cpp,\
                stream.cpp,\
                sysopt.cpp,\
                strconv.cpp,\
                stream.cpp,\
                sysopt.cpp,\


@@ -372,6 +374,7 @@ sckstrm.obj : sckstrm.cpp
 serbase.obj : serbase.cpp
 sizer.obj : sizer.cpp
 socket.obj : socket.cpp
 serbase.obj : serbase.cpp
 sizer.obj : sizer.cpp
 socket.obj : socket.cpp

+statbar.obj : statbar.cpp

 strconv.obj : strconv.cpp
 stream.obj : stream.cpp
 sysopt.obj : sysopt.cpp
 strconv.obj : strconv.cpp
 stream.obj : stream.cpp
 sysopt.obj : sysopt.cpp