replaced more int/longs with wxCoord
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45933 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
b70642258f
commit
f3a8b1b68e
@ -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);
|
||||
|
@ -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"));
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
||||
|
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user