Commit b828ab2d authored by twanvl's avatar twanvl

compatibility with wx2.6 and vc7.1

parent 660f5243
...@@ -146,7 +146,8 @@ void CardsPrintout::drawCard(DC& dc, const CardP& card, int card_nr) { ...@@ -146,7 +146,8 @@ void CardsPrintout::drawCard(DC& dc, const CardP& card, int card_nr) {
// Draw using text buffer // Draw using text buffer
double zoom = IsPreview() ? 1 : 4; double zoom = IsPreview() ? 1 : 4;
wxBitmap buffer(w*zoom,h*zoom,32); wxBitmap buffer(w*zoom,h*zoom,32);
wxMemoryDC bufferDC(buffer); wxMemoryDC bufferDC;
bufferDC.SelectObject(buffer);
clearDC(bufferDC,*wxWHITE_BRUSH); clearDC(bufferDC,*wxWHITE_BRUSH);
RotatedDC rdc(bufferDC, rotation, stylesheet.getCardRect(), zoom, QUALITY_AA, ROTATION_ATTACH_TOP_LEFT); RotatedDC rdc(bufferDC, rotation, stylesheet.getCardRect(), zoom, QUALITY_AA, ROTATION_ATTACH_TOP_LEFT);
// render card to dc // render card to dc
......
...@@ -55,7 +55,7 @@ class PrintJob : public IntrusivePtrBase<PrintJob> { ...@@ -55,7 +55,7 @@ class PrintJob : public IntrusivePtrBase<PrintJob> {
inline int num_pages() const { inline int num_pages() const {
int cards_per_page = max(1,layout.cards_per_page()); 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;
} }
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment