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

Added TOOL_ENTER command. Now wxGTK and wxMSW misbehave

Browse Source 
equally on that matter.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@593 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1998-08-18 17:41:55 +00:00
parent c2dd8380ba
commit 314055fa8d
2 changed files with 44 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/gtk/tbargtk.cpp
View File

@@ -16,6 +16,12 @@
#include "wx/toolbar.h" #include "wx/toolbar.h"
#include <wx/intl.h> #include <wx/intl.h>
//-----------------------------------------------------------------------------
// data
//-----------------------------------------------------------------------------
extern bool g_blockEventsOnDrag;
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// wxToolBarTool // wxToolBarTool
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@@ -53,6 +59,7 @@ wxToolBarTool::~wxToolBarTool()
static void gtk_toolbar_callback( GtkWidget *WXUNUSED(widget), wxToolBarTool *tool ) static void gtk_toolbar_callback( GtkWidget *WXUNUSED(widget), wxToolBarTool *tool )
{ {
if (g_blockEventsOnDrag) return;
if (!tool->m_enabled) return; if (!tool->m_enabled) return;
if (tool->m_isToggle) tool->m_toggleState = !tool->m_toggleState; if (tool->m_isToggle) tool->m_toggleState = !tool->m_toggleState;
@@ -60,6 +67,16 @@ static void gtk_toolbar_callback( GtkWidget *WXUNUSED(widget), wxToolBarTool *to
tool->m_owner->OnLeftClick( tool->m_index, tool->m_toggleState ); tool->m_owner->OnLeftClick( tool->m_index, tool->m_toggleState );
} }
static gint gtk_toolbar_enter_callback( GtkWidget *WXUNUSED(widget),
GdkEventCrossing *WXUNUSED(gdk_event), wxToolBarTool *tool )
{
if (g_blockEventsOnDrag) return TRUE;
tool->m_owner->OnMouseEnter( tool->m_index );
return TRUE;
}
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxToolBar,wxControl) IMPLEMENT_DYNAMIC_CLASS(wxToolBar,wxControl)
@@ -130,7 +147,7 @@ void wxToolBar::OnRightClick( int toolIndex, float WXUNUSED(x), float WXUNUSED(y
void wxToolBar::OnMouseEnter( int toolIndex ) void wxToolBar::OnMouseEnter( int toolIndex )
{ {
wxCommandEvent event( wxEVT_COMMAND_TOOL_ENTER, toolIndex ); wxCommandEvent event( wxEVT_COMMAND_TOOL_ENTER, GetId() );
event.SetEventObject(this); event.SetEventObject(this);
event.SetInt( toolIndex ); event.SetInt( toolIndex );
@@ -171,6 +188,9 @@ wxToolBarTool *wxToolBar::AddTool( int toolIndex, const wxBitmap& bitmap,
tool->m_item = gtk_toolbar_append_element( m_toolbar, ctype, NULL, NULL, helpString1, "", tool_pixmap, tool->m_item = gtk_toolbar_append_element( m_toolbar, ctype, NULL, NULL, helpString1, "", tool_pixmap,
(GtkSignalFunc)gtk_toolbar_callback, (gpointer)tool ); (GtkSignalFunc)gtk_toolbar_callback, (gpointer)tool );
gtk_signal_connect( GTK_OBJECT(tool->m_item), "enter_notify_event",
GTK_SIGNAL_FUNC(gtk_toolbar_enter_callback), (gpointer)tool );
m_tools.Append( tool ); m_tools.Append( tool );
return tool; return tool;

22
src/gtk1/tbargtk.cpp
View File

@@ -16,6 +16,12 @@
#include "wx/toolbar.h" #include "wx/toolbar.h"
#include <wx/intl.h> #include <wx/intl.h>
//-----------------------------------------------------------------------------
// data
//-----------------------------------------------------------------------------
extern bool g_blockEventsOnDrag;
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// wxToolBarTool // wxToolBarTool
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@@ -53,6 +59,7 @@ wxToolBarTool::~wxToolBarTool()
static void gtk_toolbar_callback( GtkWidget *WXUNUSED(widget), wxToolBarTool *tool ) static void gtk_toolbar_callback( GtkWidget *WXUNUSED(widget), wxToolBarTool *tool )
{ {
if (g_blockEventsOnDrag) return;
if (!tool->m_enabled) return; if (!tool->m_enabled) return;
if (tool->m_isToggle) tool->m_toggleState = !tool->m_toggleState; if (tool->m_isToggle) tool->m_toggleState = !tool->m_toggleState;
@@ -60,6 +67,16 @@ static void gtk_toolbar_callback( GtkWidget *WXUNUSED(widget), wxToolBarTool *to
tool->m_owner->OnLeftClick( tool->m_index, tool->m_toggleState ); tool->m_owner->OnLeftClick( tool->m_index, tool->m_toggleState );
} }
static gint gtk_toolbar_enter_callback( GtkWidget *WXUNUSED(widget),
GdkEventCrossing *WXUNUSED(gdk_event), wxToolBarTool *tool )
{
if (g_blockEventsOnDrag) return TRUE;
tool->m_owner->OnMouseEnter( tool->m_index );
return TRUE;
}
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxToolBar,wxControl) IMPLEMENT_DYNAMIC_CLASS(wxToolBar,wxControl)
@@ -130,7 +147,7 @@ void wxToolBar::OnRightClick( int toolIndex, float WXUNUSED(x), float WXUNUSED(y
void wxToolBar::OnMouseEnter( int toolIndex ) void wxToolBar::OnMouseEnter( int toolIndex )
{ {
wxCommandEvent event( wxEVT_COMMAND_TOOL_ENTER, toolIndex ); wxCommandEvent event( wxEVT_COMMAND_TOOL_ENTER, GetId() );
event.SetEventObject(this); event.SetEventObject(this);
event.SetInt( toolIndex ); event.SetInt( toolIndex );
@@ -171,6 +188,9 @@ wxToolBarTool *wxToolBar::AddTool( int toolIndex, const wxBitmap& bitmap,
tool->m_item = gtk_toolbar_append_element( m_toolbar, ctype, NULL, NULL, helpString1, "", tool_pixmap, tool->m_item = gtk_toolbar_append_element( m_toolbar, ctype, NULL, NULL, helpString1, "", tool_pixmap,
(GtkSignalFunc)gtk_toolbar_callback, (gpointer)tool ); (GtkSignalFunc)gtk_toolbar_callback, (gpointer)tool );
gtk_signal_connect( GTK_OBJECT(tool->m_item), "enter_notify_event",
GTK_SIGNAL_FUNC(gtk_toolbar_enter_callback), (gpointer)tool );
m_tools.Append( tool ); m_tools.Append( tool );
return tool; return tool;