From: Jouk Jansen <joukj@hrem.nano.tudelft.nl>
Date: Wed, 22 Mar 2006 07:47:22 +0000 (+0000)
Subject:  Committing in .
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/bbc8b0ee186a1f06ae207f19bbcdb6ec21e53a29?ds=inline

 Committing in .

 Updates to make OpenVMS happy

 Modified Files:
 	wxWidgets/setup.h_vms wxWidgets/include/wx/defs.h
 	wxWidgets/src/gtk/choice.cpp wxWidgets/src/gtk/descrip.mms
 ----------------------------------------------------------------------


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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 183929d0f3..b29297df86 100644
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -2873,7 +2873,10 @@ typedef GtkWidget *WXWidget;
 #ifdef __WXGTK20__
 #define G_DISABLE_DEPRECATED
 #define PANGO_DISABLE_DEPRECATED
-#define GTK_DISABLE_DEPRECATED
+#ifndef __VMS
+/* GtkCombo is not defined on VMS if this is defined */
+# define GTK_DISABLE_DEPRECATED
+#endif
 #endif
 
 #endif /*  __WXGTK__ */
diff --git a/setup.h_vms b/setup.h_vms
index 61b5a863f9..af928cfdb8 100644
--- a/setup.h_vms
+++ b/setup.h_vms
@@ -630,6 +630,10 @@ typedef pid_t GPid;
  * Use GNOME print for printing under GTK+ 2.0
  */
 #define wxUSE_LIBGNOMEPRINT 0
+/*
+ * Use GNOME VFS for MIME types
+ */
+#define wxUSE_LIBGNOMEVFS 0
 /*
  * Use the Hildon framework
  */
diff --git a/src/gtk/choice.cpp b/src/gtk/choice.cpp
index 84eb8ca7f0..d1478144eb 100644
--- a/src/gtk/choice.cpp
+++ b/src/gtk/choice.cpp
@@ -483,6 +483,10 @@ void wxChoice::DoApplyWidgetStyle(GtkRcStyle *style)
     }
 }
 
+#ifdef __VMS
+#pragma message disable unscomzer
+#endif
+
 int wxChoice::GtkAddHelper(GtkWidget *menu, size_t pos, const wxString& item)
 {
     wxCHECK_MSG((pos>=0) && (pos<=m_clientList.GetCount()), -1, wxT("invalid index"));
@@ -551,6 +555,10 @@ int wxChoice::GtkAddHelper(GtkWidget *menu, size_t pos, const wxString& item)
     return index;
 }
 
+#ifdef __VMS
+#pragma message enable unscomzer
+#endif
+
 wxSize wxChoice::DoGetBestSize() const
 {
     wxSize ret( wxControl::DoGetBestSize() );
diff --git a/src/gtk/descrip.mms b/src/gtk/descrip.mms
index d11df004d0..6685e852ab 100644
--- a/src/gtk/descrip.mms
+++ b/src/gtk/descrip.mms
@@ -2,7 +2,7 @@
 #                                                                            *
 # Make file for VMS                                                          *
 # Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *
-# Date : 20 February 2006                                                    *
+# Date : 20 March 2006                                                       *
 #                                                                            *
 #*****************************************************************************
 .first
@@ -101,7 +101,8 @@ OBJECTS0= \
 	tbargtk.obj,\
 	textctrl.obj,\
 	tglbtn.obj,\
-	msgdlg.obj
+	msgdlg.obj,\
+	treeentry_gtk.obj
 
 SOURCES =\
 	app.cpp,\
@@ -169,7 +170,8 @@ SOURCES =\
 	utilsgtk.cpp,\
 	utilsres.cpp,\
         win_gtk.c,\
-	window.cpp
+	window.cpp,\
+	treeentry_gtk.c
    
 all : $(SOURCES)
 	$(MMS)$(MMSQUALIFIERS) $(OBJECTS)
@@ -256,3 +258,4 @@ utilsgtk.obj : utilsgtk.cpp
 utilsres.obj : utilsres.cpp
 win_gtk.obj : win_gtk.c
 window.obj : window.cpp
+treeentry_gtk.obj : treeentry_gtk.c