Committing in .

Patches for the wxGTK compilation on VMS

 Modified Files:
 	wxWindows/descrip.mms wxWindows/setup.h_vms
 	wxWindows/include/wx/gtk/app.h
 	wxWindows/samples/minimal/descrip.mms
 	wxWindows/src/generic/descrip.mms
 	wxWindows/src/generic/filedlgg.cpp wxWindows/src/gtk/app.cpp
 	wxWindows/src/gtk/descrip.mms wxWindows/src/gtk/listbox.cpp
 	wxWindows/src/gtk/utilsgtk.cpp wxWindows/src/gtk/win_gtk.c
 	wxWindows/src/gtk/window.cpp
 	wxWindows/src/gtk/wx_gtk_vmsjackets.c
 ----------------------------------------------------------------------


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

descrip.mms

@@ -14,10 +14,10 @@
 	set def [.wxwindows]
 
 all :
-	make gtk
+	make motif
 	purge [...]
 	delete [...]*.obj;
-	make motif
+	make gtk
 	purge [...]
 	delete [...]*.obj;
 

include/wx/gtk/app.h

@@ -82,4 +82,14 @@ 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,4 +82,14 @@ 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__

samples/minimal/descrip.mms

@@ -38,9 +38,7 @@ minimal.exe : minimal.obj
 .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
 

setup.h_vms

@@ -141,7 +141,11 @@
 /*
  * Use Threads
  */
+#ifndef __WXGTK__
 #define wxUSE_THREADS 1
+#else
+#define wxUSE_THREADS 0
+#endif
 /*
  * Have glibc2
  */

src/generic/descrip.mms

@@ -70,6 +70,7 @@ SOURCES = \
 		colrdlgg.cpp,\
 		dcpsg.cpp,\
 		dirdlgg.cpp,\
+		filedlgg.cpp,\
 		fontdlgg.cpp,\
 		grid.cpp,\
 		helpext.cpp,\
@@ -107,7 +108,8 @@ SOURCES = \
 OBJECTS0=,statline.obj,\
 		notebook.obj
 .else
-OBJECTS0=
+OBJECTS0=,filedlgg.obj
+
 .endif
 
 all : $(SOURCES)
@@ -116,7 +118,7 @@ all : $(SOURCES)
 	library/crea [--.lib]libwx_motif.olb $(OBJECTS)$(OBJECTS0)
 .else
 .ifdef __WXGTK__
-	library/crea [--.lib]libwx_gtk.olb $(OBJECTS)
+	library/crea [--.lib]libwx_gtk.olb $(OBJECTS)$(OBJECTS0)
 .endif
 .endif
 
@@ -127,6 +129,7 @@ choicdgg.obj : choicdgg.cpp
 colrdlgg.obj : colrdlgg.cpp
 dcpsg.obj : dcpsg.cpp
 dirdlgg.obj : dirdlgg.cpp
+filedlgg.obj : filedlgg.cpp
 fontdlgg.obj : fontdlgg.cpp
 grid.obj : grid.cpp
 helpext.obj : helpext.cpp

src/generic/filedlgg.cpp

@@ -46,8 +46,10 @@
 #include <sys/stat.h>
 #include <dirent.h>
 #include <pwd.h>
-#include <grp.h>
-#include <time.h>
+#ifndef __VMS
+# include <grp.h>
+#endif
+# include <time.h>
 #include <unistd.h>
 
 #include "wx/generic/home.xpm"
@@ -273,7 +275,7 @@ wxFileData::wxFileData( const wxString &name, const wxString &fname )
     struct stat buff;
     stat( m_fileName.fn_str(), &buff );
 
-#ifndef __EMX__
+#if !defined( __EMX__ ) && !defined(__VMS)
     struct stat lbuff;
     lstat( m_fileName.fn_str(), &lbuff );
     m_isLink = S_ISLNK( lbuff.st_mode );

src/gtk/app.cpp

@@ -570,10 +570,16 @@ int wxEntryStart( int argc, char *argv[] )
 {
 #if wxUSE_THREADS
     /* GTK 1.2 up to version 1.2.3 has broken threads */
-    if ((gtk_major_version == 1) &&
+#ifdef __VMS__
+   if ((vms_gtk_major_version() == 1) &&
+        (vms_gtk_minor_version() == 2) &&
+        (vms_gtk_micro_version() < 4))
+#else
+   if ((gtk_major_version == 1) &&
         (gtk_minor_version == 2) &&
         (gtk_micro_version < 4))
-    {
+#endif
+     {
         printf( "wxWindows warning: GUI threading disabled due to outdated GTK version\n" );
     }
     else

src/gtk/descrip.mms

@@ -40,7 +40,6 @@ OBJECTS = \
 	dcscreen.obj,\
 	dialog.obj,\
         dnd.obj,\
-	filedlg.obj,\
 	font.obj,\
 	fontdlg.obj,\
 	frame.obj,\
@@ -102,7 +101,6 @@ SOURCES =\
 	dcscreen.cpp,\
 	dialog.cpp,\
         dnd.cpp,\
-	filedlg.cpp,\
 	font.cpp,\
 	fontdlg.cpp,\
 	frame.cpp,\
@@ -167,7 +165,6 @@ dcmemory.obj : dcmemory.cpp
 dcscreen.obj : dcscreen.cpp
 dialog.obj : dialog.cpp
 dnd.obj : dnd.cpp
-filedlg.obj : filedlg.cpp
 font.obj : font.cpp
 fontdlg.obj : fontdlg.cpp
 frame.obj : frame.cpp
@@ -205,4 +202,4 @@ 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
+	cc $(CFLAGS)$(CXX_DEFINE) wx_gtk_vmsjackets.c/name=(as_is,short)

src/gtk/listbox.cpp

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

src/gtk/utilsgtk.cpp

@@ -77,7 +77,7 @@ bool wxSetDetectableAutoRepeat( bool WXUNUSED(flag) )
 
 void *wxGetDisplay()
 {
-    return gdk_display;
+    return GDK_DISPLAY();
 }
 
 void wxDisplaySize( int *width, int *height )

src/gtk/win_gtk.c

@@ -9,11 +9,12 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////// */
 
-#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 "wx/gtk/win_gtk.h"
 #include "gtk/gtksignal.h"
 #include "gtk/gtkprivate.h"
 #include "gdk/gdkx.h"

src/gtk/window.cpp

@@ -273,7 +273,7 @@ gdk_window_warp_pointer (GdkWindow      *window,
   GdkWindowPrivate *priv;
 
   if (!window)
-    window = (GdkWindow*) &gdk_root_parent;
+    window = GDK_ROOT_PARENT();
 
   priv = (GdkWindowPrivate*) window;
 

src/gtk1/app.cpp

@@ -570,10 +570,16 @@ int wxEntryStart( int argc, char *argv[] )
 {
 #if wxUSE_THREADS
     /* GTK 1.2 up to version 1.2.3 has broken threads */
-    if ((gtk_major_version == 1) &&
+#ifdef __VMS__
+   if ((vms_gtk_major_version() == 1) &&
+        (vms_gtk_minor_version() == 2) &&
+        (vms_gtk_micro_version() < 4))
+#else
+   if ((gtk_major_version == 1) &&
         (gtk_minor_version == 2) &&
         (gtk_micro_version < 4))
-    {
+#endif
+     {
         printf( "wxWindows warning: GUI threading disabled due to outdated GTK version\n" );
     }
     else

src/gtk1/descrip.mms

@@ -40,7 +40,6 @@ OBJECTS = \
 	dcscreen.obj,\
 	dialog.obj,\
         dnd.obj,\
-	filedlg.obj,\
 	font.obj,\
 	fontdlg.obj,\
 	frame.obj,\
@@ -102,7 +101,6 @@ SOURCES =\
 	dcscreen.cpp,\
 	dialog.cpp,\
         dnd.cpp,\
-	filedlg.cpp,\
 	font.cpp,\
 	fontdlg.cpp,\
 	frame.cpp,\
@@ -167,7 +165,6 @@ dcmemory.obj : dcmemory.cpp
 dcscreen.obj : dcscreen.cpp
 dialog.obj : dialog.cpp
 dnd.obj : dnd.cpp
-filedlg.obj : filedlg.cpp
 font.obj : font.cpp
 fontdlg.obj : fontdlg.cpp
 frame.obj : frame.cpp
@@ -205,4 +202,4 @@ 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
+	cc $(CFLAGS)$(CXX_DEFINE) wx_gtk_vmsjackets.c/name=(as_is,short)

src/gtk1/listbox.cpp

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

src/gtk1/utilsgtk.cpp

@@ -77,7 +77,7 @@ bool wxSetDetectableAutoRepeat( bool WXUNUSED(flag) )
 
 void *wxGetDisplay()
 {
-    return gdk_display;
+    return GDK_DISPLAY();
 }
 
 void wxDisplaySize( int *width, int *height )

src/gtk1/win_gtk.c

@@ -9,11 +9,12 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////// */
 
-#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 "wx/gtk/win_gtk.h"
 #include "gtk/gtksignal.h"
 #include "gtk/gtkprivate.h"
 #include "gdk/gdkx.h"

src/gtk1/window.cpp

@@ -273,7 +273,7 @@ gdk_window_warp_pointer (GdkWindow      *window,
   GdkWindowPrivate *priv;
 
   if (!window)
-    window = (GdkWindow*) &gdk_root_parent;
+    window = GDK_ROOT_PARENT();
 
   priv = (GdkWindowPrivate*) window;