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

many changes; major ones:

Browse Source 
1. start of !wxUSE_GUI support
2. _T() macro renamed to T()
3. wxConvertWX2MB and MB2WX macro added


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3828 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-10-04 20:15:38 +00:00
parent 9841339c74
commit e90c1d2a19
298 changed files with 5153 additions and 4672 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( T("wxColour: couldn't find colour") );
wxPrintf( T("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, T("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, T("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, T("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, T("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, T("invalid colour") );
return &M_COLDATA->m_color;
}