Committing in .

 Changes needed to get dialoged utility compile on VMS

 Modified Files:
 	wxWindows/descrip.mms wxWindows/include/wx/setup.h
 	wxWindows/lib/vms.opt
 	wxWindows/utils/dialoged/src/reseditr.cpp
 ----------------------------------------------------------------------

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

diff --git a/descrip.mms b/descrip.mms
index 558da07823431f62b487d5f85103cb2a93b5ab06..9e62dcbdf620f96f089aeacf452252825ec2b040 100644 (file)
--- a/descrip.mms
+++ b/descrip.mms
@@ -5,6 +5,13 @@
 # Date : 9 November 1999                                                     *
 #                                                                            *
 #*****************************************************************************
 # Date : 9 November 1999                                                     *
 #                                                                            *
 #*****************************************************************************

+.first
+       set def [-]
+       wx_curdir = f$environment("default")
+       wx_sub = f$element(0,"]",wx_curdir)
+       wx_fuldir = "''wx_sub'.]"
+       define/job/trans=(concealed) wx_root "''wx_fuldir'"
+       set def [.wxwindows]

 
 all : setup.h
        set default [.src.generic]
 
 all : setup.h
        set default [.src.generic]


@@ -33,6 +40,8 @@ all : setup.h
        $(MMS)$(MMSQUALIFIERS)
        set default [-.minimal]
        $(MMS)$(MMSQUALIFIERS)
        $(MMS)$(MMSQUALIFIERS)
        set default [-.minimal]
        $(MMS)$(MMSQUALIFIERS)

+       set default [--.utils.dialoged.src]
+       $(MMS)$(MMSQUALIFIERS)

 
 setup.h : setup.h_vms
        copy setup.h_vms setup.h
 
 setup.h : setup.h_vms
        copy setup.h_vms setup.h

diff --git a/include/wx/setup.h b/include/wx/setup.h
index 226b2d3ed6de9e1e86fc9444051ecd3aec1ff3f4..de71dae16b4f9d0e0a4a18389146203118a049eb 100644 (file)
--- a/include/wx/setup.h
+++ b/include/wx/setup.h
@@ -16,7 +16,7 @@
 #endif
 
 #ifdef __VMS
 #endif
 
 #ifdef __VMS

-#include "[--]setup.h"
+#include "wx_root:[wxwindows]setup.h"

 #elif defined(__WXMSW__)
 #include "wx/msw/setup.h"
 #elif defined(__WXMAC__)
 #elif defined(__WXMSW__)
 #include "wx/msw/setup.h"
 #elif defined(__WXMAC__)

diff --git a/lib/vms.opt b/lib/vms.opt
index 4e09c12016266f6e4950ca12cc27a5f58112ba3d..9964a89a80a02ea2ebee58836d17ef37db0511fe 100644 (file)
--- a/lib/vms.opt
+++ b/lib/vms.opt
@@ -1,4 +1,4 @@
-[--.lib]libwx_motif.olb/lib
+wx_root:[wxwindows.lib]libwx_motif.olb/lib

 sys$library:libjpeg.olb/lib
 sys$library:libpng.olb/lib
 sys$library:libz.olb/lib
 sys$library:libjpeg.olb/lib
 sys$library:libpng.olb/lib
 sys$library:libz.olb/lib

diff --git a/utils/dialoged/src/reseditr.cpp b/utils/dialoged/src/reseditr.cpp
index cd539913b8713ee52b8d2e016d0433cdf67d8335..60b6ded16d5d1f82e706270a6a2c4496f59397a7 100644 (file)
--- a/utils/dialoged/src/reseditr.cpp
+++ b/utils/dialoged/src/reseditr.cpp
@@ -1601,7 +1601,7 @@ wxString wxResourceManager::FindBitmapFilenameForResource(wxItemResource *resour
     wxItemResource *child = (wxItemResource *)node->Data();
     return child->GetName();
     
     wxItemResource *child = (wxItemResource *)node->Data();
     return child->GetName();
     

-    node = node->Next();
+    //node = node->Next();

   }
   return wxEmptyString;
 }
   }
   return wxEmptyString;
 }