compatibility with wx2.6 and vc7.1

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1648 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
twanvl
2011-02-03 21:43:37 +00:00
parent e36f697855
commit f189929158
2 changed files with 3 additions and 2 deletions
+2 -1
View File
@@ -146,7 +146,8 @@ void CardsPrintout::drawCard(DC& dc, const CardP& card, int card_nr) {
// Draw using text buffer
double zoom = IsPreview() ? 1 : 4;
wxBitmap buffer(w*zoom,h*zoom,32);
wxMemoryDC bufferDC(buffer);
wxMemoryDC bufferDC;
bufferDC.SelectObject(buffer);
clearDC(bufferDC,*wxWHITE_BRUSH);
RotatedDC rdc(bufferDC, rotation, stylesheet.getCardRect(), zoom, QUALITY_AA, ROTATION_ATTACH_TOP_LEFT);
// render card to dc
+1 -1
View File
@@ -55,7 +55,7 @@ class PrintJob : public IntrusivePtrBase<PrintJob> {
inline int num_pages() const {
int cards_per_page = max(1,layout.cards_per_page());
return (cards.size() + cards_per_page - 1) / cards_per_page;
return ((int)cards.size() + cards_per_page - 1) / cards_per_page;
}
};