refactor wxDocChildFrame and wxDocMDIChildFrame to use wxDocChildFrameAny intead...

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

diff --git a/src/gtk/tbargtk.cpp b/src/gtk/tbargtk.cpp
index fcc213eff4a13daac8732b28a4dbff781a2204f3..179f2aecf9d7f34ff31593d70405e451451dd126 100644 (file)
--- a/src/gtk/tbargtk.cpp
+++ b/src/gtk/tbargtk.cpp
@@ -345,7 +345,7 @@ wxToolBar::CreateTool(wxControl *control, const wxString& label)
 
 void wxToolBar::Init()
 {
 
 void wxToolBar::Init()
 {

-    m_toolbar = (GtkToolbar *)NULL;
+    m_toolbar = NULL;

     m_tooltips = NULL;
 }
 
     m_tooltips = NULL;
 }
 


@@ -648,7 +648,7 @@ wxToolBarToolBase *wxToolBar::FindToolForPosition(wxCoord WXUNUSED(x),
     // VZ: GTK+ doesn't seem to have such thing
     wxFAIL_MSG( _T("wxToolBar::FindToolForPosition() not implemented") );
 
     // VZ: GTK+ doesn't seem to have such thing
     wxFAIL_MSG( _T("wxToolBar::FindToolForPosition() not implemented") );
 

-    return (wxToolBarToolBase *)NULL;
+    return NULL;

 }
 
 void wxToolBar::SetToolShortHelp( int id, const wxString& helpString )
 }
 
 void wxToolBar::SetToolShortHelp( int id, const wxString& helpString )


@@ -696,7 +696,7 @@ void wxToolBar::SetToolDisabledBitmap( int id, const wxBitmap& bitmap )
 void wxToolBar::OnInternalIdle()
 {
     // Check if we have to show window now
 void wxToolBar::OnInternalIdle()
 {
     // Check if we have to show window now

-    if (GtkShowFromOnIdle()) return;
+    if (GTKShowFromOnIdle()) return;

 
     wxCursor cursor = m_cursor;
     if (g_globalCursor.Ok()) cursor = g_globalCursor;
 
     wxCursor cursor = m_cursor;
     if (g_globalCursor.Ok()) cursor = g_globalCursor;