From f18992915862192aa93df1bda67cee3157950aa9 Mon Sep 17 00:00:00 2001
From: twanvl <twanvl@0fc631ac-6414-0410-93d0-97cfa31319b6>
Date: Thu, 3 Feb 2011 21:43:37 +0000
Subject: [PATCH] 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
---
 src/gui/print_window.cpp | 3 ++-
 src/gui/print_window.hpp | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/gui/print_window.cpp b/src/gui/print_window.cpp
index 476b701b..fa6852a1 100644
--- a/src/gui/print_window.cpp
+++ b/src/gui/print_window.cpp
@@ -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
diff --git a/src/gui/print_window.hpp b/src/gui/print_window.hpp
index 1c603705..9c3dbced 100644
--- a/src/gui/print_window.hpp
+++ b/src/gui/print_window.hpp
@@ -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;
 	}
 };