Committing in .

 Modified Files:
 	wxWindows/setup.h_vms wxWindows/src/common/descrip.mms
 	wxWindows/src/common/mimecmn.cpp
 	wxWindows/src/generic/descrip.mms
 	wxWindows/src/gtk/descrip.mms wxWindows/src/unix/mimetype.cpp

  Updated compile support for OpenVMS

 ----------------------------------------------------------------------

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

diff --git a/setup.h_vms b/setup.h_vms
index e98846968753d399c17fb7dda76108884c7c72ae..cabcf6885dbfe2a9e51626db93048b0ef62185c0 100644 (file)
--- a/setup.h_vms
+++ b/setup.h_vms
@@ -620,6 +620,11 @@
  */
 #define wxUSE_ZIPSTREAM 1
 
  */
 #define wxUSE_ZIPSTREAM 1
 

+/*
+ * wxImage support
+ */
+#define wxUSE_IMAGE 1
+

 /*
  * GIF image format support
  */
 /*
  * GIF image format support
  */


@@ -635,6 +640,11 @@
  */
 #define wxUSE_PNM 1
  
  */
 #define wxUSE_PNM 1
  

+/*
+ * XPM image format support
+ */
+#define wxUSE_XPM 1
+

 /*
  * Disable this if your compiler can't cope
  * with omission of prototype parameters.
 /*
  * Disable this if your compiler can't cope
  * with omission of prototype parameters.


@@ -665,6 +675,9 @@
  * present */
 #define WX_GMTOFF_IN_TM
 
  * present */
 #define WX_GMTOFF_IN_TM
 

+/* iconv()'s 2nd argument is char ** and not const char ** */
+#define WX_ICONV_TAKES_CHAR 1
+

 /* Define if you have pw_gecos field in struct passwd */
 #undef HAVE_PW_GECOS
 
 /* Define if you have pw_gecos field in struct passwd */
 #undef HAVE_PW_GECOS
 

diff --git a/src/common/descrip.mms b/src/common/descrip.mms
index 1f9a4bfdc03a8cdf7682a3fd9622da9a434d90b7..9d93baa3c3183787a2bad20f0f661ef796e7cd72 100644 (file)
--- a/src/common/descrip.mms
+++ b/src/common/descrip.mms
@@ -89,6 +89,7 @@ OBJECTS1=framecmn.obj,\
                imagpng.obj,\
                imagpnm.obj,\
                imagtiff.obj,\
                imagpng.obj,\
                imagpnm.obj,\
                imagtiff.obj,\

+               imagxpm.obj,\

                intl.obj,\
                ipcbase.obj,\
                layout.obj,\
                intl.obj,\
                ipcbase.obj,\
                layout.obj,\


@@ -136,6 +137,7 @@ OBJECTS1=framecmn.obj,\
                wincmn.obj,\
                wxchar.obj,\
                wxexpr.obj,\
                wincmn.obj,\
                wxchar.obj,\
                wxexpr.obj,\

+               xpmdecod.obj,\

                zipstrm.obj,\
                zstream.obj
 
                zipstrm.obj,\
                zstream.obj
 


@@ -190,6 +192,7 @@ SOURCES = \
                imagpng.cpp,\
                imagpnm.cpp,\
                imagtiff.cpp,\
                imagpng.cpp,\
                imagpnm.cpp,\
                imagtiff.cpp,\

+               imagxpm.cpp,\

                intl.cpp,\
                ipcbase.cpp,\
                layout.cpp,\
                intl.cpp,\
                ipcbase.cpp,\
                layout.cpp,\


@@ -237,6 +240,7 @@ SOURCES = \
                wincmn.cpp,\
                wxchar.cpp,\
                wxexpr.cpp,\
                wincmn.cpp,\
                wxchar.cpp,\
                wxexpr.cpp,\

+               xpmdecod.cpp,\

                zipstrm.cpp,\
                zstream.cpp
 
                zipstrm.cpp,\
                zstream.cpp
 


@@ -321,6 +325,7 @@ imagpcx.obj : imagpcx.cpp
 imagpng.obj : imagpng.cpp
 imagpnm.obj : imagpnm.cpp
 imagtiff.obj : imagtiff.cpp
 imagpng.obj : imagpng.cpp
 imagpnm.obj : imagpnm.cpp
 imagtiff.obj : imagtiff.cpp

+imagxpm.obj : imagxpm.cpp

 intl.obj : intl.cpp
 ipcbase.obj : ipcbase.cpp
 layout.obj : layout.cpp
 intl.obj : intl.cpp
 ipcbase.obj : ipcbase.cpp
 layout.obj : layout.cpp


@@ -368,5 +373,6 @@ wfstream.obj : wfstream.cpp
 wincmn.obj : wincmn.cpp
 wxchar.obj : wxchar.cpp
 wxexpr.obj : wxexpr.cpp
 wincmn.obj : wincmn.cpp
 wxchar.obj : wxchar.cpp
 wxexpr.obj : wxexpr.cpp

+xpmdecod.obj : xpmdecod.cpp

 zipstrm.obj : zipstrm.cpp
 zstream.obj : zstream.cpp
 zipstrm.obj : zipstrm.cpp
 zstream.obj : zstream.cpp

diff --git a/src/common/mimecmn.cpp b/src/common/mimecmn.cpp
index 89b0ab281d4d7ddd67731b3501ca6ee92c3c9aad..a4785b974db5f31a1e6de9c6015ce5617472a84d 100644 (file)
--- a/src/common/mimecmn.cpp
+++ b/src/common/mimecmn.cpp
@@ -351,7 +351,7 @@ size_t wxFileType::GetAllCommands(wxArrayString *verbs,
     if ( commands )
         commands->Clear();
 
     if ( commands )
         commands->Clear();
 

-#if defined (__WXMSW__)  || (__UNIX__)
+#if defined (__WXMSW__)  || defined(__UNIX__)

     return m_impl->GetAllCommands(verbs, commands, params);
 #else // !__WXMSW__ || Unix
     // we don't know how to retrieve all commands, so just try the 2 we know
     return m_impl->GetAllCommands(verbs, commands, params);
 #else // !__WXMSW__ || Unix
     // we don't know how to retrieve all commands, so just try the 2 we know


@@ -385,21 +385,19 @@ bool wxFileType::Unassociate()
 {
 #if defined(__WXMSW__)
     return m_impl->Unassociate();
 {
 #if defined(__WXMSW__)
     return m_impl->Unassociate();

-#endif
-
-#if defined(__UNIX__)
+#elif defined(__UNIX__)

     return m_impl->Unassociate(this);
     return m_impl->Unassociate(this);

-#endif
+#else

 
     wxFAIL_MSG( _T("not implemented") ); // TODO
     return FALSE;
 
     wxFAIL_MSG( _T("not implemented") ); // TODO
     return FALSE;

-
+#endif

 }
 
 bool wxFileType::SetCommand(const wxString& cmd, const wxString& verb,
 bool overwriteprompt)
 {
 }
 
 bool wxFileType::SetCommand(const wxString& cmd, const wxString& verb,
 bool overwriteprompt)
 {

-#if defined (__WXMSW__)  || (__UNIX__)
+#if defined (__WXMSW__)  || defined(__UNIX__)

     return m_impl->SetCommand(cmd, verb, overwriteprompt);
 #else
     wxFAIL_MSG(_T("not implemented"));
     return m_impl->SetCommand(cmd, verb, overwriteprompt);
 #else
     wxFAIL_MSG(_T("not implemented"));


@@ -419,7 +417,7 @@ bool wxFileType::SetDefaultIcon(const wxString& cmd, int index)
 #endif
     wxCHECK_MSG( !sTmp.empty(), FALSE, _T("need the icon file") );
 
 #endif
     wxCHECK_MSG( !sTmp.empty(), FALSE, _T("need the icon file") );
 

-#if defined (__WXMSW__) || (__UNIX__)
+#if defined (__WXMSW__) || defined(__UNIX__)

     return m_impl->SetDefaultIcon (cmd, index);
 #else
     wxFAIL_MSG(_T("not implemented"));
     return m_impl->SetDefaultIcon (cmd, index);
 #else
     wxFAIL_MSG(_T("not implemented"));

diff --git a/src/generic/descrip.mms b/src/generic/descrip.mms
index f95426fa7db096db69a50a3ab99f85810f16e4d5..f1aab5578052178e923f421590bd8de8ee90672c 100644 (file)
--- a/src/generic/descrip.mms
+++ b/src/generic/descrip.mms
@@ -93,6 +93,7 @@ SOURCES = \
                msgdlgg.cpp,\
                notebook.cpp,\
                numdlgg.cpp,\
                msgdlgg.cpp,\
                notebook.cpp,\
                numdlgg.cpp,\

+               paletteg.cpp,\

                panelg.cpp,\
                printps.cpp,\
                prntdlgg.cpp,\
                panelg.cpp,\
                printps.cpp,\
                prntdlgg.cpp,\


@@ -117,8 +118,7 @@ SOURCES = \
 OBJECTS0=,statline.obj,\
                notebook.obj
 .else
 OBJECTS0=,statline.obj,\
                notebook.obj
 .else

-OBJECTS0=,filedlgg.obj
-
+OBJECTS0=,filedlgg.obj,paletteg.obj

 .endif
 
 all : $(SOURCES)
 .endif
 
 all : $(SOURCES)


@@ -153,6 +153,7 @@ logg.obj : logg.cpp
 msgdlgg.obj : msgdlgg.cpp
 notebook.obj : notebook.cpp
 numdlgg.obj : numdlgg.cpp
 msgdlgg.obj : msgdlgg.cpp
 notebook.obj : notebook.cpp
 numdlgg.obj : numdlgg.cpp

+paletteg.obj : paletteg.cpp

 panelg.obj : panelg.cpp
 printps.obj : printps.cpp
 prntdlgg.obj : prntdlgg.cpp
 panelg.obj : panelg.cpp
 printps.obj : printps.cpp
 prntdlgg.obj : prntdlgg.cpp

diff --git a/src/gtk/descrip.mms b/src/gtk/descrip.mms
index c14b0b89dd244509404579da8ee916a6e16ca3b0..096fcf489e87c63b71d52bc7d835a19992dbe19f 100644 (file)
--- a/src/gtk/descrip.mms
+++ b/src/gtk/descrip.mms
@@ -56,12 +56,12 @@ OBJECTS = \
        menu.obj,\
        minifram.obj,\
        notebook.obj,\
        menu.obj,\
        minifram.obj,\
        notebook.obj,\

-       palette.obj,\

        pen.obj,\
        radiobox.obj,\
        radiobut.obj,\
        region.obj,\
        scrolbar.obj,\
        pen.obj,\
        radiobox.obj,\
        radiobut.obj,\
        region.obj,\
        scrolbar.obj,\

+       scrolwin.obj,\

        settings.obj,\
        slider.obj,\
         spinbutt.obj,\
        settings.obj,\
        slider.obj,\
         spinbutt.obj,\


@@ -117,12 +117,12 @@ SOURCES =\
        menu.cpp,\
        minifram.cpp,\
        notebook.cpp,\
        menu.cpp,\
        minifram.cpp,\
        notebook.cpp,\

-       palette.cpp,\

        pen.cpp,\
        radiobox.cpp,\
        radiobut.cpp,\
        region.cpp,\
        scrolbar.cpp,\
        pen.cpp,\
        radiobox.cpp,\
        radiobut.cpp,\
        region.cpp,\
        scrolbar.cpp,\

+       scrolwin.cpp,\

        settings.cpp,\
        slider.cpp,\
         spinbutt.cpp,\
        settings.cpp,\
        slider.cpp,\
         spinbutt.cpp,\


@@ -181,12 +181,12 @@ mdi.obj : mdi.cpp
 menu.obj : menu.cpp
 minifram.obj : minifram.cpp
 notebook.obj : notebook.cpp
 menu.obj : menu.cpp
 minifram.obj : minifram.cpp
 notebook.obj : notebook.cpp

-palette.obj : palette.cpp

 pen.obj : pen.cpp
 radiobox.obj : radiobox.cpp
 radiobut.obj : radiobut.cpp
 region.obj : region.cpp
 scrolbar.obj : scrolbar.cpp
 pen.obj : pen.cpp
 radiobox.obj : radiobox.cpp
 radiobut.obj : radiobut.cpp
 region.obj : region.cpp
 scrolbar.obj : scrolbar.cpp

+scrolwin.obj : scrolwin.cpp

 settings.obj : settings.cpp
 slider.obj : slider.cpp
 spinbutt.obj : spinbutt.cpp
 settings.obj : settings.cpp
 slider.obj : slider.cpp
 spinbutt.obj : spinbutt.cpp

diff --git a/src/gtk1/descrip.mms b/src/gtk1/descrip.mms
index c14b0b89dd244509404579da8ee916a6e16ca3b0..096fcf489e87c63b71d52bc7d835a19992dbe19f 100644 (file)
--- a/src/gtk1/descrip.mms
+++ b/src/gtk1/descrip.mms
@@ -56,12 +56,12 @@ OBJECTS = \
        menu.obj,\
        minifram.obj,\
        notebook.obj,\
        menu.obj,\
        minifram.obj,\
        notebook.obj,\

-       palette.obj,\

        pen.obj,\
        radiobox.obj,\
        radiobut.obj,\
        region.obj,\
        scrolbar.obj,\
        pen.obj,\
        radiobox.obj,\
        radiobut.obj,\
        region.obj,\
        scrolbar.obj,\

+       scrolwin.obj,\

        settings.obj,\
        slider.obj,\
         spinbutt.obj,\
        settings.obj,\
        slider.obj,\
         spinbutt.obj,\


@@ -117,12 +117,12 @@ SOURCES =\
        menu.cpp,\
        minifram.cpp,\
        notebook.cpp,\
        menu.cpp,\
        minifram.cpp,\
        notebook.cpp,\

-       palette.cpp,\

        pen.cpp,\
        radiobox.cpp,\
        radiobut.cpp,\
        region.cpp,\
        scrolbar.cpp,\
        pen.cpp,\
        radiobox.cpp,\
        radiobut.cpp,\
        region.cpp,\
        scrolbar.cpp,\

+       scrolwin.cpp,\

        settings.cpp,\
        slider.cpp,\
         spinbutt.cpp,\
        settings.cpp,\
        slider.cpp,\
         spinbutt.cpp,\


@@ -181,12 +181,12 @@ mdi.obj : mdi.cpp
 menu.obj : menu.cpp
 minifram.obj : minifram.cpp
 notebook.obj : notebook.cpp
 menu.obj : menu.cpp
 minifram.obj : minifram.cpp
 notebook.obj : notebook.cpp

-palette.obj : palette.cpp

 pen.obj : pen.cpp
 radiobox.obj : radiobox.cpp
 radiobut.obj : radiobut.cpp
 region.obj : region.cpp
 scrolbar.obj : scrolbar.cpp
 pen.obj : pen.cpp
 radiobox.obj : radiobox.cpp
 radiobut.obj : radiobut.cpp
 region.obj : region.cpp
 scrolbar.obj : scrolbar.cpp

+scrolwin.obj : scrolwin.cpp

 settings.obj : settings.cpp
 slider.obj : slider.cpp
 spinbutt.obj : spinbutt.cpp
 settings.obj : settings.cpp
 slider.obj : slider.cpp
 spinbutt.obj : spinbutt.cpp

diff --git a/src/unix/mimetype.cpp b/src/unix/mimetype.cpp
index b2a2ee51f0d6676f2a8e883996ba9a1f91e11afa..5f86b8f068ddcbae87e5fc6e474bbe08f2b1d4b1 100644 (file)
--- a/src/unix/mimetype.cpp
+++ b/src/unix/mimetype.cpp
@@ -79,6 +79,11 @@
 // other standard headers
 #include <ctype.h>
 
 // other standard headers
 #include <ctype.h>
 

+#ifdef __VMS
+/* silence warnings for comparing unsigned int's <0 */
+# pragma message disable unscomzer
+#endif
+

 // this is a class to extend wxArrayString...
 class wxMimeArrayString : public wxArrayString
 {
 // this is a class to extend wxArrayString...
 class wxMimeArrayString : public wxArrayString
 {