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

applied patch fixing some graphical glitches from Dimitri

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13165 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2001-12-23 01:09:20 +00:00
parent 502a2b1810
commit 25faedaa98
1 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
samples/font/font.cpp
View File

@ -644,24 +644,36 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
dc.DrawText(fontInfo, 5, 5 + dc.GetCharHeight()); dc.DrawText(fontInfo, 5, 5 + dc.GetCharHeight());
} }
// the origin for our table
int x = 5,
y = dc.GetCharHeight() * (2 + 1);
// prepare to draw the font // prepare to draw the font
dc.SetFont(m_font); dc.SetFont(m_font);
dc.SetTextForeground(m_colour); dc.SetTextForeground(m_colour);
// the size of one cell (char + small margin) // the size of one cell (Normally biggest char + small margin)
int w = dc.GetCharWidth() + 5, long maxCharWidth, maxCharHeight;
h = dc.GetCharHeight() + 4; dc.GetTextExtent(wxT("W"), &maxCharWidth, &maxCharHeight);
int w = maxCharWidth + 5,
h = maxCharHeight + 4;
// the origin for our table
int x = 5,
y = 2*h;
// print all font symbols from 32 to 256 in 7 rows of 32 chars each // print all font symbols from 32 to 256 in 7 rows of 32 chars each
for ( int i = 1; i < 8; i++ ) for ( int i = 0; i < 7; i++ )
{ {
for ( int j = 0; j < 32; j++ ) for ( int j = 0; j < 32; j++ )
{ {
dc.DrawText(wxChar(32*i + j), x + w*j, y + h*i); wxChar c = 32 * (i + 1) + j;
long charWidth, charHeight;
dc.GetTextExtent(c, &charWidth, &charHeight);
dc.DrawText
(
c,
x + w*j + (maxCharWidth - charWidth) / 2 + 1,
y + h*i + (maxCharHeight - charHeight) / 2
);
} }
} }
@ -670,17 +682,16 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
int l; int l;
// horizontal // horizontal
y += h;
for ( l = 0; l < 8; l++ ) for ( l = 0; l < 8; l++ )
{ {
int yl = y + h*l - 2; int yl = y + h*l - 2;
dc.DrawLine(x - 2, yl, x + 32*w - 2, yl); dc.DrawLine(x - 2, yl, x + 32*w - 1, yl);
} }
// and vertical // and vertical
for ( l = 0; l < 33; l++ ) for ( l = 0; l < 33; l++ )
{ {
int xl = x + w*l - 2; int xl = x + w*l - 2;
dc.DrawLine(xl, y, xl, y + 7*h - 2); dc.DrawLine(xl, y - 2, xl, y + 7*h - 1);
} }
} }