#endif
#include "wx/toolbar.h"
-#include <wx/intl.h>
+
+//-----------------------------------------------------------------------------
+// data
+//-----------------------------------------------------------------------------
+
+extern bool g_blockEventsOnDrag;
//-----------------------------------------------------------------------------
// wxToolBarTool
IMPLEMENT_DYNAMIC_CLASS(wxToolBarTool,wxObject)
wxToolBarTool::wxToolBarTool( wxToolBar *owner, int theIndex,
- const wxBitmap& bitmap1, const wxBitmap& bitmap2,
- bool toggle, wxObject *clientData,
- const wxString& shortHelpString, const wxString& longHelpString )
+ const wxBitmap& bitmap1, const wxBitmap& bitmap2,
+ bool toggle,
+ wxObject *clientData,
+ const wxString& shortHelpString,
+ const wxString& longHelpString,
+ GtkWidget *item )
{
m_owner = owner;
m_index = theIndex;
m_isMenuCommand = TRUE;
m_clientData = clientData;
m_deleteSecondBitmap = FALSE;
-};
+ m_item = item;
+}
wxToolBarTool::~wxToolBarTool()
{
-};
+}
//-----------------------------------------------------------------------------
-// wxToolBar
+// "clicked" (internal from gtk_toolbar)
//-----------------------------------------------------------------------------
static void gtk_toolbar_callback( GtkWidget *WXUNUSED(widget), wxToolBarTool *tool )
{
+ if (g_blockEventsOnDrag) return;
if (!tool->m_enabled) return;
if (tool->m_isToggle) tool->m_toggleState = !tool->m_toggleState;
tool->m_owner->OnLeftClick( tool->m_index, tool->m_toggleState );
-};
+}
+//-----------------------------------------------------------------------------
+// "enter_notify_event"
//-----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxToolBar,wxControl)
+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 FALSE;
+}
-BEGIN_EVENT_TABLE(wxToolBar, wxControl)
-END_EVENT_TABLE()
+//-----------------------------------------------------------------------------
+// wxToolBar
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxToolBar,wxControl)
wxToolBar::wxToolBar()
{
-};
+}
wxToolBar::wxToolBar( wxWindow *parent, wxWindowID id,
const wxPoint& pos, const wxSize& size,
long style, const wxString& name )
{
Create( parent, id, pos, size, style, name );
-};
+}
wxToolBar::~wxToolBar()
{
-};
+}
bool wxToolBar::Create( wxWindow *parent, wxWindowID id,
const wxPoint& pos, const wxSize& size,
m_widget = gtk_handle_box_new();
m_toolbar = GTK_TOOLBAR( gtk_toolbar_new( GTK_ORIENTATION_HORIZONTAL, GTK_TOOLBAR_ICONS ) );
+ gtk_toolbar_set_tooltips( GTK_TOOLBAR(m_toolbar), TRUE );
gtk_container_add( GTK_CONTAINER(m_widget), GTK_WIDGET(m_toolbar) );
Show( TRUE );
return TRUE;
-};
+}
bool wxToolBar::OnLeftClick( int toolIndex, bool toggleDown )
{
GetEventHandler()->ProcessEvent(event);
return TRUE;
-};
+}
void wxToolBar::OnRightClick( int toolIndex, float WXUNUSED(x), float WXUNUSED(y) )
{
event.SetInt( toolIndex );
GetEventHandler()->ProcessEvent(event);
-};
+}
void wxToolBar::OnMouseEnter( int toolIndex )
{
- wxCommandEvent event( wxEVT_COMMAND_TOOL_ENTER, toolIndex );
+ wxCommandEvent event( wxEVT_COMMAND_TOOL_ENTER, GetId() );
event.SetEventObject(this);
event.SetInt( toolIndex );
-
+
GetEventHandler()->ProcessEvent(event);
-};
+}
wxToolBarTool *wxToolBar::AddTool( int toolIndex, const wxBitmap& bitmap,
const wxBitmap& pushedBitmap, bool toggle,
float WXUNUSED(xPos), float WXUNUSED(yPos), wxObject *clientData,
const wxString& helpString1, const wxString& helpString2 )
{
- if (!bitmap.Ok()) return NULL;
+ wxCHECK_MSG( bitmap.Ok(), (wxToolBarTool *)NULL,
+ "invalid bitmap for wxToolBar icon" );
- wxToolBarTool *tool = new wxToolBarTool( this, toolIndex, bitmap, pushedBitmap, toggle,
- clientData, helpString1, helpString2 );
+ wxToolBarTool *tool = new wxToolBarTool( this, toolIndex, bitmap, pushedBitmap,
+ toggle, clientData,
+ helpString1, helpString2 );
- GdkPixmap *pixmap = bitmap.GetPixmap();
+ wxCHECK_MSG( bitmap.GetBitmap() == NULL, (wxToolBarTool *)NULL,
+ "wxToolBar doesn't support GdkBitmap" );
- GdkBitmap *mask = NULL;
- if (bitmap.GetMask()) mask = bitmap.GetMask()->GetBitmap();
+ wxCHECK_MSG( bitmap.GetPixmap() != NULL, (wxToolBarTool *)NULL,
+ "wxToolBar::Add needs a wxBitmap" );
+
+ GtkWidget *tool_pixmap = (GtkWidget *) NULL;
+
+ if (TRUE) // FIXME huh?
+ {
+ GdkPixmap *pixmap = bitmap.GetPixmap();
- GtkWidget *tool_pixmap = gtk_pixmap_new( pixmap, mask );
+ GdkBitmap *mask = (GdkBitmap *) NULL;
+ if (bitmap.GetMask()) mask = bitmap.GetMask()->GetBitmap();
+
+ tool_pixmap = gtk_pixmap_new( pixmap, mask );
+ }
+
gtk_misc_set_alignment( GTK_MISC(tool_pixmap), 0.5, 0.5 );
- GtkToolbarChildType ctype = GTK_TOOLBAR_CHILD_BUTTON;
- if (toggle) ctype = GTK_TOOLBAR_CHILD_TOGGLEBUTTON;
-
- gtk_toolbar_append_element( m_toolbar,
- ctype, NULL, NULL, helpString1, "", tool_pixmap, (GtkSignalFunc)gtk_toolbar_callback, (gpointer)tool );
+#if 0
+ GtkToolbarChildType ctype = toggle ? GTK_TOOLBAR_CHILD_TOGGLEBUTTON
+ : GTK_TOOLBAR_CHILD_BUTTON;
+
+ tool->m_item = gtk_toolbar_append_element
+ (
+ GTK_TOOLBAR(m_toolbar),
+ ctype,
+ (GtkWidget *)NULL,
+ (const char *)NULL,
+ helpString1,
+ "",
+ tool_pixmap,
+ (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 );
+#else
+ tool->m_item = gtk_toolbar_append_item
+ (
+ GTK_TOOLBAR(m_toolbar),
+ (const char *)NULL,
+ helpString1,
+ "",
+ tool_pixmap,
+ (GtkSignalFunc)gtk_toolbar_callback,
+ (gpointer)tool
+ );
+#endif
m_tools.Append( tool );
return tool;
-};
+}
-void wxToolBar::AddSeparator(void)
+void wxToolBar::AddSeparator()
{
gtk_toolbar_append_space( m_toolbar );
-};
+}
-void wxToolBar::ClearTools(void)
+void wxToolBar::ClearTools()
{
- wxFAIL_MSG(_("wxToolBar::ClearTools not implemented"));
-};
+ wxFAIL_MSG( "wxToolBar::ClearTools not implemented" );
+}
-void wxToolBar::Realize(void)
+void wxToolBar::Realize()
{
m_x = 0;
m_y = 0;
{
int tool_height = tool->m_bitmap1.GetHeight();
if (tool_height > m_height) m_height = tool_height;
- };
+ }
node = node->Next();
- };
+ }
m_height += 10;
-};
+}
void wxToolBar::EnableTool(int toolIndex, bool enable)
{
return;
}
node = node->Next();
- };
-};
+ }
+
+ wxFAIL_MSG( "wrong toolbar index" );
+}
-void wxToolBar::ToggleTool(int WXUNUSED(toolIndex), bool WXUNUSED(toggle) )
+void wxToolBar::ToggleTool( int toolIndex, bool toggle )
{
- wxFAIL_MSG(_("wxToolBar::ToggleTool not implemented"));
-};
+ wxNode *node = m_tools.First();
+ while (node)
+ {
+ wxToolBarTool *tool = (wxToolBarTool*)node->Data();
+ if (tool->m_index == toolIndex)
+ {
+ tool->m_toggleState = toggle;
+ if ((tool->m_item) && (GTK_IS_TOGGLE_BUTTON(tool->m_item)))
+ gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(tool->m_item), toggle );
+ return;
+ }
+ node = node->Next();
+ }
+
+ wxFAIL_MSG( "wrong toolbar index" );
+}
-wxObject *wxToolBar::GetToolClientData(int index) const
+wxObject *wxToolBar::GetToolClientData( int index ) const
{
wxNode *node = m_tools.First();
while (node)
wxToolBarTool *tool = (wxToolBarTool*)node->Data();
if (tool->m_index == index) return tool->m_clientData;;
node = node->Next();
- };
+ }
+
+ wxFAIL_MSG( "wrong toolbar index" );
+
return (wxObject*)NULL;
-};
+}
bool wxToolBar::GetToolState(int toolIndex) const
{
wxToolBarTool *tool = (wxToolBarTool*)node->Data();
if (tool->m_index == toolIndex) return tool->m_toggleState;
node = node->Next();
- };
+ }
+
+ wxFAIL_MSG( "wrong toolbar index" );
+
return FALSE;
-};
+}
bool wxToolBar::GetToolEnabled(int toolIndex) const
{
wxToolBarTool *tool = (wxToolBarTool*)node->Data();
if (tool->m_index == toolIndex) return tool->m_enabled;
node = node->Next();
- };
+ }
+
+ wxFAIL_MSG( "wrong toolbar index" );
+
return FALSE;
-};
+}
void wxToolBar::SetMargins( int WXUNUSED(x), int WXUNUSED(y) )
{
-};
+ wxFAIL_MSG( "wxToolBar::SetMargins not implemented" );
+}
void wxToolBar::SetToolPacking( int WXUNUSED(packing) )
{
-};
+ wxFAIL_MSG( "wxToolBar::SetToolPacking not implemented" );
+}
void wxToolBar::SetToolSeparation( int separation )
{
gtk_toolbar_set_space_size( m_toolbar, separation );
-};
+}
projects / wxWidgets.git / blobdiff