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

Compile fixes for ANSI mode.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16569 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2002-08-17 17:03:01 +00:00
parent eba330067e
commit fb3ed106d1
4 changed files with 40 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/gtk/dcclient.cpp
View File

@@ -1422,13 +1422,19 @@ void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y )
x = XLOG2DEV(x); x = XLOG2DEV(x);
y = YLOG2DEV(y); y = YLOG2DEV(y);
#if defined(__WXGTK20__) && wxUSE_WCHAR_T #if defined(__WXGTK20__)
// TODO: the layout engine should be abstracted at a higher level! // TODO: the layout engine should be abstracted at a higher level!
PangoLayout *layout = pango_layout_new(m_context); PangoLayout *layout = pango_layout_new(m_context);
pango_layout_set_font_description(layout, m_fontdesc); pango_layout_set_font_description(layout, m_fontdesc);
{ {
#if wxUSE_UNICODE
const wxCharBuffer data = wxConvUTF8.cWC2MB( text ); const wxCharBuffer data = wxConvUTF8.cWC2MB( text );
pango_layout_set_text(layout, (const char*) data, strlen( (const char*) data )); pango_layout_set_text(layout, (const char*) data, strlen( (const char*) data ));
#else
const wxWCharBuffer wdata = wxConvLocal.cMB2WC( text );
const wxCharBuffer data = wxConvUTF8.cWC2MB( wdata );
pango_layout_set_text(layout, (const char*) data, strlen( (const char*) data ));
#endif
} }
PangoLayoutLine *line = (PangoLayoutLine *)pango_layout_get_lines(layout)->data; PangoLayoutLine *line = (PangoLayoutLine *)pango_layout_get_lines(layout)->data;
PangoRectangle rect; PangoRectangle rect;
@@ -1459,7 +1465,7 @@ void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y )
} }
#endif // GTK+ 2.0/1.x #endif // GTK+ 2.0/1.x
#if defined(__WXGTK20__) && wxUSE_WCHAR_T #if defined(__WXGTK20__)
g_object_unref( G_OBJECT( layout ) ); g_object_unref( G_OBJECT( layout ) );
#endif #endif
@@ -1599,10 +1605,14 @@ void wxWindowDC::DoGetTextExtent(const wxString &string,
PangoFontDescription *desc = fontToUse.GetNativeFontInfo()->description; PangoFontDescription *desc = fontToUse.GetNativeFontInfo()->description;
PangoLayout *layout = pango_layout_new(m_context); PangoLayout *layout = pango_layout_new(m_context);
pango_layout_set_font_description(layout, desc); pango_layout_set_font_description(layout, desc);
{ #if wxUSE_UNICODE
const wxCharBuffer data = wxConvUTF8.cWC2MB( string ); const wxCharBuffer data = wxConvUTF8.cWC2MB( string );
pango_layout_set_text(layout, (const char*) data, strlen( (const char*) data )); pango_layout_set_text(layout, (const char*) data, strlen( (const char*) data ));
} #else
const wxWCharBuffer wdata = wxConvLocal.cMB2WC( string );
const wxCharBuffer data = wxConvUTF8.cWC2MB( wdata );
pango_layout_set_text(layout, (const char*) data, strlen( (const char*) data ));
#endif
PangoLayoutLine *line = (PangoLayoutLine *)pango_layout_get_lines(layout)->data; PangoLayoutLine *line = (PangoLayoutLine *)pango_layout_get_lines(layout)->data;
PangoRectangle rect; PangoRectangle rect;

6
src/gtk/window.cpp
View File

@@ -3175,8 +3175,14 @@ void wxWindowGTK::GetTextExtent( const wxString& string,
PangoLayout *layout = pango_layout_new(context); PangoLayout *layout = pango_layout_new(context);
pango_layout_set_font_description(layout, desc); pango_layout_set_font_description(layout, desc);
{ {
#if wxUSE_UNICODE
const wxCharBuffer data = wxConvUTF8.cWC2MB( string ); const wxCharBuffer data = wxConvUTF8.cWC2MB( string );
pango_layout_set_text(layout, (const char*) data, strlen( (const char*) data )); pango_layout_set_text(layout, (const char*) data, strlen( (const char*) data ));
#else
const wxWCharBuffer wdata = wxConvLocal.cMB2WC( string );
const wxCharBuffer data = wxConvUTF8.cWC2MB( wdata );
pango_layout_set_text(layout, (const char*) data, strlen( (const char*) data ));
#endif
} }
PangoLayoutLine *line = (PangoLayoutLine *)pango_layout_get_lines(layout)->data; PangoLayoutLine *line = (PangoLayoutLine *)pango_layout_get_lines(layout)->data;

18
src/gtk1/dcclient.cpp
View File

@@ -1422,13 +1422,19 @@ void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y )
x = XLOG2DEV(x); x = XLOG2DEV(x);
y = YLOG2DEV(y); y = YLOG2DEV(y);
#if defined(__WXGTK20__) && wxUSE_WCHAR_T #if defined(__WXGTK20__)
// TODO: the layout engine should be abstracted at a higher level! // TODO: the layout engine should be abstracted at a higher level!
PangoLayout *layout = pango_layout_new(m_context); PangoLayout *layout = pango_layout_new(m_context);
pango_layout_set_font_description(layout, m_fontdesc); pango_layout_set_font_description(layout, m_fontdesc);
{ {
#if wxUSE_UNICODE
const wxCharBuffer data = wxConvUTF8.cWC2MB( text ); const wxCharBuffer data = wxConvUTF8.cWC2MB( text );
pango_layout_set_text(layout, (const char*) data, strlen( (const char*) data )); pango_layout_set_text(layout, (const char*) data, strlen( (const char*) data ));
#else
const wxWCharBuffer wdata = wxConvLocal.cMB2WC( text );
const wxCharBuffer data = wxConvUTF8.cWC2MB( wdata );
pango_layout_set_text(layout, (const char*) data, strlen( (const char*) data ));
#endif
} }
PangoLayoutLine *line = (PangoLayoutLine *)pango_layout_get_lines(layout)->data; PangoLayoutLine *line = (PangoLayoutLine *)pango_layout_get_lines(layout)->data;
PangoRectangle rect; PangoRectangle rect;
@@ -1459,7 +1465,7 @@ void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y )
} }
#endif // GTK+ 2.0/1.x #endif // GTK+ 2.0/1.x
#if defined(__WXGTK20__) && wxUSE_WCHAR_T #if defined(__WXGTK20__)
g_object_unref( G_OBJECT( layout ) ); g_object_unref( G_OBJECT( layout ) );
#endif #endif
@@ -1599,10 +1605,14 @@ void wxWindowDC::DoGetTextExtent(const wxString &string,
PangoFontDescription *desc = fontToUse.GetNativeFontInfo()->description; PangoFontDescription *desc = fontToUse.GetNativeFontInfo()->description;
PangoLayout *layout = pango_layout_new(m_context); PangoLayout *layout = pango_layout_new(m_context);
pango_layout_set_font_description(layout, desc); pango_layout_set_font_description(layout, desc);
{ #if wxUSE_UNICODE
const wxCharBuffer data = wxConvUTF8.cWC2MB( string ); const wxCharBuffer data = wxConvUTF8.cWC2MB( string );
pango_layout_set_text(layout, (const char*) data, strlen( (const char*) data )); pango_layout_set_text(layout, (const char*) data, strlen( (const char*) data ));
} #else
const wxWCharBuffer wdata = wxConvLocal.cMB2WC( string );
const wxCharBuffer data = wxConvUTF8.cWC2MB( wdata );
pango_layout_set_text(layout, (const char*) data, strlen( (const char*) data ));
#endif
PangoLayoutLine *line = (PangoLayoutLine *)pango_layout_get_lines(layout)->data; PangoLayoutLine *line = (PangoLayoutLine *)pango_layout_get_lines(layout)->data;
PangoRectangle rect; PangoRectangle rect;

6
src/gtk1/window.cpp
View File

@@ -3175,8 +3175,14 @@ void wxWindowGTK::GetTextExtent( const wxString& string,
PangoLayout *layout = pango_layout_new(context); PangoLayout *layout = pango_layout_new(context);
pango_layout_set_font_description(layout, desc); pango_layout_set_font_description(layout, desc);
{ {
#if wxUSE_UNICODE
const wxCharBuffer data = wxConvUTF8.cWC2MB( string ); const wxCharBuffer data = wxConvUTF8.cWC2MB( string );
pango_layout_set_text(layout, (const char*) data, strlen( (const char*) data )); pango_layout_set_text(layout, (const char*) data, strlen( (const char*) data ));
#else
const wxWCharBuffer wdata = wxConvLocal.cMB2WC( string );
const wxCharBuffer data = wxConvUTF8.cWC2MB( wdata );
pango_layout_set_text(layout, (const char*) data, strlen( (const char*) data ));
#endif
} }
PangoLayoutLine *line = (PangoLayoutLine *)pango_layout_get_lines(layout)->data; PangoLayoutLine *line = (PangoLayoutLine *)pango_layout_get_lines(layout)->data;