Fixed a void* to wxObject* conversion error in a return causing compile break across...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5017 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/tbarbase.h b/include/wx/tbarbase.h
index 288f2d3a64806f9022fb69281b7d7351ad538749..e75206df99d1a828dcf21fdf93df85c6386bfcd2 100644 (file)
--- a/include/wx/tbarbase.h
+++ b/include/wx/tbarbase.h
@@ -142,7 +142,7 @@ public:
     {
         if ( m_toolStyle == wxTOOL_STYLE_CONTROL )
         {
-            return m_control->GetClientData();
+            return (wxObject*)m_control->GetClientData();
         }
         else
         {