From c3952f6524b5827420836f856ef2074f20e72849 Mon Sep 17 00:00:00 2001 From: Kendall Bennett Date: Wed, 2 May 2001 20:55:56 +0000 Subject: [PATCH 1/1] Fixed wxHTML code in a Watcom Win32 DLL git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9970 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/html/htmltag.h | 2 +- src/common/xpmdecod.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/wx/html/htmltag.h b/include/wx/html/htmltag.h index 7ce80f3629..e0370b6b12 100644 --- a/include/wx/html/htmltag.h +++ b/include/wx/html/htmltag.h @@ -25,7 +25,7 @@ struct wxHtmlCacheItem; -class wxHtmlTagsCache : public wxObject +class WXDLLEXPORT wxHtmlTagsCache : public wxObject { DECLARE_DYNAMIC_CLASS(wxHtmlTagsCache) diff --git a/src/common/xpmdecod.cpp b/src/common/xpmdecod.cpp index 08ad872940..d317187e2b 100644 --- a/src/common/xpmdecod.cpp +++ b/src/common/xpmdecod.cpp @@ -560,9 +560,9 @@ static bool GetRGBFromName(const char *inname, bool *isNone, if ( cmp == 0 ) { rgbVal = theRGBRecords[middle].rgb; - *r = (rgbVal >> 16) & 0xFF; - *g = (rgbVal >> 8) & 0xFF; - *b = (rgbVal) & 0xFF; + *r = (unsigned char)((rgbVal >> 16) & 0xFF); + *g = (unsigned char)((rgbVal >> 8) & 0xFF); + *b = (unsigned char)((rgbVal) & 0xFF); *isNone = FALSE; free(name); return TRUE; -- 2.45.2