From: Jouk Jansen Date: Tue, 1 May 2001 14:46:48 +0000 (+0000) Subject: Committing in . X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/2900bd1c815e119fb3ada94334011198ff3d3ce5 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 e988469687..cabcf6885d 100644 --- a/setup.h_vms +++ b/setup.h_vms @@ -620,6 +620,11 @@ */ #define wxUSE_ZIPSTREAM 1 +/* + * wxImage support + */ +#define wxUSE_IMAGE 1 + /* * GIF image format support */ @@ -635,6 +640,11 @@ */ #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. @@ -665,6 +675,9 @@ * 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 diff --git a/src/common/descrip.mms b/src/common/descrip.mms index 1f9a4bfdc0..9d93baa3c3 100644 --- a/src/common/descrip.mms +++ b/src/common/descrip.mms @@ -89,6 +89,7 @@ OBJECTS1=framecmn.obj,\ imagpng.obj,\ imagpnm.obj,\ imagtiff.obj,\ + imagxpm.obj,\ intl.obj,\ ipcbase.obj,\ layout.obj,\ @@ -136,6 +137,7 @@ OBJECTS1=framecmn.obj,\ wincmn.obj,\ wxchar.obj,\ wxexpr.obj,\ + xpmdecod.obj,\ zipstrm.obj,\ zstream.obj @@ -190,6 +192,7 @@ SOURCES = \ imagpng.cpp,\ imagpnm.cpp,\ imagtiff.cpp,\ + imagxpm.cpp,\ intl.cpp,\ ipcbase.cpp,\ layout.cpp,\ @@ -237,6 +240,7 @@ SOURCES = \ wincmn.cpp,\ wxchar.cpp,\ wxexpr.cpp,\ + xpmdecod.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 +imagxpm.obj : imagxpm.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 +xpmdecod.obj : xpmdecod.cpp zipstrm.obj : zipstrm.cpp zstream.obj : zstream.cpp diff --git a/src/common/mimecmn.cpp b/src/common/mimecmn.cpp index 89b0ab281d..a4785b974d 100644 --- 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 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 @@ -385,21 +385,19 @@ bool wxFileType::Unassociate() { #if defined(__WXMSW__) return m_impl->Unassociate(); -#endif - -#if defined(__UNIX__) +#elif defined(__UNIX__) return m_impl->Unassociate(this); -#endif +#else wxFAIL_MSG( _T("not implemented") ); // TODO return FALSE; - +#endif } 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")); @@ -419,7 +417,7 @@ bool wxFileType::SetDefaultIcon(const wxString& cmd, int index) #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")); diff --git a/src/generic/descrip.mms b/src/generic/descrip.mms index f95426fa7d..f1aab55780 100644 --- a/src/generic/descrip.mms +++ b/src/generic/descrip.mms @@ -93,6 +93,7 @@ SOURCES = \ msgdlgg.cpp,\ notebook.cpp,\ numdlgg.cpp,\ + paletteg.cpp,\ panelg.cpp,\ printps.cpp,\ prntdlgg.cpp,\ @@ -117,8 +118,7 @@ SOURCES = \ OBJECTS0=,statline.obj,\ notebook.obj .else -OBJECTS0=,filedlgg.obj - +OBJECTS0=,filedlgg.obj,paletteg.obj .endif all : $(SOURCES) @@ -153,6 +153,7 @@ logg.obj : logg.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 diff --git a/src/gtk/descrip.mms b/src/gtk/descrip.mms index c14b0b89dd..096fcf489e 100644 --- a/src/gtk/descrip.mms +++ b/src/gtk/descrip.mms @@ -56,12 +56,12 @@ OBJECTS = \ menu.obj,\ minifram.obj,\ notebook.obj,\ - palette.obj,\ pen.obj,\ radiobox.obj,\ radiobut.obj,\ region.obj,\ scrolbar.obj,\ + scrolwin.obj,\ settings.obj,\ slider.obj,\ spinbutt.obj,\ @@ -117,12 +117,12 @@ SOURCES =\ menu.cpp,\ minifram.cpp,\ notebook.cpp,\ - palette.cpp,\ pen.cpp,\ radiobox.cpp,\ radiobut.cpp,\ region.cpp,\ scrolbar.cpp,\ + scrolwin.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 -palette.obj : palette.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 diff --git a/src/gtk1/descrip.mms b/src/gtk1/descrip.mms index c14b0b89dd..096fcf489e 100644 --- a/src/gtk1/descrip.mms +++ b/src/gtk1/descrip.mms @@ -56,12 +56,12 @@ OBJECTS = \ menu.obj,\ minifram.obj,\ notebook.obj,\ - palette.obj,\ pen.obj,\ radiobox.obj,\ radiobut.obj,\ region.obj,\ scrolbar.obj,\ + scrolwin.obj,\ settings.obj,\ slider.obj,\ spinbutt.obj,\ @@ -117,12 +117,12 @@ SOURCES =\ menu.cpp,\ minifram.cpp,\ notebook.cpp,\ - palette.cpp,\ pen.cpp,\ radiobox.cpp,\ radiobut.cpp,\ region.cpp,\ scrolbar.cpp,\ + scrolwin.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 -palette.obj : palette.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 diff --git a/src/unix/mimetype.cpp b/src/unix/mimetype.cpp index b2a2ee51f0..5f86b8f068 100644 --- a/src/unix/mimetype.cpp +++ b/src/unix/mimetype.cpp @@ -79,6 +79,11 @@ // other standard headers #include +#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 {