X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5f4d35b8045442f97ed74ba2aa633e843adae7ef..9f6e407c7d555078b6fd2ef62534acfbf9781545:/demos/forty/card.cpp diff --git a/demos/forty/card.cpp b/demos/forty/card.cpp index 3e35c64c0d..ccb8102ef4 100644 --- a/demos/forty/card.cpp +++ b/demos/forty/card.cpp @@ -19,11 +19,6 @@ //| hbmap_pictures. //+-------------------------------------------------------------+ -#ifdef __GNUG__ -#pragma implementation -#pragma interface -#endif - // For compilers that support precompilation, includes "wx/wx.h". #include "wx/wxprec.h" @@ -41,10 +36,8 @@ #include "forty.h" #include "card.h" -#ifndef __WXMSW__ #include "pictures.xpm" -#include "symbols.xbm" -#endif +#include "symbols.xpm" wxBitmap* Card::m_pictureBmap = 0; wxBitmap* Card::m_symbolBmap = 0; @@ -66,26 +59,18 @@ Card::Card(int value, WayUp way_up) : { if (!m_symbolBmap) { -#ifdef __WXMSW__ - 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()) + m_symbolBmap = new wxBitmap(symbols_xpm); + 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) { -#ifdef __WXMSW__ - m_pictureBmap = new wxBitmap(_T("CardPictures"), wxBITMAP_TYPE_BMP_RESOURCE); -#else m_pictureBmap = new wxBitmap(Pictures); -#endif - 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")); } } @@ -185,7 +170,7 @@ void Card::Draw(wxDC& dc, int x, int y) dc.SetBackground(* wxRED_BRUSH); dc.SetBackgroundMode(wxSOLID); wxBrush* brush = wxTheBrushList->FindOrCreateBrush( - _T("BLACK"), wxCROSSDIAG_HATCH + *wxBLACK, wxCROSSDIAG_HATCH ); dc.SetBrush(* brush);