#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

diff --git a/include/wx/motif/bitmap.h b/include/wx/motif/bitmap.h
index 785509cb695f6e5cb86308742ccf7a3291ef130e..d44ba42386f74f293ddbb39c8e6f0f0ad4749842 100644 (file)
--- a/include/wx/motif/bitmap.h
+++ b/include/wx/motif/bitmap.h
@@ -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);

diff --git a/src/motif/joystick.cpp b/src/motif/joystick.cpp
index 415165fe6b26a8dfcd7c47f526dfd1e807c478f1..b9b6fae1d03d145225ad2855f4b50444123f3652 100644 (file)
--- a/src/motif/joystick.cpp
+++ b/src/motif/joystick.cpp
@@ -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