Do not generate wxEVT_PG_SELECTED with direct ClearSelection() and SelectProperty...

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

diff --git a/src/gtk/tbargtk.cpp b/src/gtk/tbargtk.cpp
index 7deab1ffa54a348cc79ab1faf4a150184c0b8cf3..5a675ea8d06b5a3264fa7bb77b56d77f9ce00a71 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()
 {
-    m_toolbar = (GtkToolbar *)NULL;
+    m_toolbar = NULL;
     m_tooltips = NULL;
 }
 
@@ -447,7 +447,7 @@ void wxToolBar::SetWindowStyleFlag( long style )
 
 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() )
@@ -552,7 +552,7 @@ bool wxToolBar::DoInsertTool(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)
     {
@@ -597,7 +597,7 @@ GSList* wxToolBar::GetRadioGroup(size_t pos)
 
 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);
@@ -605,7 +605,7 @@ void wxToolBar::DoEnableTool(wxToolBarToolBase *toolBase, bool enable)
 
 void wxToolBar::DoToggleTool( wxToolBarToolBase *toolBase, bool toggle )
 {
-    wxToolBarTool* tool = wx_static_cast(wxToolBarTool*, toolBase);
+    wxToolBarTool* tool = static_cast<wxToolBarTool*>(toolBase);
 
     if (tool->m_item)
     {
@@ -622,7 +622,7 @@ void wxToolBar::DoSetToggle(wxToolBarToolBase * WXUNUSED(tool),
                             bool WXUNUSED(toggle))
 {
     // VZ: absolutely no idea about how to do it
-    wxFAIL_MSG( _T("not implemented") );
+    wxFAIL_MSG( wxT("not implemented") );
 }
 
 // ----------------------------------------------------------------------------
@@ -646,14 +646,14 @@ wxToolBarToolBase *wxToolBar::FindToolForPosition(wxCoord WXUNUSED(x),
                                                   wxCoord WXUNUSED(y)) const
 {
     // VZ: GTK+ doesn't seem to have such thing
-    wxFAIL_MSG( _T("wxToolBar::FindToolForPosition() not implemented") );
+    wxFAIL_MSG( wxT("wxToolBar::FindToolForPosition() not implemented") );
 
-    return (wxToolBarToolBase *)NULL;
+    return NULL;
 }
 
 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 )
     {
@@ -668,7 +668,7 @@ void wxToolBar::SetToolShortHelp( int id, const wxString& helpString )
 
 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."));
@@ -680,7 +680,7 @@ void wxToolBar::SetToolNormalBitmap( 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."));
@@ -696,7 +696,7 @@ void wxToolBar::SetToolDisabledBitmap( int id, const wxBitmap& bitmap )
 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;