Browse Source

Fix preprocessor expression

The "and" and "or" keywords are only defined if <iso646.h> is included.

This fixes the C4067 warnings.
pull/16/head
Simon Richter 6 years ago
committed by Ian McInerney
parent
commit
0f105c4c9a
  1. 6
      common/cursor_store.cpp

6
common/cursor_store.cpp

@ -39,7 +39,7 @@
*/
wxCursor constructCursor( const CURSOR_STORE::CURSOR_DEF& aDef )
{
#if defined( __WXMSW__ ) or defined( __WXMAC__ )
#if defined( __WXMSW__ ) || defined( __WXMAC__ )
wxBitmap img_bitmap(
reinterpret_cast<const char*>( aDef.m_image_data ), aDef.m_size.x, aDef.m_size.y );
@ -58,7 +58,7 @@ wxCursor constructCursor( const CURSOR_STORE::CURSOR_DEF& aDef )
return wxCursor{ image };
#elif defined( __WXGTK__ ) or defined( __WXMOTIF__ )
#elif defined( __WXGTK__ ) || defined( __WXMOTIF__ )
return wxCursor{
reinterpret_cast<const char*>( aDef.m_image_data ),
@ -97,4 +97,4 @@ const wxCursor& CURSOR_STORE::Get( int aIdKey ) const
wxASSERT_MSG( false,
wxString::Format( "Could not find cursor with ID %d", static_cast<int>( aIdKey ) ) );
return wxNullCursor;
}
}
Loading…
Cancel
Save