AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed underline for drawing text, as suggested by Chris Breeze

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@285 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Karsten Ballüder 1998-07-17 10:06:26 +00:00
parent c4e7c2aa58
commit 18a2fa3715
2 changed files with 40 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/gtk/dcclient.cpp
View File

@ -463,12 +463,16 @@ bool wxPaintDC::Blit( long xdest, long ydest, long width, long height,
return TRUE;
};
void wxPaintDC::DrawText( const wxString &text, long x, long y, bool WXUNUSED(use16) )
void wxPaintDC::DrawText( const wxString &text, long x, long y, bool
WXUNUSED(use16) )
{
if (!Ok()) return;
GdkFont *font = m_font.GetInternalFont( m_scaleY );
x = XLOG2DEV(x);
y = YLOG2DEV(y);
// CMB 21/5/98: draw text background if mode is wxSOLID
if (m_backgroundMode == wxSOLID)
{
@ -478,11 +482,22 @@ void wxPaintDC::DrawText( const wxString &text, long x, long y, bool WXUNUSED(us
gdk_draw_rectangle( m_window, m_textGC, TRUE, x, y, width, height );
gdk_gc_set_foreground( m_textGC, m_textForegroundColour.GetColor() );
}
gdk_draw_string( m_window, font, m_textGC,
XLOG2DEV(x),
YLOG2DEV(y) + font->ascent, text );
gdk_draw_string( m_window, font, m_textGC, x, y + font->ascent, text );
// CMB 17/7/98: simple underline: ignores scaling and underlying
// X font's XA_UNDERLINE_POSITION and XA_UNDERLINE_THICKNESS
// properties (see wxXt implementation)
if (m_font.GetUnderlined())
{
long width = gdk_string_width( font, text );
long ul_y = y + font->ascent;
if (font->descent > 0) ul_y++;
gdk_draw_line( m_window, m_textGC, x, ul_y, x + width, ul_y);
}
};
bool wxPaintDC::CanGetTextExtent(void) const
{
return TRUE;

25
src/gtk1/dcclient.cpp
View File

@ -463,12 +463,16 @@ bool wxPaintDC::Blit( long xdest, long ydest, long width, long height,
return TRUE;
};
void wxPaintDC::DrawText( const wxString &text, long x, long y, bool WXUNUSED(use16) )
void wxPaintDC::DrawText( const wxString &text, long x, long y, bool
WXUNUSED(use16) )
{
if (!Ok()) return;
GdkFont *font = m_font.GetInternalFont( m_scaleY );
x = XLOG2DEV(x);
y = YLOG2DEV(y);
// CMB 21/5/98: draw text background if mode is wxSOLID
if (m_backgroundMode == wxSOLID)
{
@ -478,11 +482,22 @@ void wxPaintDC::DrawText( const wxString &text, long x, long y, bool WXUNUSED(us
gdk_draw_rectangle( m_window, m_textGC, TRUE, x, y, width, height );
gdk_gc_set_foreground( m_textGC, m_textForegroundColour.GetColor() );
}
gdk_draw_string( m_window, font, m_textGC,
XLOG2DEV(x),
YLOG2DEV(y) + font->ascent, text );
gdk_draw_string( m_window, font, m_textGC, x, y + font->ascent, text );
// CMB 17/7/98: simple underline: ignores scaling and underlying
// X font's XA_UNDERLINE_POSITION and XA_UNDERLINE_THICKNESS
// properties (see wxXt implementation)
if (m_font.GetUnderlined())
{
long width = gdk_string_width( font, text );
long ul_y = y + font->ascent;
if (font->descent > 0) ul_y++;
gdk_draw_line( m_window, m_textGC, x, ul_y, x + width, ul_y);
}
};
bool wxPaintDC::CanGetTextExtent(void) const
{
return TRUE;