#ifdefed out the joystick code, and removed the wxBitmapList addition
from the wxBitmap constructor that was causing a crash. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12590 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
bbb8f29b4a
commit
244d3b67ca
@ -136,7 +136,7 @@ public:
|
||||
|
||||
// Copy constructors
|
||||
wxBitmap(const wxBitmap& bitmap)
|
||||
{ Ref(bitmap); if ( wxTheBitmapList ) wxTheBitmapList->AddBitmap(this); }
|
||||
{ Ref(bitmap); }
|
||||
|
||||
// Initialize with raw XBM data
|
||||
wxBitmap(const char bits[], int width, int height, int depth = 1);
|
||||
|
@ -13,6 +13,9 @@
|
||||
#pragma implementation "joystick.h"
|
||||
#endif
|
||||
|
||||
// Not implemented in wxMotif
|
||||
#if 0
|
||||
|
||||
#include "wx/joystick.h"
|
||||
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxJoystick, wxObject)
|
||||
@ -277,3 +280,5 @@ bool wxJoystick::ReleaseCapture()
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
#endif
|
||||
// 0
|
||||
|
Loading…
Reference in New Issue
Block a user