Committing in .

VMS/GTK compile support

 Modified Files:
 	wxWindows/descrip.mms wxWindows/setup.h_vms
 	wxWindows/samples/minimal/descrip.mms
 	wxWindows/src/common/descrip.mms
 	wxWindows/src/common/resource.cpp
 	wxWindows/src/generic/descrip.mms
 	wxWindows/src/gtk/dcclient.cpp wxWindows/src/gtk/filedlg.cpp
 	wxWindows/src/gtk/fontdlg.cpp wxWindows/src/gtk/listbox.cpp
 	wxWindows/src/gtk/tbargtk.cpp wxWindows/src/gtk/win_gtk.c
 	wxWindows/src/unix/descrip.mms wxWindows/src/unix/fontenum.cpp
 Added Files:
 	wxWindows/lib/vms_gtk.opt
 	wxWindows/src/gtk/wx_gtk_vmsjackets.c
 ----------------------------------------------------------------------


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

descrip.mms

@@ -13,35 +13,56 @@
 	define/job/trans=(concealed) wx_root "''wx_fuldir'"
 	set def [.wxwindows]
 
-all : setup.h
+all :
+	make gtk
+	purge [...]
+	delete [...]*.obj;
+	make motif
+	purge [...]
+	delete [...]*.obj;
+
+gtk : setup.h
 	set default [.src.generic]
-	$(MMS)$(MMSQUALIFIERS)
+	$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
 	set default [-.common]
-	$(MMS)$(MMSQUALIFIERS)
+	$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
 	set default [-.unix]
-	$(MMS)$(MMSQUALIFIERS)
+	$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
+	set default [-.gtk]
+	$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
+	set default [--.samples.minimal]
+	$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
+
+motif : setup.h
+	set default [.src.generic]
+	$(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1)
+	set default [-.common]
+	$(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1)
+	set default [-.unix]
+	$(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1)
 	set default [-.motif]
-	$(MMS)$(MMSQUALIFIERS)
+	$(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1)
 	set default [--.demos.bombs]
-	$(MMS)$(MMSQUALIFIERS)
+	$(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1)
 	set default [--.samples.caret]
-	$(MMS)$(MMSQUALIFIERS)
+	$(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1)
 	set default [-.checklst]
-	$(MMS)$(MMSQUALIFIERS)
+	$(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1)
 	set default [-.config]
-	$(MMS)$(MMSQUALIFIERS)
+	$(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1)
 	set default [-.controls]
-	$(MMS)$(MMSQUALIFIERS)
+	$(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1)
 	set default [-.dialogs]
-	$(MMS)$(MMSQUALIFIERS)
+	$(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1)
-	set default [-.image]
+#	set default [-.image]
-	$(MMS)$(MMSQUALIFIERS)
+#	$(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1)
 	set default [-.menu]
-	$(MMS)$(MMSQUALIFIERS)
+	$(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1)
 	set default [-.minimal]
-	$(MMS)$(MMSQUALIFIERS)
+	$(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1)
 	set default [--.utils.dialoged.src]
-	$(MMS)$(MMSQUALIFIERS)
+	$(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1)
+	set default [--]
 
 setup.h : setup.h_vms
 	copy setup.h_vms setup.h

lib/vms_gtk.opt

@@ -0,0 +1,11 @@
+wx_root:[wxwindows.lib]libwx_gtk.olb/lib
+sys$library:libjpeg.olb/lib
+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$library:decw$xlibshr.exe/share

samples/minimal/descrip.mms

@@ -11,8 +11,12 @@
 .ifdef __WXMOTIF__
 CXX_DEFINE = /define=(__WXMOTIF__=1)
 .else
+.ifdef __WXGTK__
+CXX_DEFINE = /define=(__WXGTK__=1)
+.else
 CXX_DEFINE =
 .endif
+.endif
 
 .suffixes : .cpp
 
@@ -20,11 +24,24 @@ CXX_DEFINE =
 	cxx $(CXXFLAGS)$(CXX_DEFINE) $(MMS$TARGET_NAME).cpp
 
 all :
-	$(MMS)$(MMSQUALIFIERS) minimal.exe
-
-minimal.exe : minimal.obj
 .ifdef __WXMOTIF__
+	$(MMS)$(MMSQUALIFIERS) minimal.exe
+.else
+.ifdef __WXGTK__
+	$(MMS)$(MMSQUALIFIERS) minimal_gtk.exe
+.endif
+.endif
+
+.ifdef __WXMOTIF__
+minimal.exe : minimal.obj
 	cxxlink minimal,[--.lib]vms/opt
+.else
+.ifdef __WXGTK__
+minimal_gtk.exe : minimal.obj
+	ass link.lis sys$output
+	cxxlink/exec=minimal_gtk.exe minimal,[--.lib]vms_gtk/opt
+	deass sys$output
+.endif
 .endif
 
 minimal.obj : minimal.cpp

setup.h_vms

@@ -68,7 +68,7 @@
 #undef YYTEXT_POINTER
 
 /* Define this if your version of GTK+ is greater than 1.2 */
-#undef __WXGTK12__
+#define __WXGTK12__ 1
 
 /* Define this if your version of GTK+ is greater than 1.3 */
 #undef __WXGTK13__

src/common/descrip.mms

@@ -12,8 +12,12 @@
 .ifdef __WXMOTIF__
 CXX_DEFINE = /define=(__WXMOTIF__=1)
 .else
+.ifdef __WXGTK__
+CXX_DEFINE = /define=(__WXGTK__=1)
+.else
 CXX_DEFINE =
 .endif
+.endif
 
 YACC=bison/yacc
 
@@ -231,6 +235,11 @@ all : $(SOURCES)
 .ifdef __WXMOTIF__
 	library [--.lib]libwx_motif.olb $(OBJECTS)
 	library [--.lib]libwx_motif.olb $(OBJECTS1)
+.else
+.ifdef __WXGTK__
+	library [--.lib]libwx_gtk.olb $(OBJECTS)
+	library [--.lib]libwx_gtk.olb $(OBJECTS1)
+.endif
 .endif
 
 parser.obj : parser.c lexer.c

src/common/resource.cpp

@@ -2477,7 +2477,9 @@ wxBitmap wxResourceCreateBitmap(const wxString& resource, wxResourceTable *table
         return wxBitmap(name, bitmapType);
       }
     }
-    return wxNullBitmap;
+#ifndef __WXGTK__
+     return wxNullBitmap;
+#endif
   }
   else
   {

src/generic/descrip.mms

@@ -11,8 +11,12 @@
 .ifdef __WXMOTIF__
 CXX_DEFINE = /define=(__WXMOTIF__=1)
 .else
+.ifdef __WXGTK__
+CXX_DEFINE = /define=(__WXGTK__=1)
+.else
 CXX_DEFINE =
 .endif
+.endif
 
 .suffixes : .cpp
 
@@ -38,7 +42,6 @@ OBJECTS = \
 		listctrl.obj,\
 		logg.obj,\
 		msgdlgg.obj,\
-		notebook.obj,\
 		numdlgg.obj,\
 		panelg.obj,\
 		plot.obj,\
@@ -51,7 +54,6 @@ OBJECTS = \
 		sashwin.obj,\
 		scrolwin.obj,\
 		splitter.obj,\
-		statline.obj,\
 		statusbr.obj,\
 		tbarsmpl.obj,\
 		tabg.obj,\
@@ -101,11 +103,21 @@ SOURCES = \
 		treectrl.cpp,\
 		wizard.cpp
 
+.ifdef __WXMOTIF__
+OBJECTS0=,statline.obj,\
+		notebook.obj
+.else
+OBJECTS0=
+.endif
 
 all : $(SOURCES)
-	$(MMS)$(MMSQUALIFIERS) $(OBJECTS)
+	$(MMS)$(MMSQUALIFIERS) $(OBJECTS)$(OBJECTS0)
 .ifdef __WXMOTIF__
-	library/crea [--.lib]libwx_motif.olb $(OBJECTS)
+	library/crea [--.lib]libwx_motif.olb $(OBJECTS)$(OBJECTS0)
+.else
+.ifdef __WXGTK__
+	library/crea [--.lib]libwx_gtk.olb $(OBJECTS)
+.endif
 .endif
 
 busyinfo.obj : busyinfo.cpp

src/gtk/dcclient.cpp

@@ -1452,13 +1452,14 @@ void wxWindowDC::SetPen( const wxPen &pen )
         {
             for (int i = 0; i < req_nb_dash; i++)
                 real_req_dash[i] = req_dash[i] * width;
-            gdk_gc_set_dashes( m_penGC, 0, real_req_dash, req_nb_dash );
+            gdk_gc_set_dashes( m_penGC, 0, (gint8*) real_req_dash,
+			      req_nb_dash );
             delete[] real_req_dash;
         }
         else
         {
             // No Memory. We use non-scaled dash pattern...
-            gdk_gc_set_dashes( m_penGC, 0, (char*)req_dash, req_nb_dash );
+            gdk_gc_set_dashes( m_penGC, 0, (gint8*)req_dash, req_nb_dash );
         }
     }
 #endif

src/gtk/filedlg.cpp

@@ -16,6 +16,10 @@
 #include "wx/intl.h"
 #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,6 +17,11 @@
 #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/listbox.cpp

@@ -26,7 +26,12 @@
 #include "wx/tooltip.h"
 #endif
 
-#include <gdk/gdk.h>
+#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 <gdk/gdk.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 

src/gtk/tbargtk.cpp

@@ -26,6 +26,9 @@
 
 #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

@@ -10,6 +10,10 @@
 /////////////////////////////////////////////////////////////////////////// */
 
 #include "wx/gtk/win_gtk.h"
+#ifdef __VMS
+#define gtk_widget_get_child_requisition gtk_widget_get_child_requisitio
+#define gtk_marshal_NONE__POINTER_POINTER gtk_marshal_NONE__POINTER_POINT
+#endif
 #include "gtk/gtksignal.h"
 #include "gtk/gtkprivate.h"
 #include "gdk/gdkx.h"

src/gtk/wx_gtk_vmsjackets.c

@@ -0,0 +1,40 @@
+#include <gdk/gdk.h>
+
+void GDK_BEEP (void)
+{
+   gdk_beep();
+}
+
+GdkBitmap* GDK_BITMAP_CREATE_FROM_DATA	(GdkWindow   *window,
+					 const gchar *data,
+					 gint	      width,
+					 gint	      height)
+{
+   return gdk_bitmap_create_from_data	(window,
+					 data,
+					 width,
+					 height);
+}
+
+void	   GDK_BITMAP_UNREF		(GdkBitmap  *pixmap)
+{
+   gdk_bitmap_unref		(pixmap);
+}
+
+gint	 GDK_CHAR_HEIGHT    (GdkFont        *font,
+			     gchar           character)
+{
+   return gdk_char_height    (font,
+			     character);
+}
+
+GdkColormap* GDK_COLORMAP_GET_SYSTEM	  (void)
+{
+   return gdk_colormap_get_system();
+}
+
+GdkVisual*   GDK_COLORMAP_GET_VISUAL      (GdkColormap    *colormap)
+{
+   return gdk_colormap_get_visual      (colormap);
+}
+

src/gtk1/dcclient.cpp

@@ -1452,13 +1452,14 @@ void wxWindowDC::SetPen( const wxPen &pen )
         {
             for (int i = 0; i < req_nb_dash; i++)
                 real_req_dash[i] = req_dash[i] * width;
-            gdk_gc_set_dashes( m_penGC, 0, real_req_dash, req_nb_dash );
+            gdk_gc_set_dashes( m_penGC, 0, (gint8*) real_req_dash,
+			      req_nb_dash );
             delete[] real_req_dash;
         }
         else
         {
             // No Memory. We use non-scaled dash pattern...
-            gdk_gc_set_dashes( m_penGC, 0, (char*)req_dash, req_nb_dash );
+            gdk_gc_set_dashes( m_penGC, 0, (gint8*)req_dash, req_nb_dash );
         }
     }
 #endif

src/gtk1/filedlg.cpp

@@ -16,6 +16,10 @@
 #include "wx/intl.h"
 #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,6 +17,11 @@
 #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/listbox.cpp

@@ -26,7 +26,12 @@
 #include "wx/tooltip.h"
 #endif
 
-#include <gdk/gdk.h>
+#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 <gdk/gdk.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 

src/gtk1/tbargtk.cpp

@@ -26,6 +26,9 @@
 
 #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

@@ -10,6 +10,10 @@
 /////////////////////////////////////////////////////////////////////////// */
 
 #include "wx/gtk/win_gtk.h"
+#ifdef __VMS
+#define gtk_widget_get_child_requisition gtk_widget_get_child_requisitio
+#define gtk_marshal_NONE__POINTER_POINTER gtk_marshal_NONE__POINTER_POINT
+#endif
 #include "gtk/gtksignal.h"
 #include "gtk/gtkprivate.h"
 #include "gdk/gdkx.h"

src/gtk1/wx_gtk_vmsjackets.c

@@ -0,0 +1,40 @@
+#include <gdk/gdk.h>
+
+void GDK_BEEP (void)
+{
+   gdk_beep();
+}
+
+GdkBitmap* GDK_BITMAP_CREATE_FROM_DATA	(GdkWindow   *window,
+					 const gchar *data,
+					 gint	      width,
+					 gint	      height)
+{
+   return gdk_bitmap_create_from_data	(window,
+					 data,
+					 width,
+					 height);
+}
+
+void	   GDK_BITMAP_UNREF		(GdkBitmap  *pixmap)
+{
+   gdk_bitmap_unref		(pixmap);
+}
+
+gint	 GDK_CHAR_HEIGHT    (GdkFont        *font,
+			     gchar           character)
+{
+   return gdk_char_height    (font,
+			     character);
+}
+
+GdkColormap* GDK_COLORMAP_GET_SYSTEM	  (void)
+{
+   return gdk_colormap_get_system();
+}
+
+GdkVisual*   GDK_COLORMAP_GET_VISUAL      (GdkColormap    *colormap)
+{
+   return gdk_colormap_get_visual      (colormap);
+}
+

src/unix/descrip.mms

@@ -11,8 +11,12 @@
 .ifdef __WXMOTIF__
 CXX_DEFINE = /define=(__WXMOTIF__=1)
 .else
+.ifdef __WXGTK__
+CXX_DEFINE = /define=(__WXGTK__=1)
+.else
 CXX_DEFINE =
 .endif
+.endif
 
 .suffixes : .cpp
 
@@ -45,6 +49,10 @@ all : $(SOURCES)
 	$(MMS)$(MMSQUALIFIERS) $(OBJECTS)
 .ifdef __WXMOTIF__
 	library [--.lib]libwx_motif.olb $(OBJECTS)
+.else
+.ifdef __WXGTK__
+	library [--.lib]libwx_gtk.olb $(OBJECTS)
+.endif
 .endif
 
 dialup.obj : dialup.cpp

src/unix/fontenum.cpp

@@ -30,7 +30,14 @@
 #include "wx/fontenum.h"
 #include "wx/fontutil.h"
 
+#ifdef __VMS__ // Xlib.h for VMS is not (yet) compatible with C++
+               // The resulting warnings are switched off here
+#pragma message disable nosimpint
+#endif
 #include <X11/Xlib.h>
+#ifdef __VMS__
+#pragma message enable nosimpint
+#endif
 
 // ----------------------------------------------------------------------------
 // private functions