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

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;