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

@@ -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__

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__

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

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

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

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);

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

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"

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

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 <gtk/gtk.h>
 
 //-----------------------------------------------------------------------------

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 <gtk/gtk.h>
 
 //-----------------------------------------------------------------------------

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"

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

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"

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"

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"

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"

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

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 <gtk/gtk.h>
 
 //-----------------------------------------------------------------------------

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 <gtk/gtk.h>
 
 //-----------------------------------------------------------------------------

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"

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

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"

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"

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"

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