replaced more int/longs with wxCoord

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45933 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/demos/bombs/bombs.cpp b/demos/bombs/bombs.cpp
index 1f4ef00c3f7f544728b90863aad85fd40d62b4e0..83e4652fca809ec9c379abb97f4b9e0f6ca3a611 100644 (file)
--- a/demos/bombs/bombs.cpp
+++ b/demos/bombs/bombs.cpp
@@ -233,7 +233,7 @@ BombsCanvas::BombsCanvas(wxFrame *parent, BombsGame *game)
     wxFont font= BOMBS_FONT;
     dc.SetFont(font);
 
-    long chw, chh;
+    wxCoord chw, chh;
     wxString buf = wxT("M");
 
     dc.GetTextExtent(buf, &chw, &chh);

diff --git a/demos/bombs/bombs1.cpp b/demos/bombs/bombs1.cpp
index 441e3ce0a08c35a204b13847548c4ad717afb535..19549cb8825a7b842e17a4aafe885671da46b2d9 100644 (file)
--- a/demos/bombs/bombs1.cpp
+++ b/demos/bombs/bombs1.cpp
@@ -32,7 +32,7 @@
 void BombsCanvas::DrawField(wxDC *dc, int xc1, int yc1, int xc2, int yc2)
 {
     wxString buf;
-    long chw, chh;
+    wxCoord chw, chh;
 
     wxColour wxYellow  = wxTheColourDatabase->Find(wxT("YELLOW"));
     wxColour wxFocused = wxTheColourDatabase->Find(wxT("GREY"));

diff --git a/demos/forty/game.cpp b/demos/forty/game.cpp
index e95954131e227e742c2fbb87e280fbad9774a6e2..dcf32e42b1d9ebfad9642351ebdd9ba2a4eaf716 100644 (file)
--- a/demos/forty/game.cpp
+++ b/demos/forty/game.cpp
@@ -233,9 +233,9 @@ void Game::DisplayScore(wxDC& dc)
     m_pack->GetTopCardPos(x, y);
     x += 12 * CardWidth - 105;
 
-    int w, h;
+    wxCoord w, h;
     {
-        long width, height;
+        wxCoord width, height;
         dc.GetTextExtent(_T("Average score:m_x"), &width, &height);
         w = width;
         h = height;

diff --git a/demos/poem/wxpoem.cpp b/demos/poem/wxpoem.cpp
index 7464f76cd1c7b2756ec1c212ee7518a8a1f89726..2234c07cc0ceb42958b3fe498a42e897796e808f 100644 (file)
--- a/demos/poem/wxpoem.cpp
+++ b/demos/poem/wxpoem.cpp
@@ -179,8 +179,8 @@ void MainWindow::ScanBuffer(wxDC *dc, bool DrawIt, int *max_x, int *max_y)
     // See what ACTUAL char height is
     if(m_normalFont)
         dc->SetFont(*m_normalFont);
-    long xx;
-    long yy;
+    wxCoord xx;
+    wxCoord yy;
     dc->GetTextExtent(_T("X"), &xx, &yy);
     char_height = (int)yy;
 

diff --git a/src/msw/dragimag.cpp b/src/msw/dragimag.cpp
index 2cb08d63d31c44396e6837fd2026c7cfe4b969da..4f42ad81d99ef53768300cbfffeeb7e41fdc7354 100644 (file)
--- a/src/msw/dragimag.cpp
+++ b/src/msw/dragimag.cpp
@@ -205,7 +205,7 @@ bool wxDragImage::Create(const wxString& str, const wxCursor& cursor)
 {
     wxFont font(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
 
-    long w = 0, h = 0;
+    wxCoord w = 0, h = 0;
     wxScreenDC dc;
     dc.SetFont(font);
     dc.GetTextExtent(str, & w, & h);