Removed tabs.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27580 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-06-02 09:14:59 +00:00
parent 5c6e85adcf
commit 010216e3bc
13 changed files with 1525 additions and 1346 deletions

View File

@@ -253,133 +253,307 @@ void Card::Draw(wxDC& dc, int x, int y)
} }
// Draw the value // Draw the value
dc.Blit((wxCoord)(x + m_scale*3), (wxCoord)(y + m_scale*3), valuewidth, valueheight, dc.Blit((wxCoord)(x + m_scale*3),
&memoryDC, valuewidth * (m_pipValue - 1), valuepos, wxCOPY); (wxCoord)(y + m_scale*3),
dc.Blit((wxCoord)(x + m_width - m_scale*3 - valuewidth), (wxCoord)(y + m_height - valueheight - m_scale*3), valuewidth,
valuewidth, valueheight, valueheight,
&memoryDC, valuewidth * (m_pipValue - 1), valuepos+valueheight, wxCOPY); &memoryDC,
valuewidth * (m_pipValue - 1),
valuepos,
wxCOPY);
dc.Blit((wxCoord)(x + m_width - m_scale*3 - valuewidth),
(wxCoord)(y + m_height - valueheight - m_scale*3),
valuewidth,
valueheight,
&memoryDC,
valuewidth * (m_pipValue - 1),
valuepos+valueheight,
wxCOPY);
// Draw the pips // Draw the pips
dc.Blit((wxCoord)(x + m_scale*3 + valuewidth+2), (wxCoord)(y + m_scale*3), pipsize, pipsize, dc.Blit((wxCoord)(x + m_scale*3 + valuewidth+2),
&memoryDC, pipsize * m_suit, pippos, wxCOPY); (wxCoord)(y + m_scale*3),
dc.Blit((wxCoord)(x + m_width - m_scale*3-valuewidth-pipsize-2), (wxCoord)(y + m_height - pipsize - m_scale*3), pipsize,
pipsize, pipsize, pipsize,
&memoryDC, pipsize * m_suit, pipsize+pippos, wxCOPY); &memoryDC,
pipsize * m_suit,
pippos,
wxCOPY);
dc.Blit((wxCoord)(x + m_width - m_scale*3-valuewidth-pipsize-2),
(wxCoord)(y + m_height - pipsize - m_scale*3),
pipsize,
pipsize,
&memoryDC,
pipsize * m_suit,
pipsize+pippos,
wxCOPY);
switch (m_pipValue) switch (m_pipValue)
{ {
case 1: case 1:
dc.Blit((wxCoord)(x - symdist + m_width / 2), (wxCoord)(y - m_scale*5 + m_height / 2), symsize, symsize, dc.Blit((wxCoord)(x - symdist + m_width / 2),
&memoryDC, symsize * m_suit, sympos, wxCOPY); (wxCoord)(y - m_scale*5 + m_height / 2),
symsize,
symsize,
&memoryDC,
symsize * m_suit,
sympos,
wxCOPY);
break; break;
case 3: case 3:
dc.Blit((wxCoord)(x - symdist + m_width / 2), (wxCoord)(y - symdist + m_height / 2), symsize, symsize, dc.Blit((wxCoord)(x - symdist + m_width / 2),
&memoryDC, symsize * m_suit, sympos, wxCOPY); (wxCoord)(y - symdist + m_height / 2),
symsize,
symsize,
&memoryDC,
symsize * m_suit,
sympos,
wxCOPY);
case 2: case 2:
dc.Blit((wxCoord)(x - symdist + m_width / 2), dc.Blit((wxCoord)(x - symdist + m_width / 2),
(wxCoord)(y - symdist + m_height / 4), symsize, symsize, (wxCoord)(y - symdist + m_height / 4),
&memoryDC, symsize * m_suit, sympos, wxCOPY); symsize,
symsize,
&memoryDC,
symsize * m_suit,
sympos,
wxCOPY);
dc.Blit((wxCoord)(x - symdist + m_width / 2), dc.Blit((wxCoord)(x - symdist + m_width / 2),
(wxCoord)(y - symdist + 3 * m_height / 4), symsize, symsize, (wxCoord)(y - symdist + 3 * m_height / 4),
&memoryDC, symsize * m_suit, sympos2, wxCOPY); symsize,
symsize,
&memoryDC,
symsize * m_suit,
sympos2,
wxCOPY);
break; break;
case 5: case 5:
dc.Blit((wxCoord)(x - symdist + m_width / 2), (wxCoord)(y - symdist + m_height / 2), symsize, symsize, dc.Blit((wxCoord)(x - symdist + m_width / 2),
&memoryDC, symsize * m_suit, sympos, wxCOPY); (wxCoord)(y - symdist + m_height / 2),
symsize,
symsize,
&memoryDC,
symsize * m_suit,
sympos,
wxCOPY);
case 4: case 4:
dc.Blit((wxCoord)(x - symdist + m_width / 4), dc.Blit((wxCoord)(x - symdist + m_width / 4),
(wxCoord)(y - symdist + m_height / 4), symsize, symsize, (wxCoord)(y - symdist + m_height / 4),
&memoryDC, symsize * m_suit, sympos, wxCOPY); symsize,
symsize,
&memoryDC,
symsize * m_suit,
sympos,
wxCOPY);
dc.Blit((wxCoord)(x - symdist + m_width / 4), dc.Blit((wxCoord)(x - symdist + m_width / 4),
(wxCoord)(y - symdist + 3 * m_height / 4), symsize, symsize, (wxCoord)(y - symdist + 3 * m_height / 4),
&memoryDC, symsize * m_suit, sympos2, wxCOPY); symsize,
symsize,
&memoryDC,
symsize * m_suit,
sympos2,
wxCOPY);
dc.Blit((wxCoord)(x - symdist + 3 * m_width / 4), dc.Blit((wxCoord)(x - symdist + 3 * m_width / 4),
(wxCoord)(y - symdist + m_height / 4), symsize, symsize, (wxCoord)(y - symdist + m_height / 4),
&memoryDC, symsize * m_suit, sympos, wxCOPY); symsize,
symsize,
&memoryDC,
symsize * m_suit,
sympos,
wxCOPY);
dc.Blit((wxCoord)(x - symdist + 3 * m_width / 4), dc.Blit((wxCoord)(x - symdist + 3 * m_width / 4),
(wxCoord)(y - symdist + 3 * m_height / 4), symsize, symsize, (wxCoord)(y - symdist + 3 * m_height / 4),
&memoryDC, symsize * m_suit, sympos2, wxCOPY); symsize,
symsize,
&memoryDC,
symsize * m_suit,
sympos2,
wxCOPY);
break; break;
case 8: case 8:
dc.Blit((wxCoord)(x - symdist + 5 * m_width / 10), dc.Blit((wxCoord)(x - symdist + 5 * m_width / 10),
(wxCoord)(y - symdist + 5 * m_height / 8), symsize, symsize, (wxCoord)(y - symdist + 5 * m_height / 8),
&memoryDC, symsize * m_suit, sympos2, wxCOPY); symsize,
symsize,
&memoryDC,
symsize * m_suit,
sympos2,
wxCOPY);
case 7: case 7:
dc.Blit((wxCoord)(x - symdist + 5 * m_width / 10), dc.Blit((wxCoord)(x - symdist + 5 * m_width / 10),
(wxCoord)(y - symdist + 3 * m_height / 8), symsize, symsize, (wxCoord)(y - symdist + 3 * m_height / 8),
&memoryDC, symsize * m_suit, sympos, wxCOPY); symsize,
symsize,
&memoryDC,
symsize * m_suit,
sympos,
wxCOPY);
case 6: case 6:
dc.Blit((wxCoord)(x - symdist + m_width / 4), dc.Blit((wxCoord)(x - symdist + m_width / 4),
(wxCoord)(y - symdist + m_height / 4), symsize, symsize, (wxCoord)(y - symdist + m_height / 4),
symsize,
symsize,
&memoryDC, symsize * m_suit, sympos, wxCOPY); &memoryDC, symsize * m_suit, sympos, wxCOPY);
dc.Blit((wxCoord)(x - symdist + m_width / 4), dc.Blit((wxCoord)(x - symdist + m_width / 4),
(wxCoord)(y - symdist + m_height / 2), symsize, symsize, (wxCoord)(y - symdist + m_height / 2),
&memoryDC, symsize * m_suit, sympos, wxCOPY); symsize,
symsize,
&memoryDC,
symsize * m_suit,
sympos,
wxCOPY);
dc.Blit((wxCoord)(x - symdist + m_width / 4), dc.Blit((wxCoord)(x - symdist + m_width / 4),
(wxCoord)(y - symdist + 3 * m_height / 4), symsize, symsize, (wxCoord)(y - symdist + 3 * m_height / 4),
&memoryDC, symsize * m_suit, sympos2, wxCOPY); symsize,
symsize,
&memoryDC,
symsize * m_suit,
sympos2,
wxCOPY);
dc.Blit((wxCoord)(x - symdist + 3 * m_width / 4), dc.Blit((wxCoord)(x - symdist + 3 * m_width / 4),
(wxCoord)(y - symdist + m_height / 4), symsize, symsize, (wxCoord)(y - symdist + m_height / 4),
&memoryDC, symsize * m_suit, sympos, wxCOPY); symsize,
symsize,
&memoryDC,
symsize * m_suit,
sympos,
wxCOPY);
dc.Blit((wxCoord)(x - symdist + 3 * m_width / 4), dc.Blit((wxCoord)(x - symdist + 3 * m_width / 4),
(wxCoord)(y - symdist + m_height / 2), symsize, symsize, (wxCoord)(y - symdist + m_height / 2),
&memoryDC, symsize * m_suit, sympos, wxCOPY); symsize,
symsize,
&memoryDC,
symsize * m_suit,
sympos,
wxCOPY);
dc.Blit((wxCoord)(x - symdist + 3 * m_width / 4), dc.Blit((wxCoord)(x - symdist + 3 * m_width / 4),
(wxCoord)(y - symdist + 3 * m_height / 4), symsize, symsize, (wxCoord)(y - symdist + 3 * m_height / 4),
&memoryDC, symsize * m_suit, sympos2, wxCOPY); symsize,
symsize,
&memoryDC,
symsize * m_suit,
sympos2,
wxCOPY);
break; break;
case 10: case 10:
dc.Blit((wxCoord)(x - symdist + m_width / 2), dc.Blit((wxCoord)(x - symdist + m_width / 2),
(wxCoord)(y - symdist + 2 * m_height / 3), symsize, symsize, (wxCoord)(y - symdist + 2 * m_height / 3),
&memoryDC, symsize * m_suit, sympos2, wxCOPY); symsize,
symsize,
&memoryDC,
symsize * m_suit,
sympos2,
wxCOPY);
case 9: case 9:
dc.Blit((wxCoord)(x - symdist + m_width / 4), dc.Blit((wxCoord)(x - symdist + m_width / 4),
(wxCoord)(y - symdist2 + m_height / 4), symsize, symsize, (wxCoord)(y - symdist2 + m_height / 4),
&memoryDC, symsize * m_suit, sympos, wxCOPY); symsize,
symsize,
&memoryDC,
symsize * m_suit,
sympos,
wxCOPY);
dc.Blit((wxCoord)(x - symdist + m_width / 4), dc.Blit((wxCoord)(x - symdist + m_width / 4),
(wxCoord)(y - symdist2 + 5 * m_height / 12), symsize, symsize, (wxCoord)(y - symdist2 + 5 * m_height / 12),
&memoryDC, symsize * m_suit, sympos, wxCOPY); symsize,
symsize,
&memoryDC,
symsize * m_suit,
sympos,
wxCOPY);
dc.Blit((wxCoord)(x - symdist + m_width / 4), dc.Blit((wxCoord)(x - symdist + m_width / 4),
(wxCoord)(y - symdist + 7 * m_height / 12), symsize, symsize, (wxCoord)(y - symdist + 7 * m_height / 12),
&memoryDC, symsize * m_suit, sympos2, wxCOPY); symsize,
symsize,
&memoryDC,
symsize * m_suit,
sympos2,
wxCOPY);
dc.Blit((wxCoord)(x - symdist + m_width / 4), dc.Blit((wxCoord)(x - symdist + m_width / 4),
(wxCoord)(y - symdist + 3 * m_height / 4), symsize, symsize, (wxCoord)(y - symdist + 3 * m_height / 4),
&memoryDC, symsize * m_suit, sympos2, wxCOPY); symsize,
symsize,
&memoryDC,
symsize * m_suit,
sympos2,
wxCOPY);
dc.Blit((wxCoord)(x - symdist + 3 * m_width / 4), dc.Blit((wxCoord)(x - symdist + 3 * m_width / 4),
(wxCoord)(y - symdist2 + m_height / 4), symsize, symsize, (wxCoord)(y - symdist2 + m_height / 4),
&memoryDC, symsize * m_suit, sympos, wxCOPY); symsize,
symsize,
&memoryDC,
symsize * m_suit,
sympos,
wxCOPY);
dc.Blit((wxCoord)(x - symdist + 3 * m_width / 4), dc.Blit((wxCoord)(x - symdist + 3 * m_width / 4),
(wxCoord)(y - symdist2 + 5 * m_height / 12), symsize, symsize, (wxCoord)(y - symdist2 + 5 * m_height / 12),
&memoryDC, symsize * m_suit, sympos, wxCOPY); symsize,
symsize,
&memoryDC,
symsize * m_suit,
sympos,
wxCOPY);
dc.Blit((wxCoord)(x - symdist + 3 * m_width / 4), dc.Blit((wxCoord)(x - symdist + 3 * m_width / 4),
(wxCoord)(y - symdist + 7 * m_height / 12), symsize, symsize, (wxCoord)(y - symdist + 7 * m_height / 12),
&memoryDC, symsize * m_suit, sympos2, wxCOPY); symsize,
symsize,
&memoryDC,
symsize * m_suit,
sympos2,
wxCOPY);
dc.Blit((wxCoord)(x - symdist + 3 * m_width / 4), dc.Blit((wxCoord)(x - symdist + 3 * m_width / 4),
(wxCoord)(y - symdist + 3 * m_height / 4), symsize, symsize, (wxCoord)(y - symdist + 3 * m_height / 4),
&memoryDC, symsize * m_suit, sympos2, wxCOPY); symsize,
symsize,
&memoryDC,
symsize * m_suit,
sympos2,
wxCOPY);
dc.Blit((wxCoord)(x - symdist + m_width / 2), dc.Blit((wxCoord)(x - symdist + m_width / 2),
(wxCoord)(y - symdist + m_height / 3), symsize, symsize, (wxCoord)(y - symdist + m_height / 3),
&memoryDC, symsize * m_suit, sympos, wxCOPY); symsize,
symsize,
&memoryDC,
symsize * m_suit,
sympos,
wxCOPY);
break; break;
case 11: case 11:
case 12: case 12:
case 13: case 13:
memoryDC.SelectObject(*m_pictureBmap); memoryDC.SelectObject(*m_pictureBmap);
int picwidth = 40,picheight = 45; int picwidth = 40,picheight = 45;
dc.Blit((wxCoord)(x + (m_width-picwidth)/2), (wxCoord)(y - picheight/2 + m_height/2), dc.Blit((wxCoord)(x + (m_width-picwidth)/2),
picwidth, picheight, (wxCoord)(y - picheight/2 + m_height/2),
&memoryDC, picwidth * (m_pipValue - 11), 0, wxCOPY); picwidth,
picheight,
&memoryDC,
picwidth * (m_pipValue - 11),
0,
wxCOPY);
memoryDC.SelectObject(*m_symbolBmap); memoryDC.SelectObject(*m_symbolBmap);
dc.Blit((wxCoord)(x + m_width-(m_width-picwidth)/2-symsize-3),(wxCoord)(y - picheight/2+m_height/2+1), symsize, symsize, dc.Blit((wxCoord)(x + m_width-(m_width-picwidth)/2-symsize-3),
&memoryDC, symsize * m_suit, sympos, wxCOPY); (wxCoord)(y - picheight/2+m_height/2+1),
dc.Blit((wxCoord)(x + (m_width-picwidth)/2+2),(wxCoord)(y + picheight/2 + m_height/2-symsize), symsize, symsize, symsize,
&memoryDC, symsize * m_suit, sympos2, wxCOPY); symsize,
&memoryDC,
symsize * m_suit,
sympos,
wxCOPY);
dc.Blit((wxCoord)(x + (m_width-picwidth)/2+2),
(wxCoord)(y + picheight/2 + m_height/2-symsize),
symsize,
symsize,
&memoryDC,
symsize * m_suit,
sympos2,
wxCOPY);
break; break;
} }

View File

@@ -56,9 +56,14 @@ public:
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
private: private:
enum MenuCommands { NEW_GAME = 10, SCORES, enum MenuCommands {
UNDO, REDO, NEW_GAME = 10,
RIGHT_BUTTON_UNDO, HELPING_HAND, LARGE_CARDS SCORES,
UNDO,
REDO,
RIGHT_BUTTON_UNDO,
HELPING_HAND,
LARGE_CARDS
}; };
wxMenuBar* m_menuBar; wxMenuBar* m_menuBar;

View File

@@ -84,7 +84,7 @@ public:
void Redraw(wxDC& dc); void Redraw(wxDC& dc);
void DisplayScore(wxDC& dc); void DisplayScore(wxDC& dc);
bool LButtonDown(wxDC& dc, int mx, int my); // bool LButtonDown(wxDC& dc, int mx, int my);
void LButtonUp(wxDC& dc, int mx, int my); void LButtonUp(wxDC& dc, int mx, int my);
void LButtonDblClk(wxDC& dc, int mx, int my); void LButtonDblClk(wxDC& dc, int mx, int my);
void MouseMove(wxDC& dc, int mx, int my); void MouseMove(wxDC& dc, int mx, int my);