diff --git a/samples/notebook/notebook.cpp b/samples/notebook/notebook.cpp
index 5b029bae30..0192e2052e 100644
--- a/samples/notebook/notebook.cpp
+++ b/samples/notebook/notebook.cpp
@@ -37,7 +37,7 @@ bool MyApp::OnInit()
     if ( !wxApp::OnInit() )
         return false;
 
-#ifdef __WXGTK__
+#ifdef __WXGTK20__
     // Many version of wxGTK generate spurious diagnostic messages when
     // destroying wxNotebook (or removing pages from it), allow wxWidgets to
     // suppress them.
diff --git a/setup.h_vms b/setup.h_vms
index e0c05436e1..d582957de9 100644
--- a/setup.h_vms
+++ b/setup.h_vms
@@ -3,7 +3,7 @@
  * Template for the set.h file for VMS                                       *
  * Created from setup.h_in                                                   *
  * Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                            *
- * Date : 16 March 2022                                                      *
+ * Date : 30 May 2022                                                        *
  *                                                                           *
  *****************************************************************************/
 
@@ -659,6 +659,10 @@ typedef pid_t GPid;
 
 #define wxUSE_LIBTIFF       1
 
+#define wxUSE_NANOSVG       1
+
+#define wxUSE_NANOSVG_EXTERNAL 0
+
 #define wxUSE_TGA           1
 
 #define wxUSE_GIF           1