From: David Webster <Dave.Webster@bhmi.com>
Date: Fri, 17 Dec 1999 15:35:48 +0000 (+0000)
Subject: Fixed a void* to wxObject* conversion error in a return causing compile break across... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/2063a4a0cab1161dbda7c1dc52f6996436765ce4?ds=inline

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


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 288f2d3a64..e75206df99 100644
--- 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
         {