there is a way to restore the revision before the buttons on the logwindow (and the toolbar tools) were introduced. This is the diff file, for two files:
Index: ThreadSearch.cpp
===================================================================
--- ThreadSearch.cpp (Revision 5824)
+++ ThreadSearch.cpp (Arbeitskopie)
@@ -76,8 +76,8 @@
EVT_MENU (idMenuEditCopy, ThreadSearch::OnMnuEditCopy)
EVT_UPDATE_UI (idMenuEditCopy, ThreadSearch::OnMnuEditCopyUpdateUI)
EVT_MENU (idMenuEditPaste, ThreadSearch::OnMnuEditPaste)
- EVT_TOOL (idBtnOptions, ThreadSearch::OnBtnOptionsClick)
- EVT_TOOL (idBtnSearch, ThreadSearch::OnBtnSearchClick)
+ EVT_BUTTON (idBtnOptions, ThreadSearch::OnBtnOptionsClick)
+ EVT_BUTTON (idBtnSearch, ThreadSearch::OnBtnSearchClick)
EVT_TEXT_ENTER(idCboSearchExpr, ThreadSearch::OnCboSearchExprEnter)
EVT_TEXT (idCboSearchExpr, ThreadSearch::OnCboSearchExprEnter)
// ---------------------------------------------------------------------------
@@ -605,13 +605,19 @@
m_pToolbar->SetToolBitmapSize(wxSize(22,22));
}
m_pCboSearchExpr = new wxComboBox (toolBar, idCboSearchExpr, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_DROPDOWN);
+ wxBitmapButton* pBtnSearch = new wxBitmapButton(toolBar, idBtnSearch, wxBitmap(prefix + wxT("findf.png"), wxBITMAP_TYPE_PNG));
+ wxBitmapButton* pBtnOptions = new wxBitmapButton(toolBar, idBtnOptions, wxBitmap(prefix + wxT("options.png"), wxBITMAP_TYPE_PNG));
m_pCboSearchExpr->SetToolTip(_("Text to search"));
+ pBtnSearch->SetToolTip(_("Run search"));
+ pBtnOptions->SetToolTip(_("Show options window"));
+ pBtnSearch->SetBitmapDisabled(wxBitmap(prefix + wxT("findfdisabled.png"), wxBITMAP_TYPE_PNG));
+ pBtnOptions->SetBitmapDisabled(wxBitmap(prefix + wxT("optionsdisabled.png"), wxBITMAP_TYPE_PNG));
toolBar->AddControl(m_pCboSearchExpr);
- toolBar->AddTool(idBtnSearch,_(""),wxBitmap(prefix + wxT("findf.png"), wxBITMAP_TYPE_PNG),wxBitmap(prefix + wxT("findfdisabled.png"), wxBITMAP_TYPE_PNG),wxITEM_NORMAL,_("Run search")); //Control(pBtnSearch);
- toolBar->AddTool(idBtnOptions,_(""),wxBitmap(prefix + wxT("options.png"), wxBITMAP_TYPE_PNG),wxBitmap(prefix + wxT("optionsdisabled.png"), wxBITMAP_TYPE_PNG),wxITEM_NORMAL,_("Show options window")); //Control(pBtnSearch);
+ toolBar->AddControl(pBtnSearch);
+ toolBar->AddControl(pBtnOptions);
toolBar->Realize();
#if wxCHECK_VERSION(2, 8, 0)
@@ -629,7 +635,7 @@
if ( !IsAttached() )
return;
- m_pThreadSearchView->OnBtnOptionsClick(event);
+ m_pThreadSearchView->ProcessEvent(event);
}
@@ -643,7 +649,7 @@
{
// In this case, user wants to stops search,
// we just transmit event
- m_pThreadSearchView->OnBtnSearchClick(event);
+ m_pThreadSearchView->ProcessEvent(event);
}
else
Index: ThreadSearchView.cpp
===================================================================
--- ThreadSearchView.cpp (Revision 5824)
+++ ThreadSearchView.cpp (Arbeitskopie)
@@ -716,6 +716,7 @@
};
long toolBarIdsArray[] = {
+ idBtnOptions,
idCboSearchExpr
};
@@ -737,9 +738,6 @@
{
m_pToolBar->FindControl(toolBarIdsArray[i])->Enable(enable);
}
-
- m_pToolBar->EnableTool(idBtnOptions,enable);
- m_pToolBar->Update();
}
@@ -871,6 +869,7 @@
wxEmptyString};
// Gets toolbar search button pointer
+ wxBitmapButton* pToolBarSearchBtn = static_cast<wxBitmapButton*>(m_pToolBar->FindControl(idBtnSearch));
// Changes label/bitmap only if requested
if ( label != skip )
{
@@ -878,14 +877,14 @@
m_pBtnSearch->SetBitmapLabel (wxBitmap(searchButtonPathsEnabled [label], wxBITMAP_TYPE_PNG));
m_pBtnSearch->SetBitmapDisabled(wxBitmap(searchButtonPathsDisabled[label], wxBITMAP_TYPE_PNG));
//{ Toolbar buttons
- m_pToolBar->SetToolNormalBitmap(idBtnSearch,wxBitmap(searchButtonPathsEnabled [label], wxBITMAP_TYPE_PNG));
- m_pToolBar->SetToolDisabledBitmap(idBtnSearch,wxBitmap(searchButtonPathsDisabled[label], wxBITMAP_TYPE_PNG));
+ pToolBarSearchBtn->SetBitmapLabel (wxBitmap(searchButtonPathsEnabled [label], wxBITMAP_TYPE_PNG));
+ pToolBarSearchBtn->SetBitmapDisabled(wxBitmap(searchButtonPathsDisabled[label], wxBITMAP_TYPE_PNG));
//}
}
// Sets enable state
m_pBtnSearch->Enable(enable);
- m_pToolBar->EnableTool(idBtnSearch,enable);
+ pToolBarSearchBtn->Enable(enable);
}
I think it's complete because the functions for the button handling occur in these files only (not in the headers)