Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

replaced T() makro with wxT() due to namespace probs, _T() exists, too

Browse Source 
fixed compilation problems, mainly in html code
compiles and links fine on Solaris, runs with samples and Mahogany


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3894 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Karsten Ballüder
1999-10-08 14:35:56 +00:00
parent b4a2ab728b
commit 223d09f6b5
336 changed files with 3755 additions and 3776 deletions
Download Patch File Download Diff File Expand all files Collapse all files

150
src/common/gdicmn.cpp
View File

@@ -144,84 +144,84 @@ void wxColourDatabase::Initialize ()
static cdef table[]={
// #ifdef __WXMSW__
{T("AQUAMARINE"),112, 219, 147},
{T("BLACK"),0, 0, 0},
{T("BLUE"), 0, 0, 255},
{T("BLUE VIOLET"), 159, 95, 159},
{T("BROWN"), 165, 42, 42},
{T("CADET BLUE"), 95, 159, 159},
{T("CORAL"), 255, 127, 0},
{T("CORNFLOWER BLUE"), 66, 66, 111},
{T("CYAN"), 0, 255, 255},
{T("DARK GREY"), 47, 47, 47}, // ?
{wxT("AQUAMARINE"),112, 219, 147},
{wxT("BLACK"),0, 0, 0},
{wxT("BLUE"), 0, 0, 255},
{wxT("BLUE VIOLET"), 159, 95, 159},
{wxT("BROWN"), 165, 42, 42},
{wxT("CADET BLUE"), 95, 159, 159},
{wxT("CORAL"), 255, 127, 0},
{wxT("CORNFLOWER BLUE"), 66, 66, 111},
{wxT("CYAN"), 0, 255, 255},
{wxT("DARK GREY"), 47, 47, 47}, // ?
{T("DARK GREEN"), 47, 79, 47},
{T("DARK OLIVE GREEN"), 79, 79, 47},
{T("DARK ORCHID"), 153, 50, 204},
{T("DARK SLATE BLUE"), 107, 35, 142},
{T("DARK SLATE GREY"), 47, 79, 79},
{T("DARK TURQUOISE"), 112, 147, 219},
{T("DIM GREY"), 84, 84, 84},
{T("FIREBRICK"), 142, 35, 35},
{T("FOREST GREEN"), 35, 142, 35},
{T("GOLD"), 204, 127, 50},
{T("GOLDENROD"), 219, 219, 112},
{T("GREY"), 128, 128, 128},
{T("GREEN"), 0, 255, 0},
{T("GREEN YELLOW"), 147, 219, 112},
{T("INDIAN RED"), 79, 47, 47},
{T("KHAKI"), 159, 159, 95},
{T("LIGHT BLUE"), 191, 216, 216},
{T("LIGHT GREY"), 192, 192, 192},
{T("LIGHT STEEL BLUE"), 143, 143, 188},
{T("LIME GREEN"), 50, 204, 50},
{T("LIGHT MAGENTA"), 255, 0, 255},
{T("MAGENTA"), 255, 0, 255},
{T("MAROON"), 142, 35, 107},
{T("MEDIUM AQUAMARINE"), 50, 204, 153},
{T("MEDIUM GREY"), 100, 100, 100},
{T("MEDIUM BLUE"), 50, 50, 204},
{T("MEDIUM FOREST GREEN"), 107, 142, 35},
{T("MEDIUM GOLDENROD"), 234, 234, 173},
{T("MEDIUM ORCHID"), 147, 112, 219},
{T("MEDIUM SEA GREEN"), 66, 111, 66},
{T("MEDIUM SLATE BLUE"), 127, 0, 255},
{T("MEDIUM SPRING GREEN"), 127, 255, 0},
{T("MEDIUM TURQUOISE"), 112, 219, 219},
{T("MEDIUM VIOLET RED"), 219, 112, 147},
{T("MIDNIGHT BLUE"), 47, 47, 79},
{T("NAVY"), 35, 35, 142},
{T("ORANGE"), 204, 50, 50},
{T("ORANGE RED"), 255, 0, 127},
{T("ORCHID"), 219, 112, 219},
{T("PALE GREEN"), 143, 188, 143},
{T("PINK"), 188, 143, 234},
{T("PLUM"), 234, 173, 234},
{T("PURPLE"), 176, 0, 255},
{T("RED"), 255, 0, 0},
{T("SALMON"), 111, 66, 66},
{T("SEA GREEN"), 35, 142, 107},
{T("SIENNA"), 142, 107, 35},
{T("SKY BLUE"), 50, 153, 204},
{T("SLATE BLUE"), 0, 127, 255},
{T("SPRING GREEN"), 0, 255, 127},
{T("STEEL BLUE"), 35, 107, 142},
{T("TAN"), 219, 147, 112},
{T("THISTLE"), 216, 191, 216},
{T("TURQUOISE"), 173, 234, 234},
{T("VIOLET"), 79, 47, 79},
{T("VIOLET RED"), 204, 50, 153},
{T("WHEAT"), 216, 216, 191},
{T("WHITE"), 255, 255, 255},
{T("YELLOW"), 255, 255, 0},
{T("YELLOW GREEN"), 153, 204, 50},
{wxT("DARK GREEN"), 47, 79, 47},
{wxT("DARK OLIVE GREEN"), 79, 79, 47},
{wxT("DARK ORCHID"), 153, 50, 204},
{wxT("DARK SLATE BLUE"), 107, 35, 142},
{wxT("DARK SLATE GREY"), 47, 79, 79},
{wxT("DARK TURQUOISE"), 112, 147, 219},
{wxT("DIM GREY"), 84, 84, 84},
{wxT("FIREBRICK"), 142, 35, 35},
{wxT("FOREST GREEN"), 35, 142, 35},
{wxT("GOLD"), 204, 127, 50},
{wxT("GOLDENROD"), 219, 219, 112},
{wxT("GREY"), 128, 128, 128},
{wxT("GREEN"), 0, 255, 0},
{wxT("GREEN YELLOW"), 147, 219, 112},
{wxT("INDIAN RED"), 79, 47, 47},
{wxT("KHAKI"), 159, 159, 95},
{wxT("LIGHT BLUE"), 191, 216, 216},
{wxT("LIGHT GREY"), 192, 192, 192},
{wxT("LIGHT STEEL BLUE"), 143, 143, 188},
{wxT("LIME GREEN"), 50, 204, 50},
{wxT("LIGHT MAGENTA"), 255, 0, 255},
{wxT("MAGENTA"), 255, 0, 255},
{wxT("MAROON"), 142, 35, 107},
{wxT("MEDIUM AQUAMARINE"), 50, 204, 153},
{wxT("MEDIUM GREY"), 100, 100, 100},
{wxT("MEDIUM BLUE"), 50, 50, 204},
{wxT("MEDIUM FOREST GREEN"), 107, 142, 35},
{wxT("MEDIUM GOLDENROD"), 234, 234, 173},
{wxT("MEDIUM ORCHID"), 147, 112, 219},
{wxT("MEDIUM SEA GREEN"), 66, 111, 66},
{wxT("MEDIUM SLATE BLUE"), 127, 0, 255},
{wxT("MEDIUM SPRING GREEN"), 127, 255, 0},
{wxT("MEDIUM TURQUOISE"), 112, 219, 219},
{wxT("MEDIUM VIOLET RED"), 219, 112, 147},
{wxT("MIDNIGHT BLUE"), 47, 47, 79},
{wxT("NAVY"), 35, 35, 142},
{wxT("ORANGE"), 204, 50, 50},
{wxT("ORANGE RED"), 255, 0, 127},
{wxT("ORCHID"), 219, 112, 219},
{wxT("PALE GREEN"), 143, 188, 143},
{wxT("PINK"), 188, 143, 234},
{wxT("PLUM"), 234, 173, 234},
{wxT("PURPLE"), 176, 0, 255},
{wxT("RED"), 255, 0, 0},
{wxT("SALMON"), 111, 66, 66},
{wxT("SEA GREEN"), 35, 142, 107},
{wxT("SIENNA"), 142, 107, 35},
{wxT("SKY BLUE"), 50, 153, 204},
{wxT("SLATE BLUE"), 0, 127, 255},
{wxT("SPRING GREEN"), 0, 255, 127},
{wxT("STEEL BLUE"), 35, 107, 142},
{wxT("TAN"), 219, 147, 112},
{wxT("THISTLE"), 216, 191, 216},
{wxT("TURQUOISE"), 173, 234, 234},
{wxT("VIOLET"), 79, 47, 79},
{wxT("VIOLET RED"), 204, 50, 153},
{wxT("WHEAT"), 216, 216, 191},
{wxT("WHITE"), 255, 255, 255},
{wxT("YELLOW"), 255, 255, 0},
{wxT("YELLOW GREEN"), 153, 204, 50},
// #endif
#if defined(__WXGTK__) || defined(__X__)
{T("MEDIUM GOLDENROD"), 234, 234, 173},
{T("MEDIUM FOREST GREEN"), 107, 142, 35},
{T("LIGHT MAGENTA"), 255, 0, 255},
{T("MEDIUM GREY"), 100, 100, 100},
{wxT("MEDIUM GOLDENROD"), 234, 234, 173},
{wxT("MEDIUM FOREST GREEN"), 107, 142, 35},
{wxT("LIGHT MAGENTA"), 255, 0, 255},
{wxT("MEDIUM GREY"), 100, 100, 100},
#endif
{0,0,0,0}
@@ -604,7 +604,7 @@ wxFont *wxFontList::
#else
each_font->GetFamily() == FamilyOrFontId &&
#endif
((each_font->GetFaceName() == T("")) || each_font->GetFaceName() == Face))
((each_font->GetFaceName() == wxT("")) || each_font->GetFaceName() == Face))
//#endif
return each_font;
}