From 244d3b67caf13566cdcef6cccdd85163845c893e Mon Sep 17 00:00:00 2001
From: Julian Smart <julian@anthemion.co.uk>
Date: Thu, 22 Nov 2001 12:59:53 +0000
Subject: [PATCH] #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
---
 include/wx/motif/bitmap.h | 2 +-
 src/motif/joystick.cpp    | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/include/wx/motif/bitmap.h b/include/wx/motif/bitmap.h
index 785509cb69..d44ba42386 100644
--- 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 415165fe6b..b9b6fae1d0 100644
--- 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