// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "tbargtk.h"
#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
#include "wx/toolbar.h"
#if wxUSE_TOOLBAR_NATIVE
#include <glib.h>
#include "wx/gtk/private.h"
-extern GdkFont *GtkGetDefaultGuiFont();
-
// ----------------------------------------------------------------------------
// globals
// ----------------------------------------------------------------------------
// private functions
// ----------------------------------------------------------------------------
-// translate wxWindows toolbar style flags to GTK orientation and style
+// translate wxWidgets toolbar style flags to GTK orientation and style
static void GetGtkStyle(long style,
GtkOrientation *orient, GtkToolbarStyle *gtkStyle)
{
if ( style & wxTB_TEXT )
{
- *gtkStyle = style & wxTB_NOICONS ? GTK_TOOLBAR_TEXT : GTK_TOOLBAR_BOTH;
+ *gtkStyle = style & wxTB_NOICONS
+ ? GTK_TOOLBAR_TEXT
+ : (
+#ifdef __WXGTK20__
+ style & wxTB_HORZ_LAYOUT ? GTK_TOOLBAR_BOTH_HORIZ :
+#endif // __WXGTK20__
+ GTK_TOOLBAR_BOTH);
}
else // no text, hence we must have the icons or what would we show?
{
}
}
+ void SetPixmap(const wxBitmap& bitmap)
+ {
+ if (bitmap.Ok())
+ {
+ GdkBitmap *mask = bitmap.GetMask() ? bitmap.GetMask()->GetBitmap()
+ : (GdkBitmap *)NULL;
+#ifdef __WXGTK20__
+ if (bitmap.HasPixbuf())
+ gtk_image_set_from_pixbuf( GTK_IMAGE(m_pixmap), bitmap.GetPixbuf() );
+ else
+#endif // !__WXGTK20__
+ gtk_pixmap_set( GTK_PIXMAP(m_pixmap), bitmap.GetPixmap(), mask );
+ }
+ }
+
GtkWidget *m_item;
GtkWidget *m_pixmap;
// wxWin macros
// ----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarBase)
+IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl)
// ============================================================================
// implementation
// "clicked" (internal from gtk_toolbar)
//-----------------------------------------------------------------------------
+extern "C" {
static void gtk_toolbar_callback( GtkWidget *WXUNUSED(widget),
wxToolBarTool *tool )
{
{
tool->Toggle();
- wxBitmap bitmap = tool->GetBitmap();
- if ( bitmap.Ok() )
- {
- GtkPixmap *pixmap = GTK_PIXMAP( tool->m_pixmap );
-
- GdkBitmap *mask = bitmap.GetMask() ? bitmap.GetMask()->GetBitmap()
- : (GdkBitmap *)NULL;
-
- gtk_pixmap_set( pixmap, bitmap.GetPixmap(), mask );
- }
+ tool->SetPixmap(tool->GetBitmap());
if ( tool->IsRadio() && !tool->IsToggled() )
{
}
}
- tbar->OnLeftClick( tool->GetId(), tool->IsToggled() );
+ if( !tbar->OnLeftClick( tool->GetId(), tool->IsToggled() ) && tool->CanBeToggled() )
+ {
+ // revert back
+ tool->Toggle();
+
+ tool->SetPixmap(tool->GetBitmap());
+ }
+}
}
//-----------------------------------------------------------------------------
// "enter_notify_event" / "leave_notify_event"
//-----------------------------------------------------------------------------
+extern "C" {
static gint gtk_toolbar_tool_callback( GtkWidget *WXUNUSED(widget),
GdkEventCrossing *gdk_event,
wxToolBarTool *tool )
return FALSE;
}
+}
//-----------------------------------------------------------------------------
// InsertChild callback for wxToolBar
void wxToolBar::Init()
{
- m_fg =
- m_bg = (GdkColor *)NULL;
m_toolbar = (GtkToolbar *)NULL;
- m_blockEvent = FALSE;
+ m_blockEvent = false;
+ m_defaultWidth = 32;
+ m_defaultHeight = 32;
}
wxToolBar::~wxToolBar()
{
- delete m_fg;
- delete m_bg;
}
bool wxToolBar::Create( wxWindow *parent,
long style,
const wxString& name )
{
- m_needParent = TRUE;
+ m_needParent = true;
m_insertCallback = (wxInsertChildFunction)wxInsertChildInToolBar;
if ( !PreCreation( parent, pos, size ) ||
{
wxFAIL_MSG( wxT("wxToolBar creation failed") );
- return FALSE;
+ return false;
}
#ifdef __WXGTK20__
m_toolbar = GTK_TOOLBAR( gtk_toolbar_new() );
GtkSetStyle();
-
+
// Doesn't work this way.
// GtkToolbarSpaceStyle space_style = GTK_TOOLBAR_SPACE_EMPTY;
// gtk_widget_style_set (GTK_WIDGET (m_toolbar), "space_style", &space_style, NULL);
gtk_toolbar_set_button_relief( GTK_TOOLBAR(m_toolbar), GTK_RELIEF_NONE );
#endif
-
- m_fg = new GdkColor;
- m_fg->red = 0;
- m_fg->green = 0;
- m_fg->blue = 0;
- wxColour fg(0,0,0);
- fg.CalcPixel( gtk_widget_get_colormap( GTK_WIDGET(m_toolbar) ) );
- m_fg->pixel = fg.GetPixel();
-
- m_bg = new GdkColor;
- m_bg->red = 65535;
- m_bg->green = 65535;
- m_bg->blue = 49980;
- wxColour bg(255,255,196);
- bg.CalcPixel( gtk_widget_get_colormap( GTK_WIDGET(m_toolbar) ) );
- m_bg->pixel = bg.GetPixel();
-
- gtk_tooltips_force_window( GTK_TOOLBAR(m_toolbar)->tooltips );
-
- GtkStyle *g_style =
- gtk_style_copy(
- gtk_widget_get_style(
- GTK_TOOLBAR(m_toolbar)->tooltips->tip_window ) );
-
- g_style->bg[GTK_STATE_NORMAL] = *m_bg;
-
- SET_STYLE_FONT(g_style, GtkGetDefaultGuiFont());
-
- gtk_widget_set_style( GTK_TOOLBAR(m_toolbar)->tooltips->tip_window, g_style );
-
m_parent->DoAddChild( this );
- PostCreation();
-
- Show( TRUE );
+ PostCreation(size);
- return TRUE;
+ return true;
}
void wxToolBar::GtkSetStyle()
{
wxBitmap bitmap = tool->GetNormalBitmap();
- wxCHECK_MSG( bitmap.Ok(), FALSE,
+ wxCHECK_MSG( bitmap.Ok(), false,
wxT("invalid bitmap for wxToolBar icon") );
- wxCHECK_MSG( bitmap.GetBitmap() == NULL, FALSE,
+ wxCHECK_MSG( bitmap.GetBitmap() == NULL, false,
wxT("wxToolBar doesn't support GdkBitmap") );
- wxCHECK_MSG( bitmap.GetPixmap() != NULL, FALSE,
+ wxCHECK_MSG( bitmap.GetPixmap() != NULL, false,
wxT("wxToolBar::Add needs a wxBitmap") );
GtkWidget *tool_pixmap = (GtkWidget *)NULL;
- GdkPixmap *pixmap = bitmap.GetPixmap();
- GdkBitmap *mask = (GdkBitmap *)NULL;
- if ( bitmap.GetMask() )
- mask = bitmap.GetMask()->GetBitmap();
+#ifdef __WXGTK20__
+ if (bitmap.HasPixbuf())
+ {
+ tool_pixmap = gtk_image_new();
+ tool->m_pixmap = tool_pixmap;
+ tool->SetPixmap(bitmap);
+ }
+ else
+#endif
+ {
+ GdkPixmap *pixmap = bitmap.GetPixmap();
- tool_pixmap = gtk_pixmap_new( pixmap, mask );
- gtk_pixmap_set_build_insensitive( GTK_PIXMAP(tool_pixmap), TRUE );
+ GdkBitmap *mask = (GdkBitmap *)NULL;
+ if ( bitmap.GetMask() )
+ mask = bitmap.GetMask()->GetBitmap();
+
+ tool_pixmap = gtk_pixmap_new( pixmap, mask );
+ gtk_pixmap_set_build_insensitive( GTK_PIXMAP(tool_pixmap), TRUE );
+ }
gtk_misc_set_alignment( GTK_MISC(tool_pixmap), 0.5, 0.5 );
if ( tool->IsRadio() )
{
- wxToolBarToolsList::Node *node = pos ? m_tools.Item(pos - 1)
- : NULL;
+ wxToolBarToolsList::compatibility_iterator node
+ = wxToolBarToolsList::compatibility_iterator();
+ if ( pos ) node = m_tools.Item(pos - 1);
+
while ( node )
{
wxToolBarTool *tool = (wxToolBarTool *)node->GetData();
// this is the first button in the radio button group,
// it will be toggled automatically by GTK so bring the
// internal flag in sync
- tool->Toggle(TRUE);
+ tool->Toggle(true);
}
}
{
wxFAIL_MSG( _T("gtk_toolbar_insert_element() failed") );
- return FALSE;
+ return false;
}
-
+
gtk_signal_connect( GTK_OBJECT(tool->m_item),
"enter_notify_event",
GTK_SIGNAL_FUNC(gtk_toolbar_tool_callback),
gtk_toolbar_insert_space( m_toolbar, posGtk );
// skip the rest
- return TRUE;
+ return true;
case wxTOOL_STYLE_CONTROL:
gtk_toolbar_insert_widget(
(m_widget, &req );
m_width = req.width + m_xMargin;
m_height = req.height + 2*m_yMargin;
+ InvalidateBestSize();
- return TRUE;
+ return true;
}
-bool wxToolBar::DoDeleteTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolBase)
+bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *toolBase)
{
wxToolBarTool *tool = (wxToolBarTool *)toolBase;
gtk_widget_destroy( tool->m_item );
break;
- //case wxTOOL_STYLE_SEPARATOR: -- nothing to do
+#ifdef __WXGTK20__
+ case wxTOOL_STYLE_SEPARATOR:
+ gtk_toolbar_remove_space( m_toolbar, pos );
+ break;
+#endif
}
- return TRUE;
+ InvalidateBestSize();
+ return true;
}
// ----------------------------------------------------------------------------
GtkWidget *item = tool->m_item;
if ( item && GTK_IS_TOGGLE_BUTTON(item) )
{
- wxBitmap bitmap = tool->GetBitmap();
- if ( bitmap.Ok() )
- {
- GtkPixmap *pixmap = GTK_PIXMAP( tool->m_pixmap );
-
- GdkBitmap *mask = bitmap.GetMask() ? bitmap.GetMask()->GetBitmap()
- : (GdkBitmap *)NULL;
+ tool->SetPixmap(tool->GetBitmap());
- gtk_pixmap_set( pixmap, bitmap.GetPixmap(), mask );
- }
-
- m_blockEvent = TRUE;
+ m_blockEvent = true;
gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(item), toggle );
- m_blockEvent = FALSE;
+ m_blockEvent = false;
}
}
gdk_window_set_cursor( m_widget->window, cursor.GetCursor() );
}
- wxToolBarToolsList::Node *node = m_tools.GetFirst();
+ wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst();
while ( node )
{
wxToolBarTool *tool = (wxToolBarTool *)node->GetData();
}
}
- UpdateWindowUI();
+ if (wxUpdateUIEvent::CanUpdate(this))
+ UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
+}
+
+
+// ----------------------------------------------------------------------------
+
+// static
+wxVisualAttributes
+wxToolBar::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
+{
+#ifdef __WXGTK20__
+ return GetDefaultAttributesFromGTKWidget(gtk_toolbar_new);
+#else
+ wxVisualAttributes attr;
+ GtkWidget* widget = gtk_toolbar_new(GTK_ORIENTATION_HORIZONTAL, GTK_TOOLBAR_BOTH);
+ attr = GetDefaultAttributesFromGTKWidget(widget);
+ gtk_widget_destroy(widget);
+ return attr;
+#endif
}
#endif // wxUSE_TOOLBAR_NATIVE
projects / wxWidgets.git / blobdiff