Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Really do nothing if pressed on an already pressed

Browse Source 
radio toolbar button tool


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@46211 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2007-05-25 19:18:08 +00:00
parent f7321adde9
commit 23e276114e
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gtk/tbargtk.cpp
View File

@@ -154,7 +154,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl)
//-----------------------------------------------------------------------------
extern "C" {
static void gtk_toolbar_callback( GtkWidget *WXUNUSED(widget),
static void gtk_toolbar_callback( GtkWidget *widget,
wxToolBarTool *tool )
{
if (g_isIdle)
@@ -169,6 +169,14 @@ static void gtk_toolbar_callback( GtkWidget *WXUNUSED(widget),
if (tool->CanBeToggled())
{
if (tool->IsRadio() &&
gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(widget)) &&
tool->IsToggled())
{
// pressed an already pressed radio button
return;
}
tool->Toggle();
tool->SetImage(tool->GetBitmap());
@@ -474,7 +482,7 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase)
);
wxCHECK_MSG(tool->m_item != NULL, false, _T("gtk_toolbar_insert_element() failed"));
g_signal_connect (tool->m_item, "enter_notify_event",
G_CALLBACK (gtk_toolbar_tool_callback),
tool);