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

"wxGDIObject * => &" changes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1143 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1998-12-09 17:43:07 +00:00
parent 8bbe427f8e
commit 79490c3d8b
4 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
samples/forty/forty.cpp
View File

@@ -96,31 +96,34 @@ bool FortyApp::OnInit()
return true; return true;
} }
wxColour* FortyApp::BackgroundColour() const wxColour& FortyApp::BackgroundColour()
{ {
if (!m_backgroundColour) if (!m_backgroundColour)
{ {
m_backgroundColour = new wxColour(0, 128, 0); m_backgroundColour = new wxColour(0, 128, 0);
} }
return m_backgroundColour;
return *m_backgroundColour;
} }
wxBrush* FortyApp::BackgroundBrush() const wxBrush& FortyApp::BackgroundBrush()
{ {
if (!m_backgroundBrush) if (!m_backgroundBrush)
{ {
m_backgroundBrush = new wxBrush(*BackgroundColour(), wxSOLID); m_backgroundBrush = new wxBrush(*BackgroundColour(), wxSOLID);
} }
return m_backgroundBrush;
return *m_backgroundBrush;
} }
wxColour* FortyApp::TextColour() const wxColour& FortyApp::TextColour()
{ {
if (!m_textColour) if (!m_textColour)
{ {
m_textColour = new wxColour("BLACK"); m_textColour = new wxColour("BLACK");
} }
return m_textColour;
return *m_textColour;
} }
// My frame constructor // My frame constructor

6
samples/forty/forty.h
View File

@@ -18,9 +18,9 @@ class FortyApp: public wxApp
public: public:
bool OnInit(); bool OnInit();
static wxColour* BackgroundColour(); static const wxColour& BackgroundColour();
static wxColour* TextColour(); static const wxColour& TextColour();
static wxBrush* BackgroundBrush(); static const wxBrush& BackgroundBrush();
private: private:
static wxColour* m_backgroundColour; static wxColour* m_backgroundColour;

10
samples/forty/game.cpp
View File

@@ -364,7 +364,7 @@ bool Game::LButtonDown(wxDC& dc, int x, int y)
// Initialise the card bitmap to the background colour // Initialise the card bitmap to the background colour
{ {
wxMemoryDC memoryDC; wxMemoryDC memoryDC;
memoryDC.SelectObject(m_bmap); memoryDC.SelectObject(*m_bmap);
m_liftedCard = m_srcPile->RemoveTopCard(memoryDC, m_xPos, m_yPos); m_liftedCard = m_srcPile->RemoveTopCard(memoryDC, m_xPos, m_yPos);
} }
@@ -372,7 +372,7 @@ bool Game::LButtonDown(wxDC& dc, int x, int y)
// the screen // the screen
{ {
wxMemoryDC memoryDC; wxMemoryDC memoryDC;
memoryDC.SelectObject(m_bmapCard); memoryDC.SelectObject(*m_bmapCard);
m_liftedCard->Draw(memoryDC, 0, 0); m_liftedCard->Draw(memoryDC, 0, 0);
} }
} }
@@ -558,7 +558,7 @@ void Game::LButtonUp(wxDC& dc, int x, int y)
// Restore the area under the card // Restore the area under the card
wxMemoryDC memoryDC; wxMemoryDC memoryDC;
memoryDC.SelectObject(m_bmap); memoryDC.SelectObject(*m_bmap);
dc.Blit(m_xPos, m_yPos, CardWidth, CardHeight, dc.Blit(m_xPos, m_yPos, CardWidth, CardHeight,
&memoryDC, 0, 0, wxCOPY); &memoryDC, 0, 0, wxCOPY);
@@ -604,7 +604,7 @@ void Game::MouseMove(wxDC& dc, int mx, int my)
if (m_liftedCard) if (m_liftedCard)
{ {
wxMemoryDC memoryDC; wxMemoryDC memoryDC;
memoryDC.SelectObject(m_bmap); memoryDC.SelectObject(*m_bmap);
int dx = mx + m_xOffset - m_xPos; int dx = mx + m_xOffset - m_xPos;
int dy = my + m_yOffset - m_yPos; int dy = my + m_yOffset - m_yPos;
@@ -675,7 +675,7 @@ void Game::MouseMove(wxDC& dc, int mx, int my)
m_yPos += dy; m_yPos += dy;
// draw the card in its new position // draw the card in its new position
memoryDC.SelectObject(m_bmapCard); memoryDC.SelectObject(*m_bmapCard);
dc.Blit(m_xPos, m_yPos, CardWidth, CardHeight, dc.Blit(m_xPos, m_yPos, CardWidth, CardHeight,
&memoryDC, 0, 0, wxCOPY); &memoryDC, 0, 0, wxCOPY);
} }

4
samples/image/image.cpp
View File

@@ -122,8 +122,8 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
// MyFrame // MyFrame
const ID_QUIT = 108; const int ID_QUIT = 108;
const ID_ABOUT = 109; const int ID_ABOUT = 109;
IMPLEMENT_DYNAMIC_CLASS( MyFrame, wxFrame ) IMPLEMENT_DYNAMIC_CLASS( MyFrame, wxFrame )