Pressing build-in joystick on WinCE phones fires wxEVT_JOY_BUTTON_DOWN event.

[wxWidgets.git] / include / wx / object.h

diff --git a/include/wx/object.h b/include/wx/object.h
index b88a0d850a4fc43b28f9b441143f3c63e8a8d3fa..35ff626b4e3cf67a245543d54aedfdc0d2320dc5 100644 (file)
--- a/include/wx/object.h
+++ b/include/wx/object.h
@@ -13,10 +13,6 @@
 #ifndef _WX_OBJECTH__
 #define _WX_OBJECTH__
 
 #ifndef _WX_OBJECTH__
 #define _WX_OBJECTH__
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "object.h"
-#endif
-

 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------


@@ -26,10 +22,6 @@
 
 class WXDLLIMPEXP_BASE wxObject;
 
 
 class WXDLLIMPEXP_BASE wxObject;
 

-// FIXME: remove in wx-2.7:
-class WXDLLIMPEXP_BASE wxEvent;
-class WXDLLIMPEXP_BASE wxEvtHandler;
-

 #ifndef wxUSE_EXTENDED_RTTI
 #define wxUSE_EXTENDED_RTTI 0
 #endif
 #ifndef wxUSE_EXTENDED_RTTI
 #define wxUSE_EXTENDED_RTTI 0
 #endif


@@ -413,9 +405,9 @@ public:
     virtual ~wxObject() { UnRef(); }
 
     wxObject(const wxObject& other)
     virtual ~wxObject() { UnRef(); }
 
     wxObject(const wxObject& other)

-        {
-            InitFrom(other);
-        }
+    {
+        InitFrom(other);
+    }

 
     wxObject& operator=(const wxObject& other)
     {
 
     wxObject& operator=(const wxObject& other)
     {


@@ -482,9 +474,7 @@ public:
     virtual void ReservedObjectFunc6() {}
     virtual void ReservedObjectFunc7() {}
     virtual void ReservedObjectFunc8() {}
     virtual void ReservedObjectFunc6() {}
     virtual void ReservedObjectFunc7() {}
     virtual void ReservedObjectFunc8() {}

-    // FIXME: turn back into ReservedObjectFunc9() in wx-2.7 (see also FIXME
-    //        near the top of this file)
-    virtual void DoHandleEvent(void (wxEvtHandler::*)(wxEvent&), wxEvent&) {}
+    virtual void ReservedObjectFunc9() {}

 
 protected:
     // ensure that our data is not shared with anybody else: if we have no
 
 protected:
     // ensure that our data is not shared with anybody else: if we have no