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

diff --git a/include/wx/html/htmltag.h b/include/wx/html/htmltag.h
index 7ce80f36293bf5764182eac202c796ded69054e5..e0370b6b12f7710e83a7b440c742bcd0bdff463a 100644 (file)
--- 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 08ad872940368b948287f389f4f9beaf408c8ffb..d317187e2b91c72a009827423ea38dc04de8fd61 100644 (file)
--- 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;