Don't include wxUniversal configurations in MSVC project files.

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

diff --git a/demos/forty/card.cpp b/demos/forty/card.cpp
index 7f126fdafad1687aa2a3c6fca16b95d5a36b9410..ccb8102ef4b17185fa50a126d8415ab57e9e9763 100644 (file)
--- a/demos/forty/card.cpp
+++ b/demos/forty/card.cpp
@@ -60,17 +60,17 @@ Card::Card(int value, WayUp way_up) :
     if (!m_symbolBmap)
     {
         m_symbolBmap = new wxBitmap(symbols_xpm);
     if (!m_symbolBmap)
     {
         m_symbolBmap = new wxBitmap(symbols_xpm);

-        if (!m_symbolBmap->Ok())
+        if (!m_symbolBmap->IsOk())

         {
         {

-            ::wxMessageBox(_T("Failed to load bitmap CardSymbols"), _T("Error"));
+            ::wxMessageBox(wxT("Failed to load bitmap CardSymbols"), wxT("Error"));

         }
     }
     if (!m_pictureBmap)
     {
         m_pictureBmap = new wxBitmap(Pictures);
         }
     }
     if (!m_pictureBmap)
     {
         m_pictureBmap = new wxBitmap(Pictures);

-        if (!m_pictureBmap->Ok())
+        if (!m_pictureBmap->IsOk())

         {
         {

-            ::wxMessageBox(_T("Failed to load bitmap CardPictures"), _T("Error"));
+            ::wxMessageBox(wxT("Failed to load bitmap CardPictures"), wxT("Error"));

         }
     }
 
         }
     }
 


@@ -170,7 +170,7 @@ void Card::Draw(wxDC& dc, int x, int y)
         dc.SetBackground(* wxRED_BRUSH);
         dc.SetBackgroundMode(wxSOLID);
         wxBrush* brush = wxTheBrushList->FindOrCreateBrush(
         dc.SetBackground(* wxRED_BRUSH);
         dc.SetBackgroundMode(wxSOLID);
         wxBrush* brush = wxTheBrushList->FindOrCreateBrush(

-                            _T("BLACK"), wxCROSSDIAG_HATCH
+                            *wxBLACK, wxCROSSDIAG_HATCH

                             );
         dc.SetBrush(* brush);
 
                             );
         dc.SetBrush(* brush);