Patch #514729 applied - adds missing RTTIs to wxToolLayoutItem

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

diff --git a/contrib/include/wx/fl/dyntbar.h b/contrib/include/wx/fl/dyntbar.h
index ea075be582edc430b048ae554749e56f044f1d55..a87b951c655154ad233887d2f084149d2c1c5136 100644 (file)
--- a/contrib/include/wx/fl/dyntbar.h
+++ b/contrib/include/wx/fl/dyntbar.h
@@ -25,6 +25,8 @@ Tool layout item.
 
 class wxToolLayoutItem : public wxObject
 {
 
 class wxToolLayoutItem : public wxObject
 {

+    DECLARE_DYNAMIC_CLASS(wxToolLayoutItem)
+

 public:
     wxRect    mRect;
     bool      mIsSeparator;
 public:
     wxRect    mRect;
     bool      mIsSeparator;


@@ -99,8 +101,8 @@ wxDynamicToolBar manages containment and layout of tool windows.
 class wxDynamicToolBar : public wxToolBarBase
 {
     DECLARE_DYNAMIC_CLASS(wxDynamicToolBar)
 class wxDynamicToolBar : public wxToolBarBase
 {
     DECLARE_DYNAMIC_CLASS(wxDynamicToolBar)

-protected:

 
 

+protected:

     friend class wxDynamicToolBarSerializer;
 
     wxDynToolInfoArrayT mTools;
     friend class wxDynamicToolBarSerializer;
 
     wxDynToolInfoArrayT mTools;

diff --git a/contrib/src/fl/dyntbar.cpp b/contrib/src/fl/dyntbar.cpp
index 194271339eec547fad7615a638af7f78405c646b..549d6899167f311227cdb58179c21d55af002cf5 100644 (file)
--- a/contrib/src/fl/dyntbar.cpp
+++ b/contrib/src/fl/dyntbar.cpp
@@ -39,6 +39,11 @@ BEGIN_EVENT_TABLE( wxDynamicToolBar, wxControl )
 
 END_EVENT_TABLE()
 
 
 END_EVENT_TABLE()
 

+/***** Implementation for class wxToolLayoutItem *****/
+        
+IMPLEMENT_DYNAMIC_CLASS(wxToolLayoutItem, wxObject)
+
+

 /***** Implementation for class wxDynToolInfo *****/
         
 IMPLEMENT_DYNAMIC_CLASS(wxDynToolInfo, wxToolLayoutItem)
 /***** Implementation for class wxDynToolInfo *****/
         
 IMPLEMENT_DYNAMIC_CLASS(wxDynToolInfo, wxToolLayoutItem)