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

14
src/gtk1/colour.cpp
View File

@@ -91,8 +91,8 @@ void wxColour::InitFromName( const wxString &colourName )
m_refData = new wxColourRefData();
if (!gdk_color_parse( colourName.mb_str(), &M_COLDATA->m_color ))
{
wxFAIL_MSG( T("wxColour: couldn't find colour") );
wxPrintf( T("Colourname %s.\n"), WXSTRINGCAST colourName );
wxFAIL_MSG( wxT("wxColour: couldn't find colour") );
wxPrintf( wxT("Colourname %s.\n"), WXSTRINGCAST colourName );
delete m_refData;
m_refData = (wxObjectRefData *) NULL;
@@ -149,21 +149,21 @@ void wxColour::Set( unsigned char red, unsigned char green, unsigned char blue )
unsigned char wxColour::Red() const
{
wxCHECK_MSG( Ok(), 0, T("invalid colour") );
wxCHECK_MSG( Ok(), 0, wxT("invalid colour") );
return (unsigned char)(M_COLDATA->m_color.red >> SHIFT);
}
unsigned char wxColour::Green() const
{
wxCHECK_MSG( Ok(), 0, T("invalid colour") );
wxCHECK_MSG( Ok(), 0, wxT("invalid colour") );
return (unsigned char)(M_COLDATA->m_color.green >> SHIFT);
}
unsigned char wxColour::Blue() const
{
wxCHECK_MSG( Ok(), 0, T("invalid colour") );
wxCHECK_MSG( Ok(), 0, wxT("invalid colour") );
return (unsigned char)(M_COLDATA->m_color.blue >> SHIFT);
}
@@ -211,14 +211,14 @@ void wxColour::CalcPixel( GdkColormap *cmap )
int wxColour::GetPixel() const
{
wxCHECK_MSG( Ok(), 0, T("invalid colour") );
wxCHECK_MSG( Ok(), 0, wxT("invalid colour") );
return M_COLDATA->m_color.pixel;
}
GdkColor *wxColour::GetColor() const
{
wxCHECK_MSG( Ok(), (GdkColor *) NULL, T("invalid colour") );
wxCHECK_MSG( Ok(), (GdkColor *) NULL, wxT("invalid colour") );
return &M_COLDATA->m_color;
}