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

Unicode compilation fixes for wxX11

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23038 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2003-08-20 08:39:47 +00:00
parent c6441a0d74
commit 54385bdb3f
8 changed files with 40 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/x11/dcclient.cpp
View File

@@ -1478,7 +1478,7 @@ void wxWindowDC::DoGetTextExtent( const wxString &string, wxCoord *width, wxCoor
wxCoord *descent, wxCoord *externalLeading,
wxFont *font ) const
{
wxCHECK_RET( Ok(), "invalid dc" );
wxCHECK_RET( Ok(), wxT("invalid dc") );
if (string.IsEmpty())
{
@@ -1516,7 +1516,7 @@ void wxWindowDC::DoGetTextExtent( const wxString &string, wxCoord *width, wxCoor
wxFont fontToUse = m_font;
if (font) fontToUse = *font;
wxCHECK_RET( fontToUse.Ok(), "invalid font" );
wxCHECK_RET( fontToUse.Ok(), wxT("invalid font") );
XFontStruct *xfont = (XFontStruct*) fontToUse.GetFontStruct( m_scaleY, m_display );
@@ -1541,7 +1541,7 @@ void wxWindowDC::DoGetTextExtent( const wxString &string, wxCoord *width, wxCoor
wxCoord wxWindowDC::GetCharWidth() const
{
wxCHECK_MSG( Ok(), 0, "invalid dc" );
wxCHECK_MSG( Ok(), 0, wxT("invalid dc") );
#if wxUSE_UNICODE
PangoLayout *layout = pango_layout_new( m_context );
@@ -1560,7 +1560,7 @@ wxCoord wxWindowDC::GetCharWidth() const
return w;
#else
wxCHECK_MSG( m_font.Ok(), 0, "invalid font" );
wxCHECK_MSG( m_font.Ok(), 0, wxT("invalid font") );
XFontStruct *xfont = (XFontStruct*) m_font.GetFontStruct( m_scaleY, m_display );
@@ -1577,7 +1577,7 @@ wxCoord wxWindowDC::GetCharWidth() const
wxCoord wxWindowDC::GetCharHeight() const
{
wxCHECK_MSG( Ok(), 0, "invalid dc" );
wxCHECK_MSG( Ok(), 0, wxT("invalid dc") );
#if wxUSE_UNICODE
PangoLayout *layout = pango_layout_new( m_context );
@@ -1597,7 +1597,7 @@ wxCoord wxWindowDC::GetCharHeight() const
return h;
#else
wxCHECK_MSG( m_font.Ok(), 0, "invalid font" );
wxCHECK_MSG( m_font.Ok(), 0, wxT("invalid font") );
XFontStruct *xfont = (XFontStruct*) m_font.GetFontStruct( m_scaleY, m_display );
@@ -1644,7 +1644,7 @@ void wxWindowDC::Clear()
void wxWindowDC::SetFont( const wxFont &font )
{
wxCHECK_RET( Ok(), "invalid dc" );
wxCHECK_RET( Ok(), wxT("invalid dc") );
m_font = font;
}
@@ -1868,7 +1868,7 @@ void wxWindowDC::SetBackground( const wxBrush &brush )
void wxWindowDC::SetLogicalFunction( int function )
{
wxCHECK_RET( Ok(), "invalid dc" );
wxCHECK_RET( Ok(), wxT("invalid dc") );
int x_function;