Fix for previous patch

[wxWidgets.git] / src / gtk / tbargtk.cpp

diff --git a/src/gtk/tbargtk.cpp b/src/gtk/tbargtk.cpp
index a28e8eb817c869d10597c5a4161f4618c1168d39..87b8aa903fc7234aaace0da8fb0dec69ea1a5bd5 100644 (file)
--- a/src/gtk/tbargtk.cpp
+++ b/src/gtk/tbargtk.cpp
@@ -355,7 +355,7 @@ void gtktoolwidget_size_callback( GtkWidget *widget,
 // InsertChild callback for wxToolBar
 //-----------------------------------------------------------------------------
 
 // InsertChild callback for wxToolBar
 //-----------------------------------------------------------------------------
 

-static void wxInsertChildInToolBar( wxToolBar* WXUNUSED(parent),
+static void wxInsertChildInToolBar( wxWindow* WXUNUSED(parent),

                                     wxWindow* WXUNUSED(child) )
 {
     // we don't do anything here
                                     wxWindow* WXUNUSED(child) )
 {
     // we don't do anything here


@@ -413,7 +413,7 @@ bool wxToolBar::Create( wxWindow *parent,
                         long style,
                         const wxString& name )
 {
                         long style,
                         const wxString& name )
 {

-    m_insertCallback = (wxInsertChildFunction)wxInsertChildInToolBar;
+    m_insertCallback = wxInsertChildInToolBar;

 
     if ( !PreCreation( parent, pos, size ) ||
          !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
 
     if ( !PreCreation( parent, pos, size ) ||
          !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))