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

Fix MSVC14 warnings about a shadowed variable in the printing sample.

Browse Source 
Just to suppress some harmless warnings.
This commit is contained in:
Artur Wieczorek
2016-04-08 18:46:01 +02:00
parent c991c659c4
commit 79b60780fe
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
samples/printing/printing.cpp
View File

@@ -700,20 +700,20 @@ void MyPrintout::DrawPageTwo()
{ // GetTextExtent demo: { // GetTextExtent demo:
wxString words[7] = { wxT("This "), wxT("is "), wxT("GetTextExtent "), wxString words[7] = { wxT("This "), wxT("is "), wxT("GetTextExtent "),
wxT("testing "), wxT("string. "), wxT("Enjoy "), wxT("it!") }; wxT("testing "), wxT("string. "), wxT("Enjoy "), wxT("it!") };
wxCoord w, h;
long x = 200, y= 250; long x = 200, y= 250;
dc->SetFont(wxFontInfo(15).Family(wxFONTFAMILY_SWISS)); dc->SetFont(wxFontInfo(15).Family(wxFONTFAMILY_SWISS));
for (int i = 0; i < 7; i++) for (int i = 0; i < 7; i++)
{ {
wxCoord wordWidth, wordHeight;
wxString word = words[i]; wxString word = words[i];
word.Remove( word.Len()-1, 1 ); word.Remove( word.Len()-1, 1 );
dc->GetTextExtent(word, &w, &h); dc->GetTextExtent(word, &wordWidth, &wordHeight);
dc->DrawRectangle(x, y, w, h); dc->DrawRectangle(x, y, wordWidth, wordHeight);
dc->GetTextExtent(words[i], &w, &h); dc->GetTextExtent(words[i], &wordWidth, &wordHeight);
dc->DrawText(words[i], x, y); dc->DrawText(words[i], x, y);
x += w; x += wordWidth;
} }
} }