//| hbmap_pictures.
//+-------------------------------------------------------------+
-#ifdef __GNUG__
-#pragma implementation
-#pragma interface
-#endif
-
// For compilers that support precompilation, includes "wx/wx.h".
#include "wx/wxprec.h"
#include "forty.h"
#include "card.h"
-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXX11__)
#include "pictures.xpm"
-#include "symbols.xbm"
-#endif
+#include "symbols.xpm"
wxBitmap* Card::m_pictureBmap = 0;
wxBitmap* Card::m_symbolBmap = 0;
{
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
+ m_symbolBmap = new wxBitmap(symbols_xpm);
if (!m_symbolBmap->Ok())
{
- ::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())
{
- ::wxMessageBox(_T("Failed to load bitmap CardPictures"), _T("Error"));
+ ::wxMessageBox(wxT("Failed to load bitmap CardPictures"), wxT("Error"));
}
}
dc.SetBackground(* wxRED_BRUSH);
dc.SetBackgroundMode(wxSOLID);
wxBrush* brush = wxTheBrushList->FindOrCreateBrush(
- _T("BLACK"), wxCROSSDIAG_HATCH
+ *wxBLACK, wxCROSSDIAG_HATCH
);
dc.SetBrush(* brush);
dc.SetPen(*pen);
dc.DrawRoundedRectangle(x, y, m_width, m_height, 4);
} // Card::DrawNullCard()
-
-