fixed wxXmlResource::Load's detection of filenames to be done as early as possible

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

diff --git a/src/gtk/tbargtk.cpp b/src/gtk/tbargtk.cpp
index 9eb43e3fc3d4e5726c71738203b7cc8bc4499f03..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;
 }
 


@@ -378,7 +378,7 @@ bool wxToolBar::Create( wxWindow *parent,
     m_toolbar = GTK_TOOLBAR( gtk_toolbar_new() );
     m_tooltips = gtk_tooltips_new();
     g_object_ref(m_tooltips);
     m_toolbar = GTK_TOOLBAR( gtk_toolbar_new() );
     m_tooltips = gtk_tooltips_new();
     g_object_ref(m_tooltips);

-    g_object_ref_sink(m_tooltips);
+    gtk_object_sink(GTK_OBJECT(m_tooltips));

     GtkSetStyle();
 
     if (style & wxTB_DOCKABLE)
     GtkSetStyle();
 
     if (style & wxTB_DOCKABLE)


@@ -447,7 +447,7 @@ void wxToolBar::SetWindowStyleFlag( long style )
 
 bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase)
 {
 
 bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase)
 {

-    wxToolBarTool* tool = wx_static_cast(wxToolBarTool*, toolBase);
+    wxToolBarTool* tool = static_cast<wxToolBarTool*>(toolBase);

 
     GSList* radioGroup;
     switch ( tool->GetStyle() )
 
     GSList* radioGroup;
     switch ( tool->GetStyle() )


@@ -552,7 +552,7 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase)
 
 bool wxToolBar::DoDeleteTool(size_t /* pos */, wxToolBarToolBase* toolBase)
 {
 
 bool wxToolBar::DoDeleteTool(size_t /* pos */, wxToolBarToolBase* toolBase)
 {

-    wxToolBarTool* tool = wx_static_cast(wxToolBarTool*, toolBase);
+    wxToolBarTool* tool = static_cast<wxToolBarTool*>(toolBase);

 
     if (tool->GetStyle() == wxTOOL_STYLE_CONTROL)
     {
 
     if (tool->GetStyle() == wxTOOL_STYLE_CONTROL)
     {


@@ -597,7 +597,7 @@ GSList* wxToolBar::GetRadioGroup(size_t pos)
 
 void wxToolBar::DoEnableTool(wxToolBarToolBase *toolBase, bool enable)
 {
 
 void wxToolBar::DoEnableTool(wxToolBarToolBase *toolBase, bool enable)
 {

-    wxToolBarTool* tool = wx_static_cast(wxToolBarTool*, toolBase);
+    wxToolBarTool* tool = static_cast<wxToolBarTool*>(toolBase);

 
     if (tool->m_item)
         gtk_widget_set_sensitive(GTK_WIDGET(tool->m_item), enable);
 
     if (tool->m_item)
         gtk_widget_set_sensitive(GTK_WIDGET(tool->m_item), enable);


@@ -605,7 +605,7 @@ void wxToolBar::DoEnableTool(wxToolBarToolBase *toolBase, bool enable)
 
 void wxToolBar::DoToggleTool( wxToolBarToolBase *toolBase, bool toggle )
 {
 
 void wxToolBar::DoToggleTool( wxToolBarToolBase *toolBase, bool toggle )
 {

-    wxToolBarTool* tool = wx_static_cast(wxToolBarTool*, toolBase);
+    wxToolBarTool* tool = static_cast<wxToolBarTool*>(toolBase);

 
     if (tool->m_item)
     {
 
     if (tool->m_item)
     {


@@ -648,12 +648,12 @@ 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 )
 {

-    wxToolBarTool* tool = wx_static_cast(wxToolBarTool*, FindById(id));
+    wxToolBarTool* tool = static_cast<wxToolBarTool*>(FindById(id));

 
     if ( tool )
     {
 
     if ( tool )
     {


@@ -668,7 +668,7 @@ void wxToolBar::SetToolShortHelp( int id, const wxString& helpString )
 
 void wxToolBar::SetToolNormalBitmap( int id, const wxBitmap& bitmap )
 {
 
 void wxToolBar::SetToolNormalBitmap( int id, const wxBitmap& bitmap )
 {

-    wxToolBarTool* tool = wx_static_cast(wxToolBarTool*, FindById(id));
+    wxToolBarTool* tool = static_cast<wxToolBarTool*>(FindById(id));

     if ( tool )
     {
         wxCHECK_RET( tool->IsButton(), wxT("Can only set bitmap on button tools."));
     if ( tool )
     {
         wxCHECK_RET( tool->IsButton(), wxT("Can only set bitmap on button tools."));


@@ -680,7 +680,7 @@ void wxToolBar::SetToolNormalBitmap( int id, const wxBitmap& bitmap )
 
 void wxToolBar::SetToolDisabledBitmap( int id, const wxBitmap& bitmap )
 {
 
 void wxToolBar::SetToolDisabledBitmap( int id, const wxBitmap& bitmap )
 {

-    wxToolBarTool* tool = wx_static_cast(wxToolBarTool*, FindById(id));
+    wxToolBarTool* tool = static_cast<wxToolBarTool*>(FindById(id));

     if ( tool )
     {
         wxCHECK_RET( tool->IsButton(), wxT("Can only set bitmap on button tools."));
     if ( tool )
     {
         wxCHECK_RET( tool->IsButton(), wxT("Can only set bitmap on button tools."));


@@ -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;