From 6185050104d7782a51b9e9a7cac427764dcea130 Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Tue, 11 Feb 2003 11:20:45 +0000 Subject: [PATCH] Minor corrections. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19178 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/dcclient.cpp | 16 ++++++++++------ src/gtk/tooltip.cpp | 4 ---- src/gtk1/dcclient.cpp | 16 ++++++++++------ src/gtk1/tooltip.cpp | 4 ---- src/unix/fontutil.cpp | 4 +++- 5 files changed, 23 insertions(+), 21 deletions(-) diff --git a/src/gtk/dcclient.cpp b/src/gtk/dcclient.cpp index bd7308d271..8ef99e5cb1 100644 --- a/src/gtk/dcclient.cpp +++ b/src/gtk/dcclient.cpp @@ -1427,23 +1427,21 @@ void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y ) wxCHECK_RET( font, wxT("invalid font") ); #endif - x = XLOG2DEV(x); y = YLOG2DEV(y); #ifdef __WXGTK20__ wxCHECK_RET( m_context, wxT("no Pango context") ); - wxCHECK_RET( m_layout, wxT("o Pango layout") ); + wxCHECK_RET( m_layout, wxT("no Pango layout") ); wxCHECK_RET( m_fontdesc, wxT("no Pango font description") ); #if wxUSE_UNICODE const wxCharBuffer data = wxConvUTF8.cWC2MB( text ); - pango_layout_set_text( m_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( m_layout, (const char*) data, strlen( (const char*) data )); #endif + pango_layout_set_text( m_layout, (const char*) data, strlen( (const char*) data )); if (m_scaleY != 1.0) { @@ -1465,7 +1463,7 @@ void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y ) // reset unscaled size pango_font_description_set_size( m_fontdesc, oldSize ); - // actually apply scaled font + // actually apply unscaled font pango_layout_set_font_description( m_layout, m_fontdesc ); } else @@ -1474,9 +1472,15 @@ void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y ) gdk_draw_layout( m_window, m_textGC, x, y, m_layout ); } - // Measure layout. +#if 0 + // Measure layout int w,h; pango_layout_get_pixel_size( m_layout, &w, &h ); +#else + int w = 10; + int h = 10; +#endif + wxCoord width = w; wxCoord height = h; diff --git a/src/gtk/tooltip.cpp b/src/gtk/tooltip.cpp index a8e42e4d07..145eee8837 100644 --- a/src/gtk/tooltip.cpp +++ b/src/gtk/tooltip.cpp @@ -66,7 +66,6 @@ void wxToolTip::Apply( wxWindow *win ) ss_bg.blue = 50000; gdk_color_alloc( gtk_widget_get_default_colormap(), &ss_bg ); -#if GTK_CHECK_VERSION(1, 2, 0) gtk_tooltips_force_window( ss_tooltips ); GtkStyle *g_style = @@ -77,9 +76,6 @@ void wxToolTip::Apply( wxWindow *win ) g_style->bg[GTK_STATE_NORMAL] = ss_bg; gtk_widget_set_style( ss_tooltips->tip_window, g_style ); -#else // GTK+ 1.0 - gtk_tooltips_set_colors( ss_tooltips, &ss_bg, &ss_fg ); -#endif } m_window = win; diff --git a/src/gtk1/dcclient.cpp b/src/gtk1/dcclient.cpp index bd7308d271..8ef99e5cb1 100644 --- a/src/gtk1/dcclient.cpp +++ b/src/gtk1/dcclient.cpp @@ -1427,23 +1427,21 @@ void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y ) wxCHECK_RET( font, wxT("invalid font") ); #endif - x = XLOG2DEV(x); y = YLOG2DEV(y); #ifdef __WXGTK20__ wxCHECK_RET( m_context, wxT("no Pango context") ); - wxCHECK_RET( m_layout, wxT("o Pango layout") ); + wxCHECK_RET( m_layout, wxT("no Pango layout") ); wxCHECK_RET( m_fontdesc, wxT("no Pango font description") ); #if wxUSE_UNICODE const wxCharBuffer data = wxConvUTF8.cWC2MB( text ); - pango_layout_set_text( m_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( m_layout, (const char*) data, strlen( (const char*) data )); #endif + pango_layout_set_text( m_layout, (const char*) data, strlen( (const char*) data )); if (m_scaleY != 1.0) { @@ -1465,7 +1463,7 @@ void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y ) // reset unscaled size pango_font_description_set_size( m_fontdesc, oldSize ); - // actually apply scaled font + // actually apply unscaled font pango_layout_set_font_description( m_layout, m_fontdesc ); } else @@ -1474,9 +1472,15 @@ void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y ) gdk_draw_layout( m_window, m_textGC, x, y, m_layout ); } - // Measure layout. +#if 0 + // Measure layout int w,h; pango_layout_get_pixel_size( m_layout, &w, &h ); +#else + int w = 10; + int h = 10; +#endif + wxCoord width = w; wxCoord height = h; diff --git a/src/gtk1/tooltip.cpp b/src/gtk1/tooltip.cpp index a8e42e4d07..145eee8837 100644 --- a/src/gtk1/tooltip.cpp +++ b/src/gtk1/tooltip.cpp @@ -66,7 +66,6 @@ void wxToolTip::Apply( wxWindow *win ) ss_bg.blue = 50000; gdk_color_alloc( gtk_widget_get_default_colormap(), &ss_bg ); -#if GTK_CHECK_VERSION(1, 2, 0) gtk_tooltips_force_window( ss_tooltips ); GtkStyle *g_style = @@ -77,9 +76,6 @@ void wxToolTip::Apply( wxWindow *win ) g_style->bg[GTK_STATE_NORMAL] = ss_bg; gtk_widget_set_style( ss_tooltips->tip_window, g_style ); -#else // GTK+ 1.0 - gtk_tooltips_set_colors( ss_tooltips, &ss_bg, &ss_fg ); -#endif } m_window = win; diff --git a/src/unix/fontutil.cpp b/src/unix/fontutil.cpp index 5cb5e28a95..beac3babe4 100644 --- a/src/unix/fontutil.cpp +++ b/src/unix/fontutil.cpp @@ -144,7 +144,9 @@ bool wxNativeFontInfo::FromString(const wxString& s) wxString wxNativeFontInfo::ToString() const { - wxString tmp = wxGTK_CONV_BACK( pango_font_description_to_string( description ) ); + char *str = pango_font_description_to_string( description ); + wxString tmp = wxGTK_CONV_BACK( str ); + g_free( str ); return tmp; } -- 2.45.2