SN: Replaced __WXOS2__ by __WXPM__ in #ifdefs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5590 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
7337790c27
commit
5c3beb8ee5
@ -1851,7 +1851,7 @@ static wxBitmap *GetTickBitmap()
|
|||||||
{
|
{
|
||||||
s_loaded = TRUE; // set it to TRUE anyhow, we won't try again
|
s_loaded = TRUE; // set it to TRUE anyhow, we won't try again
|
||||||
|
|
||||||
#if defined(__WXMSW__) || defined(__WXOS2__)
|
#if defined(__WXMSW__) || defined(__WXPM__)
|
||||||
s_tickBitmap = new wxBitmap("tick_bmp", wxBITMAP_TYPE_RESOURCE);
|
s_tickBitmap = new wxBitmap("tick_bmp", wxBITMAP_TYPE_RESOURCE);
|
||||||
#else
|
#else
|
||||||
s_tickBitmap = new wxBitmap( tick_xpm );
|
s_tickBitmap = new wxBitmap( tick_xpm );
|
||||||
@ -1870,7 +1870,7 @@ static wxBitmap *GetCrossBitmap()
|
|||||||
{
|
{
|
||||||
s_loaded = TRUE; // set it to TRUE anyhow, we won't try again
|
s_loaded = TRUE; // set it to TRUE anyhow, we won't try again
|
||||||
|
|
||||||
#if defined(__WXMSW__) || defined(__WXOS2__)
|
#if defined(__WXMSW__) || defined(__WXPM__)
|
||||||
s_crossBitmap = new wxBitmap("cross_bmp", wxBITMAP_TYPE_RESOURCE);
|
s_crossBitmap = new wxBitmap("cross_bmp", wxBITMAP_TYPE_RESOURCE);
|
||||||
#else // XPMs
|
#else // XPMs
|
||||||
s_crossBitmap = new wxBitmap( cross_xpm );
|
s_crossBitmap = new wxBitmap( cross_xpm );
|
||||||
|
Loading…
Reference in New Issue
Block a user