X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fc7995487f3032d8415f87619efac7c391c72730..7fc77f30f423b59b826103bd28c57a437c1553ab:/demos/forty/card.cpp

diff --git a/demos/forty/card.cpp b/demos/forty/card.cpp
index 8c3df09b0c..94df438732 100644
--- a/demos/forty/card.cpp
+++ b/demos/forty/card.cpp
@@ -41,7 +41,7 @@
 #include "forty.h"
 #include "card.h"
 
-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
+#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXX11__)
 #include "pictures.xpm"
 #include "symbols.xbm"
 #endif
@@ -67,25 +67,25 @@ Card::Card(int value, WayUp way_up) :
 	if (!m_symbolBmap)
 	{
 #ifdef __WXMSW__
-		m_symbolBmap = new wxBitmap("CardSymbols", wxBITMAP_TYPE_BMP_RESOURCE);
+		m_symbolBmap = new wxBitmap(_T("CardSymbols"), wxBITMAP_TYPE_BMP_RESOURCE);
 #else
 		m_symbolBmap = new wxBitmap(Symbols_bits, Symbols_width, Symbols_height);
 #endif
 		if (!m_symbolBmap->Ok())
 		{
-			::wxMessageBox("Failed to load bitmap CardSymbols", "Error");
+			::wxMessageBox(_T("Failed to load bitmap CardSymbols"), _T("Error"));
 		}
 	}
 	if (!m_pictureBmap)
 	{
 #ifdef __WXMSW__
-		m_pictureBmap = new wxBitmap("CardPictures", wxBITMAP_TYPE_BMP_RESOURCE);
+		m_pictureBmap = new wxBitmap(_T("CardPictures"), wxBITMAP_TYPE_BMP_RESOURCE);
 #else
 		m_pictureBmap = new wxBitmap(Pictures);
 #endif
 		if (!m_pictureBmap->Ok())
 		{
-			::wxMessageBox("Failed to load bitmap CardPictures", "Error");
+			::wxMessageBox(_T("Failed to load bitmap CardPictures"), _T("Error"));
 		}
 	}
 
@@ -196,7 +196,7 @@ void Card::Draw(wxDC& dc, int x, int y)
 		dc.SetBackground(* wxRED_BRUSH);
 		dc.SetBackgroundMode(wxSOLID);
 		wxBrush* brush = wxTheBrushList->FindOrCreateBrush(
-							"BLACK", wxCROSSDIAG_HATCH
+							_T("BLACK"), wxCROSSDIAG_HATCH
 							);
 		dc.SetBrush(* brush);