X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5d3e7b52d84580c28df8f754b81363502f917ac7..4200d1f4164a82739e3e54f5a85f25910c8a8d1d:/src/common/gdicmn.cpp?ds=sidebyside diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp index 27236ce40a..b9c743a87a 100644 --- a/src/common/gdicmn.cpp +++ b/src/common/gdicmn.cpp @@ -255,7 +255,7 @@ void wxColourDatabase::Initialize() static const struct wxColourDesc { const wxChar *name; - int r,g,b; + unsigned char r,g,b; } wxColourTable[] = { @@ -538,7 +538,7 @@ void wxInitializeStockObjects () GetThemeFont(kThemeSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ; sizeFont = fontSize ; -#if __WXMAC_CLASSIC__ +#ifdef __WXMAC_CLASSIC__ wxNORMAL_FONT = new wxFont (fontSize, wxMODERN, wxNORMAL, wxNORMAL , false , wxMacMakeStringFromPascal(fontName) ); #else wxNORMAL_FONT = new wxFont () ; @@ -563,7 +563,7 @@ void wxInitializeStockObjects () #elif defined(__WXMAC__) wxSWISS_FONT = new wxFont (sizeFont, wxSWISS, wxNORMAL, wxNORMAL); /* Helv */ wxITALIC_FONT = new wxFont (sizeFont, wxROMAN, wxITALIC, wxNORMAL); -#if __WXMAC_CLASSIC__ +#ifdef __WXMAC_CLASSIC__ GetThemeFont(kThemeSmallSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ; wxSMALL_FONT = new wxFont (fontSize, wxSWISS, wxNORMAL, wxNORMAL , false , wxMacMakeStringFromPascal( fontName ) ); #else