/////////////////////////////////////////////////////////////////////////////
-// Name: tbargtk.cpp
+// Name: src/gtk1/tbargtk.cpp
// Purpose: GTK toolbar
// Author: Robert Roebling
// Modified: 13.12.99 by VZ to derive from wxToolBarBase
// headers
// ----------------------------------------------------------------------------
-#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 "wx/frame.h"
+#include "wx/toolbar.h"
-#include <glib.h>
-#include "wx/gtk/private.h"
+#ifndef WX_PRECOMP
+ #include "wx/frame.h"
+#endif
-extern GdkFont *GtkGetDefaultGuiFont();
+#include <glib.h>
+#include "wx/gtk1/private.h"
// ----------------------------------------------------------------------------
// globals
{
*gtkStyle = style & wxTB_NOICONS
? GTK_TOOLBAR_TEXT
- : (
-#ifdef __WXGTK20__
- style & wxTB_HORZ_LAYOUT ? GTK_TOOLBAR_BOTH_HORIZ :
-#endif // __WXGTK20__
- GTK_TOOLBAR_BOTH);
+ : GTK_TOOLBAR_BOTH;
}
else // no text, hence we must have the icons or what would we show?
{
Init();
}
- wxToolBarTool(wxToolBar *tbar, wxControl *control)
- : wxToolBarToolBase(tbar, control)
+ wxToolBarTool(wxToolBar *tbar, wxControl *control, const wxString& label)
+ : wxToolBarToolBase(tbar, control, label)
{
Init();
}
{
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 );
+ gtk_pixmap_set( GTK_PIXMAP(m_pixmap), bitmap.GetPixmap(), mask );
}
}
clientData, shortHelpString, longHelpString);
}
-wxToolBarToolBase *wxToolBar::CreateTool(wxControl *control)
+wxToolBarToolBase *
+wxToolBar::CreateTool(wxControl *control, const wxString& label)
{
- return new wxToolBarTool(this, control);
+ return new wxToolBarTool(this, control, label);
}
//-----------------------------------------------------------------------------
void wxToolBar::Init()
{
m_toolbar = (GtkToolbar *)NULL;
- m_blockEvent = FALSE;
+ m_blockEvent = false;
m_defaultWidth = 32;
m_defaultHeight = 32;
}
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();
+ FixupStyle();
- // 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);
-#else
GtkOrientation orient;
GtkToolbarStyle gtkStyle;
GetGtkStyle(style, &orient, >kStyle);
m_toolbar = GTK_TOOLBAR( gtk_toolbar_new(orient, gtkStyle) );
-#endif
SetToolSeparation(7);
gtk_toolbar_set_tooltips( GTK_TOOLBAR(m_toolbar), TRUE );
- // FIXME: there is no such function for toolbars in 2.0
-#ifndef __WXGTK20__
if (style & wxTB_FLAT)
gtk_toolbar_set_button_relief( GTK_TOOLBAR(m_toolbar), GTK_RELIEF_NONE );
-#endif
m_parent->DoAddChild( this );
PostCreation(size);
- return TRUE;
+ return true;
}
void wxToolBar::GtkSetStyle()
{
wxToolBarTool *tool = (wxToolBarTool *)toolBase;
-#ifndef __WXGTK20__
// if we have inserted a space before all the tools we must change the GTK
// index by 1
size_t posGtk = m_xMargin > 1 ? pos + 1 : pos;
-#else
- size_t posGtk = pos;
-#endif
if ( tool->IsButton() )
{
{
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();
-#ifdef __WXGTK20__
- if (bitmap.HasPixbuf())
- {
- tool_pixmap = gtk_image_new();
- tool->m_pixmap = tool_pixmap;
- tool->SetPixmap(bitmap);
- }
- else
-#endif
- {
- GdkPixmap *pixmap = bitmap.GetPixmap();
-
- 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 );
- }
+ 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 );
{
wxToolBarToolsList::compatibility_iterator node
= wxToolBarToolsList::compatibility_iterator();
- if ( pos ) node = m_tools.Item(pos - 1);
+ if ( pos )
+ node = m_tools.Item(pos - 1);
while ( node )
{
- wxToolBarTool *tool = (wxToolBarTool *)node->GetData();
- if ( !tool->IsRadio() )
+ wxToolBarTool *toolNext = (wxToolBarTool *)node->GetData();
+ if ( !toolNext->IsRadio() )
break;
- widget = tool->m_item;
+ widget = toolNext->m_item;
node = node->GetPrevious();
}
// 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),
gtk_toolbar_insert_space( m_toolbar, posGtk );
// skip the rest
- return TRUE;
+ return true;
case wxTOOL_STYLE_CONTROL:
gtk_toolbar_insert_widget(
m_height = req.height + 2*m_yMargin;
InvalidateBestSize();
- return TRUE;
+ return true;
}
-bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *toolBase)
+bool wxToolBar::DoDeleteTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolBase)
{
wxToolBarTool *tool = (wxToolBarTool *)toolBase;
case wxTOOL_STYLE_BUTTON:
gtk_widget_destroy( tool->m_item );
break;
-
-#ifdef __WXGTK20__
- case wxTOOL_STYLE_SEPARATOR:
- gtk_toolbar_remove_space( m_toolbar, pos );
- break;
-#endif
}
InvalidateBestSize();
- return TRUE;
+ return true;
}
// ----------------------------------------------------------------------------
{
tool->SetPixmap(tool->GetBitmap());
- m_blockEvent = TRUE;
+ m_blockEvent = true;
gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(item), toggle );
- m_blockEvent = FALSE;
+ m_blockEvent = false;
}
}
wxCHECK_RET( GetToolsCount() == 0,
wxT("wxToolBar::SetMargins must be called before adding tools.") );
-#ifndef __WXGTK20__
if (x > 1)
gtk_toolbar_append_space( m_toolbar ); // oh well
-#endif
m_xMargin = x;
m_yMargin = y;
void wxToolBar::SetToolSeparation( int separation )
{
- // FIXME: this function disappeared
-#ifndef __WXGTK20__
gtk_toolbar_set_space_size( m_toolbar, separation );
-#endif
m_toolSeparation = separation;
}
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