compilation fixes for --disable-compat28

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2007-05-15 13:01:19 +00:00
parent f35c88fcca
commit 6f207e6699
4 changed files with 8 additions and 7 deletions

View File

@@ -609,7 +609,7 @@ void MyPrintout::DrawPageTwo()
{ // GetTextExtent demo:
wxString words[7] = {_T("This "), _T("is "), _T("GetTextExtent "), _T("testing "), _T("string. "), _T("Enjoy "), _T("it!")};
long w, h;
wxCoord w, h;
long x = 200, y= 250;
wxFont fnt(15, wxSWISS, wxNORMAL, wxNORMAL);
@@ -681,7 +681,7 @@ dc->SetFont(headerFont);
float topMarginLogical = (float)(mmToLogical*topMargin);
float rightMarginLogical = (float)(mmToLogical*(pageWidthMM - rightMargin));
long xExtent, yExtent;
wxCoord xExtent, yExtent;
dc->GetTextExtent(text, &xExtent, &yExtent);
float xPos = (float)(((((pageWidthMM - leftMargin - rightMargin)/2.0)+leftMargin)*mmToLogical) - (xExtent/2.0));
dc->DrawText(text, (long)xPos, (long)topMarginLogical);