Much improved wxHelpControllerHtml, works under Solaris, too now.

[wxWidgets.git] / samples / forty / card.cpp

diff --git a/samples/forty/card.cpp b/samples/forty/card.cpp
index 691347254c15bb0229a8b5ea696c3386dbafb61e..37999de3ed26f478e7dda87a6c0a61a21d3c5f79 100644 (file)
--- a/samples/forty/card.cpp
+++ b/samples/forty/card.cpp
@@ -41,7 +41,7 @@
 #include "forty.h"
 #include "card.h"
 
-#ifdef __WXGTK__
+#if defined(__WXGTK__) || defined(__WXMOTIF__)
 #include "pictures.xpm"
 #include "symbols.xbm"
 #endif
@@ -171,7 +171,7 @@ void Card::Erase(wxDC& dc, int x, int y)
 //+-------------------------------------------------------------+
 void Card::Draw(wxDC& dc, int x, int y)
 {
-       wxBrush* backgroundBrush = & dc.GetBackground();
+       wxBrush backgroundBrush( dc.GetBackground() );
        dc.SetBrush(* wxWHITE_BRUSH);
        dc.SetPen(* wxBLACK_PEN);
        dc.DrawRoundedRectangle(x, y, CardWidth, CardHeight, 4);
@@ -336,7 +336,7 @@ void Card::Draw(wxDC& dc, int x, int y)
                }
 
        }
-       dc.SetBackground(* backgroundBrush);
+       dc.SetBackground( backgroundBrush );
 } // Card:Draw()