X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/510b9edbb6a614d42ac7697d0819d6720b774a19..6652e1a765385602430c604c7628a8fcd229d37c:/contrib/include/wx/fl/dyntbar.h

diff --git a/contrib/include/wx/fl/dyntbar.h b/contrib/include/wx/fl/dyntbar.h
index 4829235251..2cabbb94c7 100644
--- a/contrib/include/wx/fl/dyntbar.h
+++ b/contrib/include/wx/fl/dyntbar.h
@@ -38,8 +38,8 @@ class WXDLLIMPEXP_FL wxDynToolInfo;
 typedef wxToolLayoutItem* wxToolLayoutItemPtrT;
 typedef wxDynToolInfo*    wxDynToolInfoPtrT;
 
-WXFL_DEFINE_ARRAY( wxToolLayoutItemPtrT, wxLayoutItemArrayT  );
-WXFL_DEFINE_ARRAY( wxDynToolInfoPtrT,    wxDynToolInfoArrayT );
+WXFL_DEFINE_ARRAY_PTR( wxToolLayoutItemPtrT, wxLayoutItemArrayT  );
+WXFL_DEFINE_ARRAY_PTR( wxDynToolInfoPtrT,    wxDynToolInfoArrayT );
 
 /*
 This is a base class for layout algorithm implementations.
@@ -156,6 +156,11 @@ public:
                               const wxString& labelText = wxT(""), bool alignTextRight = FALSE,
                               bool isFlat = TRUE );
 
+        // Unhide method from parent.
+
+    virtual wxToolBarToolBase *AddTool (wxToolBarToolBase *tool)
+                              { return wxToolBarBase::AddTool(tool); };
+
     // Method from wxToolBarBase (for compatibility), only
     // the first two arguments are valid.
     // See the documentation for wxToolBar for details.
@@ -166,7 +171,12 @@ public:
 
         // Adds a separator. See the documentation for wxToolBar for details.
 
-    virtual void AddSeparator( wxWindow* pSepartorWnd = NULL );
+    virtual void AddSeparator( wxWindow* pSepartorWnd );
+
+        // Unhide method from parent.
+
+    virtual wxToolBarToolBase *AddSeparator()
+                              { return wxToolBarBase::AddSeparator(); };
 
         // Returns tool information for the given tool index.