From d02af7bbb9848f660bb291a833a892cc5f20cda7 Mon Sep 17 00:00:00 2001 From: Jouk Jansen Date: Thu, 10 Aug 2000 13:24:55 +0000 Subject: [PATCH] Committing in . Modified Files: wxWindows/include/wx/gtk/app.h wxWindows/lib/vms_gtk.opt wxWindows/samples/minimal/descrip.mms wxWindows/src/common/descrip.mms wxWindows/src/generic/colrdlgg.cpp wxWindows/src/generic/descrip.mms wxWindows/src/gtk/dcclient.cpp wxWindows/src/gtk/descrip.mms wxWindows/src/gtk/filedlg.cpp wxWindows/src/gtk/fontdlg.cpp wxWindows/src/gtk/frame.cpp wxWindows/src/gtk/listbox.cpp wxWindows/src/gtk/tbargtk.cpp wxWindows/src/gtk/win_gtk.c wxWindows/src/gtk/window.cpp wxWindows/src/unix/descrip.mms Patches for wxGTK for VMS ---------------------------------------------------------------------- git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8011 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/gtk/app.h | 10 ---------- include/wx/gtk1/app.h | 10 ---------- lib/vms_gtk.opt | 8 ++++---- samples/minimal/descrip.mms | 2 +- src/common/descrip.mms | 2 +- src/generic/colrdlgg.cpp | 5 ----- src/generic/descrip.mms | 2 +- src/gtk/dcclient.cpp | 4 ++++ src/gtk/descrip.mms | 12 ++++-------- src/gtk/filedlg.cpp | 3 --- src/gtk/fontdlg.cpp | 5 ----- src/gtk/frame.cpp | 4 ++++ src/gtk/listbox.cpp | 6 ------ src/gtk/tbargtk.cpp | 3 --- src/gtk/win_gtk.c | 7 +++---- src/gtk/window.cpp | 4 ++++ src/gtk1/dcclient.cpp | 4 ++++ src/gtk1/descrip.mms | 12 ++++-------- src/gtk1/filedlg.cpp | 3 --- src/gtk1/fontdlg.cpp | 5 ----- src/gtk1/frame.cpp | 4 ++++ src/gtk1/listbox.cpp | 6 ------ src/gtk1/tbargtk.cpp | 3 --- src/gtk1/win_gtk.c | 7 +++---- src/gtk1/window.cpp | 4 ++++ src/unix/descrip.mms | 2 +- 26 files changed, 46 insertions(+), 91 deletions(-) diff --git a/include/wx/gtk/app.h b/include/wx/gtk/app.h index 7b911ec302..7564b247c7 100644 --- a/include/wx/gtk/app.h +++ b/include/wx/gtk/app.h @@ -82,14 +82,4 @@ private: DECLARE_EVENT_TABLE() }; -#ifdef __VMS - -extern "C" - { - extern guint vms_gtk_major_version(void); - extern guint vms_gtk_minor_version(void); - extern guint vms_gtk_micro_version(void); - } -#endif - #endif // __GTKAPPH__ diff --git a/include/wx/gtk1/app.h b/include/wx/gtk1/app.h index 7b911ec302..7564b247c7 100644 --- a/include/wx/gtk1/app.h +++ b/include/wx/gtk1/app.h @@ -82,14 +82,4 @@ private: DECLARE_EVENT_TABLE() }; -#ifdef __VMS - -extern "C" - { - extern guint vms_gtk_major_version(void); - extern guint vms_gtk_minor_version(void); - extern guint vms_gtk_micro_version(void); - } -#endif - #endif // __GTKAPPH__ diff --git a/lib/vms_gtk.opt b/lib/vms_gtk.opt index f23fe6c193..cc0749074c 100644 --- a/lib/vms_gtk.opt +++ b/lib/vms_gtk.opt @@ -4,8 +4,8 @@ sys$library:libpng.olb/lib sys$library:libz.olb/lib sys$library:libtiff.olb/lib X11:libxpm.olb/lib -sys$common:[mozilla]libgtk.so/share -sys$common:[mozilla]libgdk.so/share -sys$common:[mozilla]libglib.so/share -sys$common:[mozilla]vms_jackets.so/share +sys$share:libgtk.exe/share +sys$share:libgdk.exe/share +sys$share:libglib.exe/share +sys$share:vms_jackets.exe/share sys$library:decw$xlibshr.exe/share diff --git a/samples/minimal/descrip.mms b/samples/minimal/descrip.mms index 981b022832..3d74dde4a4 100644 --- a/samples/minimal/descrip.mms +++ b/samples/minimal/descrip.mms @@ -12,7 +12,7 @@ CXX_DEFINE = /define=(__WXMOTIF__=1) .else .ifdef __WXGTK__ -CXX_DEFINE = /define=(__WXGTK__=1) +CXX_DEFINE = /list/show=all/define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm .else CXX_DEFINE = .endif diff --git a/src/common/descrip.mms b/src/common/descrip.mms index ba0d4ed855..0bc7210479 100644 --- a/src/common/descrip.mms +++ b/src/common/descrip.mms @@ -13,7 +13,7 @@ CXX_DEFINE = /define=(__WXMOTIF__=1) .else .ifdef __WXGTK__ -CXX_DEFINE = /define=(__WXGTK__=1) +CXX_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm .else CXX_DEFINE = .endif diff --git a/src/generic/colrdlgg.cpp b/src/generic/colrdlgg.cpp index e4b06443bb..d452a8373a 100644 --- a/src/generic/colrdlgg.cpp +++ b/src/generic/colrdlgg.cpp @@ -294,11 +294,6 @@ void wxGenericColourDialog::InitializeColours(void) for (i = 0; i < 16; i++) customColours[i] = -/* -#ifndef __VMS__ - (wxColour&) -#endif -*/ colourData.GetCustomColour(i); singleCustomColour.Set(0, 0, 0); diff --git a/src/generic/descrip.mms b/src/generic/descrip.mms index e345360350..7e09011a7b 100644 --- a/src/generic/descrip.mms +++ b/src/generic/descrip.mms @@ -12,7 +12,7 @@ CXX_DEFINE = /define=(__WXMOTIF__=1) .else .ifdef __WXGTK__ -CXX_DEFINE = /define=(__WXGTK__=1) +CXX_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm .else CXX_DEFINE = .endif diff --git a/src/gtk/dcclient.cpp b/src/gtk/dcclient.cpp index 0cad4913f8..9ffa33f3ba 100644 --- a/src/gtk/dcclient.cpp +++ b/src/gtk/dcclient.cpp @@ -11,6 +11,10 @@ #pragma implementation "dcclient.h" #endif +#ifdef __VMS +#define XCopyPlane XCOPYPLANE +#endif + #include "wx/dcclient.h" #include "wx/dcmemory.h" #include "wx/image.h" diff --git a/src/gtk/descrip.mms b/src/gtk/descrip.mms index 77afe48b86..c2e9985e9e 100644 --- a/src/gtk/descrip.mms +++ b/src/gtk/descrip.mms @@ -8,7 +8,7 @@ .first define wx [--.include.wx] -CXX_DEFINE = /define=(__WXGTK__=1) +CXX_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/iee=denorm .suffixes : .cpp @@ -74,9 +74,8 @@ OBJECTS = \ tooltip.obj,\ utilsgtk.obj,\ utilsres.obj,\ - window.obj,\ win_gtk.obj,\ - wx_gtk_vmsjackets.obj + window.obj SOURCES =\ accel.cpp,\ @@ -135,9 +134,8 @@ SOURCES =\ tooltip.cpp,\ utilsgtk.cpp,\ utilsres.cpp,\ - window.cpp,\ win_gtk.c,\ - wx_gtk_vmsjackets.c + window.cpp all : $(SOURCES) $(MMS)$(MMSQUALIFIERS) $(OBJECTS) @@ -199,7 +197,5 @@ timer.obj : timer.cpp tooltip.obj : tooltip.cpp utilsgtk.obj : utilsgtk.cpp utilsres.obj : utilsres.cpp -window.obj : window.cpp win_gtk.obj : win_gtk.c -wx_gtk_vmsjackets.obj : wx_gtk_vmsjackets.c - cc $(CFLAGS)$(CXX_DEFINE) wx_gtk_vmsjackets.c/name=(as_is,short) +window.obj : window.cpp diff --git a/src/gtk/filedlg.cpp b/src/gtk/filedlg.cpp index 558746b221..0f9fd4887a 100644 --- a/src/gtk/filedlg.cpp +++ b/src/gtk/filedlg.cpp @@ -17,9 +17,6 @@ #include "wx/generic/msgdlgg.h" -#ifdef __VMS__ -#define gtk_file_selection_hide_fileop_buttons gtk_file_selection_hide_fileop_ -#endif #include //----------------------------------------------------------------------------- diff --git a/src/gtk/fontdlg.cpp b/src/gtk/fontdlg.cpp index 1298601a79..0cd7791011 100644 --- a/src/gtk/fontdlg.cpp +++ b/src/gtk/fontdlg.cpp @@ -17,11 +17,6 @@ #include "wx/debug.h" #include "wx/msgdlg.h" -#ifdef __VMS__ -#define gtk_font_selection_dialog_get_type gtk_font_selection_dialog_get_t -#define gtk_font_selection_dialog_get_font gtk_font_selection_dialog_get_f -#define gtk_font_selection_dialog_get_font_name gtk_font_selection_dialog_getnf -#endif #include //----------------------------------------------------------------------------- diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp index 8773d721d2..22ac5af1c2 100644 --- a/src/gtk/frame.cpp +++ b/src/gtk/frame.cpp @@ -19,6 +19,10 @@ #pragma implementation "frame.h" #endif +#ifdef __VMS +#define XIconifyWindow XICONIFYWINDOW +#endif + #include "wx/frame.h" #include "wx/dialog.h" #include "wx/control.h" diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp index 8ff7ab4cd1..4412ded52a 100644 --- a/src/gtk/listbox.cpp +++ b/src/gtk/listbox.cpp @@ -12,12 +12,6 @@ #pragma implementation "listbox.h" #endif -#ifdef __VMS -#define gtk_scrolled_window_add_with_viewport gtk_scrolled_window_add_with_vi -#define gtk_container_set_focus_vadjustment gtk_container_set_focus_vadjust -#define gtk_scrolled_window_get_vadjustment gtk_scrolled_window_get_vadjust -#endif - #include "wx/listbox.h" #if wxUSE_LISTBOX diff --git a/src/gtk/tbargtk.cpp b/src/gtk/tbargtk.cpp index 20cf9afb47..bac1d93d79 100644 --- a/src/gtk/tbargtk.cpp +++ b/src/gtk/tbargtk.cpp @@ -26,9 +26,6 @@ #include "wx/frame.h" -#ifdef __VMS__ -#define gtk_pixmap_set_build_insensitive gtk_pixmap_set_build_insensitiv -#endif #include "glib.h" #include "gdk/gdk.h" #include "gtk/gtk.h" diff --git a/src/gtk/win_gtk.c b/src/gtk/win_gtk.c index b578c9288d..b184659774 100644 --- a/src/gtk/win_gtk.c +++ b/src/gtk/win_gtk.c @@ -9,12 +9,11 @@ // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////// */ -#ifdef __VMS -#define gtk_widget_get_child_requisition gtk_widget_get_child_requisitio -#define gtk_marshal_NONE__POINTER_POINTER gtk_marshal_NONE__POINTER_POINT +#ifdef VMS +#define XCheckIfEvent XCHECKIFEVENT #endif -#include "wx/gtk/setup.h" +#include "wx/setup.h" #include "wx/gtk/win_gtk.h" #include "gtk/gtksignal.h" #include "gtk/gtkprivate.h" diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp index aa212c4d05..7d1eed6e42 100644 --- a/src/gtk/window.cpp +++ b/src/gtk/window.cpp @@ -12,6 +12,10 @@ #pragma implementation "window.h" #endif +#ifdef __VMS +#define XWarpPointer XWARPPOINTER +#endif + #include "wx/defs.h" #include "wx/window.h" #include "wx/dc.h" diff --git a/src/gtk1/dcclient.cpp b/src/gtk1/dcclient.cpp index 0cad4913f8..9ffa33f3ba 100644 --- a/src/gtk1/dcclient.cpp +++ b/src/gtk1/dcclient.cpp @@ -11,6 +11,10 @@ #pragma implementation "dcclient.h" #endif +#ifdef __VMS +#define XCopyPlane XCOPYPLANE +#endif + #include "wx/dcclient.h" #include "wx/dcmemory.h" #include "wx/image.h" diff --git a/src/gtk1/descrip.mms b/src/gtk1/descrip.mms index 77afe48b86..c2e9985e9e 100644 --- a/src/gtk1/descrip.mms +++ b/src/gtk1/descrip.mms @@ -8,7 +8,7 @@ .first define wx [--.include.wx] -CXX_DEFINE = /define=(__WXGTK__=1) +CXX_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/iee=denorm .suffixes : .cpp @@ -74,9 +74,8 @@ OBJECTS = \ tooltip.obj,\ utilsgtk.obj,\ utilsres.obj,\ - window.obj,\ win_gtk.obj,\ - wx_gtk_vmsjackets.obj + window.obj SOURCES =\ accel.cpp,\ @@ -135,9 +134,8 @@ SOURCES =\ tooltip.cpp,\ utilsgtk.cpp,\ utilsres.cpp,\ - window.cpp,\ win_gtk.c,\ - wx_gtk_vmsjackets.c + window.cpp all : $(SOURCES) $(MMS)$(MMSQUALIFIERS) $(OBJECTS) @@ -199,7 +197,5 @@ timer.obj : timer.cpp tooltip.obj : tooltip.cpp utilsgtk.obj : utilsgtk.cpp utilsres.obj : utilsres.cpp -window.obj : window.cpp win_gtk.obj : win_gtk.c -wx_gtk_vmsjackets.obj : wx_gtk_vmsjackets.c - cc $(CFLAGS)$(CXX_DEFINE) wx_gtk_vmsjackets.c/name=(as_is,short) +window.obj : window.cpp diff --git a/src/gtk1/filedlg.cpp b/src/gtk1/filedlg.cpp index 558746b221..0f9fd4887a 100644 --- a/src/gtk1/filedlg.cpp +++ b/src/gtk1/filedlg.cpp @@ -17,9 +17,6 @@ #include "wx/generic/msgdlgg.h" -#ifdef __VMS__ -#define gtk_file_selection_hide_fileop_buttons gtk_file_selection_hide_fileop_ -#endif #include //----------------------------------------------------------------------------- diff --git a/src/gtk1/fontdlg.cpp b/src/gtk1/fontdlg.cpp index 1298601a79..0cd7791011 100644 --- a/src/gtk1/fontdlg.cpp +++ b/src/gtk1/fontdlg.cpp @@ -17,11 +17,6 @@ #include "wx/debug.h" #include "wx/msgdlg.h" -#ifdef __VMS__ -#define gtk_font_selection_dialog_get_type gtk_font_selection_dialog_get_t -#define gtk_font_selection_dialog_get_font gtk_font_selection_dialog_get_f -#define gtk_font_selection_dialog_get_font_name gtk_font_selection_dialog_getnf -#endif #include //----------------------------------------------------------------------------- diff --git a/src/gtk1/frame.cpp b/src/gtk1/frame.cpp index 8773d721d2..22ac5af1c2 100644 --- a/src/gtk1/frame.cpp +++ b/src/gtk1/frame.cpp @@ -19,6 +19,10 @@ #pragma implementation "frame.h" #endif +#ifdef __VMS +#define XIconifyWindow XICONIFYWINDOW +#endif + #include "wx/frame.h" #include "wx/dialog.h" #include "wx/control.h" diff --git a/src/gtk1/listbox.cpp b/src/gtk1/listbox.cpp index 8ff7ab4cd1..4412ded52a 100644 --- a/src/gtk1/listbox.cpp +++ b/src/gtk1/listbox.cpp @@ -12,12 +12,6 @@ #pragma implementation "listbox.h" #endif -#ifdef __VMS -#define gtk_scrolled_window_add_with_viewport gtk_scrolled_window_add_with_vi -#define gtk_container_set_focus_vadjustment gtk_container_set_focus_vadjust -#define gtk_scrolled_window_get_vadjustment gtk_scrolled_window_get_vadjust -#endif - #include "wx/listbox.h" #if wxUSE_LISTBOX diff --git a/src/gtk1/tbargtk.cpp b/src/gtk1/tbargtk.cpp index 20cf9afb47..bac1d93d79 100644 --- a/src/gtk1/tbargtk.cpp +++ b/src/gtk1/tbargtk.cpp @@ -26,9 +26,6 @@ #include "wx/frame.h" -#ifdef __VMS__ -#define gtk_pixmap_set_build_insensitive gtk_pixmap_set_build_insensitiv -#endif #include "glib.h" #include "gdk/gdk.h" #include "gtk/gtk.h" diff --git a/src/gtk1/win_gtk.c b/src/gtk1/win_gtk.c index b578c9288d..b184659774 100644 --- a/src/gtk1/win_gtk.c +++ b/src/gtk1/win_gtk.c @@ -9,12 +9,11 @@ // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////// */ -#ifdef __VMS -#define gtk_widget_get_child_requisition gtk_widget_get_child_requisitio -#define gtk_marshal_NONE__POINTER_POINTER gtk_marshal_NONE__POINTER_POINT +#ifdef VMS +#define XCheckIfEvent XCHECKIFEVENT #endif -#include "wx/gtk/setup.h" +#include "wx/setup.h" #include "wx/gtk/win_gtk.h" #include "gtk/gtksignal.h" #include "gtk/gtkprivate.h" diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp index aa212c4d05..7d1eed6e42 100644 --- a/src/gtk1/window.cpp +++ b/src/gtk1/window.cpp @@ -12,6 +12,10 @@ #pragma implementation "window.h" #endif +#ifdef __VMS +#define XWarpPointer XWARPPOINTER +#endif + #include "wx/defs.h" #include "wx/window.h" #include "wx/dc.h" diff --git a/src/unix/descrip.mms b/src/unix/descrip.mms index 338d2e82f0..cb163e6442 100644 --- a/src/unix/descrip.mms +++ b/src/unix/descrip.mms @@ -12,7 +12,7 @@ CXX_DEFINE = /define=(__WXMOTIF__=1) .else .ifdef __WXGTK__ -CXX_DEFINE = /define=(__WXGTK__=1) +CXX_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm .else CXX_DEFINE = .endif