m_owner = (wxWindow *)NULL;
#ifdef __WXGTK20__
m_context = (PangoContext *)NULL;
+ m_layout = (PangoLayout *)NULL;
m_fontdesc = (PangoFontDescription *)NULL;
#endif
}
GtkWidget *widget = window->m_wxwindow;
- // some controls don't have m_wxwindow - like wxStaticBox, but the user
+ // Some controls don't have m_wxwindow - like wxStaticBox, but the user
// code should still be able to create wxClientDCs for them, so we will
- // use the parent window here then
+ // use the parent window here then.
if ( !widget )
{
window = window->GetParent();
#ifdef __WXGTK20__
m_context = window->GtkGetPangoDefaultContext();
- m_fontdesc = widget->style->font_desc;
+ m_layout = pango_layout_new( m_context );
+ m_fontdesc = pango_font_description_copy( widget->style->font_desc );
#endif
GtkPizza *pizza = GTK_PIZZA( widget );
m_window = pizza->bin_window;
- /* not realized ? */
+ // Window not realized ?
if (!m_window)
{
- /* don't report problems */
+ // Don't report problems as per MSW.
m_ok = TRUE;
return;
wxWindowDC::~wxWindowDC()
{
Destroy();
+
+#ifdef __WXGTK20__
+ if (m_layout)
+ g_object_unref( G_OBJECT( m_layout ) );
+ if (m_fontdesc)
+ pango_font_description_free( m_fontdesc );
+#endif
}
void wxWindowDC::SetUpDC()
m_bgGC = wxGetPoolGC( m_window, wxBG_COLOUR );
}
-#ifdef __WXGTK20__
- if (m_isMemDC)
- {
- m_context = gdk_pango_context_get();
- m_fontdesc = pango_context_get_font_description(m_context);
- }
-#endif
-
/* background colour */
m_backgroundBrush = *wxWHITE_BRUSH;
m_backgroundBrush.GetColour().CalcPixel( m_cmap );
wxCHECK_RET( font, wxT("invalid font") );
#endif
-#ifdef __WXGTK20__
- wxCHECK_RET( m_context, wxT("no Pango context") );
-#endif
x = XLOG2DEV(x);
y = YLOG2DEV(y);
#ifdef __WXGTK20__
- // TODO: the layout engine should be abstracted at a higher level!
- PangoLayout *layout = pango_layout_new(m_context);
- pango_layout_set_font_description(layout, m_fontdesc);
+ wxCHECK_RET( m_context, wxT("no Pango context") );
+ wxCHECK_RET( m_layout, wxT("o Pango layout") );
+ wxCHECK_RET( m_fontdesc, wxT("no Pango font description") );
+
{
#if wxUSE_UNICODE
const wxCharBuffer data = wxConvUTF8.cWC2MB( text );
- pango_layout_set_text(layout, (const char*) data, strlen( (const char*) data ));
+ 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(layout, (const char*) data, strlen( (const char*) data ));
+ pango_layout_set_text( m_layout, (const char*) data, strlen( (const char*) data ));
#endif
}
// Measure layout.
int w,h;
- pango_layout_get_pixel_size(layout, &w, &h);
+ pango_layout_get_pixel_size( m_layout, &w, &h );
wxCoord width = w;
wxCoord height = h;
// Draw layout.
- gdk_draw_layout( m_window, m_textGC, x, y, layout );
+ gdk_draw_layout( m_window, m_textGC, x, y, m_layout );
- g_object_unref( G_OBJECT( layout ) );
#else // GTK+ 1.x
wxCoord width = gdk_string_width( font, text.mbc_str() );
wxCoord height = font->ascent + font->descent;
}
#endif // GTK+ 2.0/1.x
-
width = wxCoord(width / m_scaleX);
height = wxCoord(height / m_scaleY);
CalcBoundingBox (x + width, y + height);
#ifdef __WXGTK20__
// implement later without GdkFont for GTK 2.0
return;
-#endif
+#else
GdkFont *font = m_font.GetInternalFont( m_scaleY );
wxCHECK_RET( font, wxT("invalid font") );
// update the bounding box
CalcBoundingBox(x + minX, y + minY);
CalcBoundingBox(x + maxX, y + maxY);
+#endif
}
void wxWindowDC::DoGetTextExtent(const wxString &string,
}
#ifdef __WXGTK20__
- // Create layout and set font description
- PangoLayout *layout = pango_layout_new(m_context);
+ // Set new font description
if (theFont)
- pango_layout_set_font_description( layout, theFont->GetNativeFontInfo()->description );
- else
- pango_layout_set_font_description(layout, m_fontdesc);
+ pango_layout_set_font_description( m_layout, theFont->GetNativeFontInfo()->description );
// Set layout's text
#if wxUSE_UNICODE
const wxCharBuffer data = wxConvUTF8.cWC2MB( string );
- pango_layout_set_text(layout, (const char*) data, strlen( (const char*) data ));
+ pango_layout_set_text( m_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 ));
+ pango_layout_set_text( m_layout, (const char*) data, strlen( (const char*) data ));
#endif
- // Measure text.
int w,h;
- pango_layout_get_pixel_size(layout, &w, &h);
+ pango_layout_get_pixel_size( m_layout, &w, &h );
if (width) (*width) = (wxCoord) w;
if (height) (*height) = (wxCoord) h;
}
if (externalLeading) (*externalLeading) = 0; // ??
- g_object_unref( G_OBJECT( layout ) );
+ // Reset old font description
+ if (theFont)
+ pango_layout_set_font_description( m_layout, m_fontdesc );
#else
wxFont fontToUse = m_font;
if (theFont) fontToUse = *theFont;
wxCoord wxWindowDC::GetCharWidth() const
{
#ifdef __WXGTK20__
- // There should be an easier way.
- PangoLayout *layout = pango_layout_new(m_context);
- pango_layout_set_font_description(layout, m_fontdesc);
- pango_layout_set_text(layout, "H", 1 );
+ pango_layout_set_text( m_layout, "H", 1 );
int w,h;
- pango_layout_get_pixel_size(layout, &w, &h);
- g_object_unref( G_OBJECT( layout ) );
+ pango_layout_get_pixel_size( m_layout, &w, &h );
return w;
#else
GdkFont *font = m_font.GetInternalFont( m_scaleY );
wxCoord wxWindowDC::GetCharHeight() const
{
#ifdef __WXGTK20__
- // There should be an easier way.
- PangoLayout *layout = pango_layout_new(m_context);
- pango_layout_set_font_description(layout, m_fontdesc);
- pango_layout_set_text(layout, "H", 1 );
+ pango_layout_set_text( m_layout, "H", 1 );
int w,h;
- pango_layout_get_pixel_size(layout, &w, &h);
- g_object_unref( G_OBJECT( layout ) );
+ pango_layout_get_pixel_size( m_layout, &w, &h );
return h;
#else
GdkFont *font = m_font.GetInternalFont( m_scaleY );
void wxWindowDC::SetFont( const wxFont &font )
{
- // It is common practice to set the font to wxNullFont, so
- // don't consider it to be an error
- // wxCHECK_RET( font.Ok(), _T("invalid font in wxWindowDC::SetFont") );
-
m_font = font;
+
#ifdef __WXGTK20__
if (m_font.Ok())
{
- m_fontdesc = m_font.GetNativeFontInfo()->description;
+ if (m_fontdesc)
+ pango_font_description_free( m_fontdesc );
+
+ m_fontdesc = pango_font_description_copy( m_font.GetNativeFontInfo()->description );
+
+ // If there is a user or actually any scale applied to
+ // the device context, scale the font.
+ if (m_scaleY != 1.0)
+ {
+ double size = (double) pango_font_description_get_size( m_fontdesc );
+ size = size * m_scaleY;
+ pango_font_description_set_size( m_fontdesc, (int)size );
+ }
if (m_owner)
{
+ PangoContext *oldContext = m_context;
+
+ // We might want to use the X11 context for faster
+ // rendering on screen
if (m_font.GetNoAntiAliasing())
m_context = m_owner->GtkGetPangoX11Context();
else
m_context = m_owner->GtkGetPangoDefaultContext();
+
+ // If we switch back/forth between different contexts
+ // we also have to create a new layout. I think so,
+ // at least, and it doesn't hurt to do it.
+ if (oldContext != m_context)
+ {
+ if (m_layout)
+ g_object_unref( G_OBJECT( m_layout ) );
+
+ m_layout = pango_layout_new( m_context );
+ }
}
+
+ pango_layout_set_font_description( m_layout, m_fontdesc );
}
#endif
}
m_ok = FALSE;
m_cmap = gtk_widget_get_default_colormap();
+
+#ifdef __WXGTK20__
+ m_context = gdk_pango_context_get();
+ m_layout = pango_layout_new( m_context );
+ m_fontdesc = pango_font_description_copy( pango_context_get_font_description( m_context ) );
+#endif
}
wxMemoryDC::wxMemoryDC( wxDC *WXUNUSED(dc) )
m_ok = FALSE;
m_cmap = gtk_widget_get_default_colormap();
+
+#ifdef __WXGTK20__
+ m_context = gdk_pango_context_get();
+ m_layout = pango_layout_new( m_context );
+ m_fontdesc = pango_font_description_copy( pango_context_get_font_description( m_context ) );
+#endif
}
wxMemoryDC::~wxMemoryDC()
{
wxCHECK_MSG( Ok(), (wxNativeFontInfo *)NULL, wxT("invalid font") );
-#ifndef __WXGTK20__ // ???
+#ifndef __WXGTK20__
if ( M_FONTDATA->m_nativeFontInfo.GetXFontName().empty() )
GetInternalFont();
#endif
// get internal representation of font
// ----------------------------------------------------------------------------
+#ifndef __WXGTK20__
static GdkFont *g_systemDefaultGuiFont = (GdkFont*) NULL;
// this is also used from tbargtk.cpp and tooltip.cpp, hence extern
GdkFont *wxFont::GetInternalFont( float scale ) const
{
-#ifdef __WXGTK20__
- // Deprecated for GTK 2.0 and should be removed
- // in the 2.5 tree.
- wxFAIL_MSG( wxT("No longer used") );
-
- return (GdkFont *) NULL;
-
-#else // GTK 1.x
GdkFont *font = (GdkFont *) NULL;
wxCHECK_MSG( Ok(), font, wxT("invalid font") )
wxASSERT_MSG( font, wxT("could not load any font?") );
return font;
-#endif // GTK 2.0/1.x
}
+#endif // not GTK 2.0
g_style->bg[GTK_STATE_NORMAL] = *m_bg;
+#ifndef __WXGTK20__
SET_STYLE_FONT(g_style, GtkGetDefaultGuiFont());
+#endif
gtk_widget_set_style( GTK_TOOLBAR(m_toolbar)->tooltips->tip_window, g_style );
g_style->fg[GTK_STATE_NORMAL] = ss_fg;
g_style->bg[GTK_STATE_NORMAL] = ss_bg;
+#ifndef __WXGTK20__
SET_STYLE_FONT( g_style, GtkGetDefaultGuiFont() );
+#endif
gtk_widget_set_style( ss_tooltips->tip_window, g_style );
#else // GTK+ 1.0
GtkStyle *style = GetWidgetStyle();
+#ifndef __WXGTK20__
if (m_font != wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT ))
{
SET_STYLE_FONT(style, m_font.GetInternalFont( 1.0 ));
}
+#endif
if (m_foregroundColour.Ok())
{
m_owner = (wxWindow *)NULL;
#ifdef __WXGTK20__
m_context = (PangoContext *)NULL;
+ m_layout = (PangoLayout *)NULL;
m_fontdesc = (PangoFontDescription *)NULL;
#endif
}
GtkWidget *widget = window->m_wxwindow;
- // some controls don't have m_wxwindow - like wxStaticBox, but the user
+ // Some controls don't have m_wxwindow - like wxStaticBox, but the user
// code should still be able to create wxClientDCs for them, so we will
- // use the parent window here then
+ // use the parent window here then.
if ( !widget )
{
window = window->GetParent();
#ifdef __WXGTK20__
m_context = window->GtkGetPangoDefaultContext();
- m_fontdesc = widget->style->font_desc;
+ m_layout = pango_layout_new( m_context );
+ m_fontdesc = pango_font_description_copy( widget->style->font_desc );
#endif
GtkPizza *pizza = GTK_PIZZA( widget );
m_window = pizza->bin_window;
- /* not realized ? */
+ // Window not realized ?
if (!m_window)
{
- /* don't report problems */
+ // Don't report problems as per MSW.
m_ok = TRUE;
return;
wxWindowDC::~wxWindowDC()
{
Destroy();
+
+#ifdef __WXGTK20__
+ if (m_layout)
+ g_object_unref( G_OBJECT( m_layout ) );
+ if (m_fontdesc)
+ pango_font_description_free( m_fontdesc );
+#endif
}
void wxWindowDC::SetUpDC()
m_bgGC = wxGetPoolGC( m_window, wxBG_COLOUR );
}
-#ifdef __WXGTK20__
- if (m_isMemDC)
- {
- m_context = gdk_pango_context_get();
- m_fontdesc = pango_context_get_font_description(m_context);
- }
-#endif
-
/* background colour */
m_backgroundBrush = *wxWHITE_BRUSH;
m_backgroundBrush.GetColour().CalcPixel( m_cmap );
wxCHECK_RET( font, wxT("invalid font") );
#endif
-#ifdef __WXGTK20__
- wxCHECK_RET( m_context, wxT("no Pango context") );
-#endif
x = XLOG2DEV(x);
y = YLOG2DEV(y);
#ifdef __WXGTK20__
- // TODO: the layout engine should be abstracted at a higher level!
- PangoLayout *layout = pango_layout_new(m_context);
- pango_layout_set_font_description(layout, m_fontdesc);
+ wxCHECK_RET( m_context, wxT("no Pango context") );
+ wxCHECK_RET( m_layout, wxT("o Pango layout") );
+ wxCHECK_RET( m_fontdesc, wxT("no Pango font description") );
+
{
#if wxUSE_UNICODE
const wxCharBuffer data = wxConvUTF8.cWC2MB( text );
- pango_layout_set_text(layout, (const char*) data, strlen( (const char*) data ));
+ 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(layout, (const char*) data, strlen( (const char*) data ));
+ pango_layout_set_text( m_layout, (const char*) data, strlen( (const char*) data ));
#endif
}
// Measure layout.
int w,h;
- pango_layout_get_pixel_size(layout, &w, &h);
+ pango_layout_get_pixel_size( m_layout, &w, &h );
wxCoord width = w;
wxCoord height = h;
// Draw layout.
- gdk_draw_layout( m_window, m_textGC, x, y, layout );
+ gdk_draw_layout( m_window, m_textGC, x, y, m_layout );
- g_object_unref( G_OBJECT( layout ) );
#else // GTK+ 1.x
wxCoord width = gdk_string_width( font, text.mbc_str() );
wxCoord height = font->ascent + font->descent;
}
#endif // GTK+ 2.0/1.x
-
width = wxCoord(width / m_scaleX);
height = wxCoord(height / m_scaleY);
CalcBoundingBox (x + width, y + height);
#ifdef __WXGTK20__
// implement later without GdkFont for GTK 2.0
return;
-#endif
+#else
GdkFont *font = m_font.GetInternalFont( m_scaleY );
wxCHECK_RET( font, wxT("invalid font") );
// update the bounding box
CalcBoundingBox(x + minX, y + minY);
CalcBoundingBox(x + maxX, y + maxY);
+#endif
}
void wxWindowDC::DoGetTextExtent(const wxString &string,
}
#ifdef __WXGTK20__
- // Create layout and set font description
- PangoLayout *layout = pango_layout_new(m_context);
+ // Set new font description
if (theFont)
- pango_layout_set_font_description( layout, theFont->GetNativeFontInfo()->description );
- else
- pango_layout_set_font_description(layout, m_fontdesc);
+ pango_layout_set_font_description( m_layout, theFont->GetNativeFontInfo()->description );
// Set layout's text
#if wxUSE_UNICODE
const wxCharBuffer data = wxConvUTF8.cWC2MB( string );
- pango_layout_set_text(layout, (const char*) data, strlen( (const char*) data ));
+ pango_layout_set_text( m_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 ));
+ pango_layout_set_text( m_layout, (const char*) data, strlen( (const char*) data ));
#endif
- // Measure text.
int w,h;
- pango_layout_get_pixel_size(layout, &w, &h);
+ pango_layout_get_pixel_size( m_layout, &w, &h );
if (width) (*width) = (wxCoord) w;
if (height) (*height) = (wxCoord) h;
}
if (externalLeading) (*externalLeading) = 0; // ??
- g_object_unref( G_OBJECT( layout ) );
+ // Reset old font description
+ if (theFont)
+ pango_layout_set_font_description( m_layout, m_fontdesc );
#else
wxFont fontToUse = m_font;
if (theFont) fontToUse = *theFont;
wxCoord wxWindowDC::GetCharWidth() const
{
#ifdef __WXGTK20__
- // There should be an easier way.
- PangoLayout *layout = pango_layout_new(m_context);
- pango_layout_set_font_description(layout, m_fontdesc);
- pango_layout_set_text(layout, "H", 1 );
+ pango_layout_set_text( m_layout, "H", 1 );
int w,h;
- pango_layout_get_pixel_size(layout, &w, &h);
- g_object_unref( G_OBJECT( layout ) );
+ pango_layout_get_pixel_size( m_layout, &w, &h );
return w;
#else
GdkFont *font = m_font.GetInternalFont( m_scaleY );
wxCoord wxWindowDC::GetCharHeight() const
{
#ifdef __WXGTK20__
- // There should be an easier way.
- PangoLayout *layout = pango_layout_new(m_context);
- pango_layout_set_font_description(layout, m_fontdesc);
- pango_layout_set_text(layout, "H", 1 );
+ pango_layout_set_text( m_layout, "H", 1 );
int w,h;
- pango_layout_get_pixel_size(layout, &w, &h);
- g_object_unref( G_OBJECT( layout ) );
+ pango_layout_get_pixel_size( m_layout, &w, &h );
return h;
#else
GdkFont *font = m_font.GetInternalFont( m_scaleY );
void wxWindowDC::SetFont( const wxFont &font )
{
- // It is common practice to set the font to wxNullFont, so
- // don't consider it to be an error
- // wxCHECK_RET( font.Ok(), _T("invalid font in wxWindowDC::SetFont") );
-
m_font = font;
+
#ifdef __WXGTK20__
if (m_font.Ok())
{
- m_fontdesc = m_font.GetNativeFontInfo()->description;
+ if (m_fontdesc)
+ pango_font_description_free( m_fontdesc );
+
+ m_fontdesc = pango_font_description_copy( m_font.GetNativeFontInfo()->description );
+
+ // If there is a user or actually any scale applied to
+ // the device context, scale the font.
+ if (m_scaleY != 1.0)
+ {
+ double size = (double) pango_font_description_get_size( m_fontdesc );
+ size = size * m_scaleY;
+ pango_font_description_set_size( m_fontdesc, (int)size );
+ }
if (m_owner)
{
+ PangoContext *oldContext = m_context;
+
+ // We might want to use the X11 context for faster
+ // rendering on screen
if (m_font.GetNoAntiAliasing())
m_context = m_owner->GtkGetPangoX11Context();
else
m_context = m_owner->GtkGetPangoDefaultContext();
+
+ // If we switch back/forth between different contexts
+ // we also have to create a new layout. I think so,
+ // at least, and it doesn't hurt to do it.
+ if (oldContext != m_context)
+ {
+ if (m_layout)
+ g_object_unref( G_OBJECT( m_layout ) );
+
+ m_layout = pango_layout_new( m_context );
+ }
}
+
+ pango_layout_set_font_description( m_layout, m_fontdesc );
}
#endif
}
m_ok = FALSE;
m_cmap = gtk_widget_get_default_colormap();
+
+#ifdef __WXGTK20__
+ m_context = gdk_pango_context_get();
+ m_layout = pango_layout_new( m_context );
+ m_fontdesc = pango_font_description_copy( pango_context_get_font_description( m_context ) );
+#endif
}
wxMemoryDC::wxMemoryDC( wxDC *WXUNUSED(dc) )
m_ok = FALSE;
m_cmap = gtk_widget_get_default_colormap();
+
+#ifdef __WXGTK20__
+ m_context = gdk_pango_context_get();
+ m_layout = pango_layout_new( m_context );
+ m_fontdesc = pango_font_description_copy( pango_context_get_font_description( m_context ) );
+#endif
}
wxMemoryDC::~wxMemoryDC()
{
wxCHECK_MSG( Ok(), (wxNativeFontInfo *)NULL, wxT("invalid font") );
-#ifndef __WXGTK20__ // ???
+#ifndef __WXGTK20__
if ( M_FONTDATA->m_nativeFontInfo.GetXFontName().empty() )
GetInternalFont();
#endif
// get internal representation of font
// ----------------------------------------------------------------------------
+#ifndef __WXGTK20__
static GdkFont *g_systemDefaultGuiFont = (GdkFont*) NULL;
// this is also used from tbargtk.cpp and tooltip.cpp, hence extern
GdkFont *wxFont::GetInternalFont( float scale ) const
{
-#ifdef __WXGTK20__
- // Deprecated for GTK 2.0 and should be removed
- // in the 2.5 tree.
- wxFAIL_MSG( wxT("No longer used") );
-
- return (GdkFont *) NULL;
-
-#else // GTK 1.x
GdkFont *font = (GdkFont *) NULL;
wxCHECK_MSG( Ok(), font, wxT("invalid font") )
wxASSERT_MSG( font, wxT("could not load any font?") );
return font;
-#endif // GTK 2.0/1.x
}
+#endif // not GTK 2.0
g_style->bg[GTK_STATE_NORMAL] = *m_bg;
+#ifndef __WXGTK20__
SET_STYLE_FONT(g_style, GtkGetDefaultGuiFont());
+#endif
gtk_widget_set_style( GTK_TOOLBAR(m_toolbar)->tooltips->tip_window, g_style );
g_style->fg[GTK_STATE_NORMAL] = ss_fg;
g_style->bg[GTK_STATE_NORMAL] = ss_bg;
+#ifndef __WXGTK20__
SET_STYLE_FONT( g_style, GtkGetDefaultGuiFont() );
+#endif
gtk_widget_set_style( ss_tooltips->tip_window, g_style );
#else // GTK+ 1.0
GtkStyle *style = GetWidgetStyle();
+#ifndef __WXGTK20__
if (m_font != wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT ))
{
SET_STYLE_FONT(style, m_font.GetInternalFont( 1.0 ));
}
+#endif
if (m_foregroundColour.Ok())
{
projects / wxWidgets.git / commitdiff
