forcefully disable wxUSE_STACKWALKER

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

diff --git a/include/wx/window.h b/include/wx/window.h
index b9a8332d5c94ff378eecd1c16fdab028de4a13e3..cb66b14bc85e59a4f701f63e6e8e4e748d9e4a9c 100644 (file)
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -73,8 +73,6 @@ class WXDLLEXPORT wxWindow;
 class WXDLLEXPORT wxAccessible;
 #endif
 
-class WXDLLEXPORT wxWindowExtraData;
-
 // ----------------------------------------------------------------------------
 // helper stuff used by wxWindow
 // ----------------------------------------------------------------------------
@@ -922,6 +920,10 @@ public:
     void SetHelpTextForId(const wxString& text);
         // get the help string associated with this window (may be empty)
     wxString GetHelpText() const;
+#else
+    // silently ignore SetHelpText() calls
+    void SetHelpText(const wxString& WXUNUSED(text)) { }
+    void SetHelpTextForId(const wxString& WXUNUSED(text)) { }
 #endif // wxUSE_HELP
 
     // tooltips
@@ -1314,9 +1316,8 @@ protected:
     // implements the window variants
     virtual void DoSetWindowVariant( wxWindowVariant variant ) ;
 
-    // Was a reserved pointer in 2.6.0, now used to hold extra data members
-    // without breaking compatibility.
-    wxWindowExtraData* m_extraData;
+    // Reserved for future use
+    void* m_windowReserved;
 
 private:
     // contains the last id generated by NewControlId