X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/222ed1d678dff2f5c3c4164321dd05e8f47de487..50679f941ec64c417c39582b276068fef8ca59cb:/src/gtk/tbargtk.cpp?ds=sidebyside diff --git a/src/gtk/tbargtk.cpp b/src/gtk/tbargtk.cpp index 5c47efac8b..166df0600c 100644 --- a/src/gtk/tbargtk.cpp +++ b/src/gtk/tbargtk.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: tbargtk.cpp +// Name: src/gtk/tbargtk.cpp // Purpose: GTK toolbar // Author: Robert Roebling // Modified: 13.12.99 by VZ to derive from wxToolBarBase @@ -16,29 +16,30 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma implementation "tbargtk.h" -#endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#if wxUSE_TOOLBAR_NATIVE #include "wx/toolbar.h" -#if wxUSE_TOOLBAR_NATIVE +#ifndef WX_PRECOMP + #include "wx/frame.h" +#endif -#include "wx/frame.h" +// FIXME: Use GtkImage instead of GtkPixmap. Use the new toolbar API for when gtk runtime is new enough? +// Beware that the new and old toolbar API may not be mixed in usage. +#include +#ifdef GTK_DISABLE_DEPRECATED +#undef GTK_DISABLE_DEPRECATED +#endif -#include #include "wx/gtk/private.h" -extern GdkFont *GtkGetDefaultGuiFont(); - // ---------------------------------------------------------------------------- // globals // ---------------------------------------------------------------------------- -// idle system -extern void wxapp_install_idle_handler(); -extern bool g_isIdle; - // data extern bool g_blockEventsOnDrag; extern wxCursor g_globalCursor; @@ -47,7 +48,7 @@ extern wxCursor g_globalCursor; // 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) { @@ -60,9 +61,7 @@ static void GetGtkStyle(long style, *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? @@ -125,8 +124,17 @@ public: } } + void SetImage(const wxBitmap& bitmap) + { + if (bitmap.Ok()) + { + // setting from pixmap doesn't seem to work right, but pixbuf works well + gtk_image_set_from_pixbuf((GtkImage*)m_image, bitmap.GetPixbuf()); + } + } + GtkWidget *m_item; - GtkWidget *m_pixmap; + GtkWidget *m_image; protected: void Init(); @@ -136,7 +144,7 @@ protected: // wxWin macros // ---------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarBase) +IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl) // ============================================================================ // implementation @@ -146,6 +154,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarBase) // "clicked" (internal from gtk_toolbar) //----------------------------------------------------------------------------- +extern "C" { static void gtk_toolbar_callback( GtkWidget *WXUNUSED(widget), wxToolBarTool *tool ) { @@ -163,16 +172,7 @@ static void gtk_toolbar_callback( GtkWidget *WXUNUSED(widget), { 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->SetImage(tool->GetBitmap()); if ( tool->IsRadio() && !tool->IsToggled() ) { @@ -181,18 +181,26 @@ static void gtk_toolbar_callback( GtkWidget *WXUNUSED(widget), } } - tbar->OnLeftClick( tool->GetId(), tool->IsToggled() ); + if( !tbar->OnLeftClick( tool->GetId(), tool->IsToggled() ) && tool->CanBeToggled() ) + { + // revert back + tool->Toggle(); + + tool->SetImage(tool->GetBitmap()); + } +} } //----------------------------------------------------------------------------- // "enter_notify_event" / "leave_notify_event" //----------------------------------------------------------------------------- +extern "C" { static gint gtk_toolbar_tool_callback( GtkWidget *WXUNUSED(widget), GdkEventCrossing *gdk_event, wxToolBarTool *tool ) { - if (g_isIdle) wxapp_install_idle_handler(); + // don't need to install idle handler, its done from "event" signal if (g_blockEventsOnDrag) return TRUE; @@ -206,6 +214,7 @@ static gint gtk_toolbar_tool_callback( GtkWidget *WXUNUSED(widget), return FALSE; } +} //----------------------------------------------------------------------------- // InsertChild callback for wxToolBar @@ -224,7 +233,7 @@ static void wxInsertChildInToolBar( wxToolBar* WXUNUSED(parent), void wxToolBarTool::Init() { m_item = - m_pixmap = (GtkWidget *)NULL; + m_image = NULL; } wxToolBarToolBase *wxToolBar::CreateTool(int id, @@ -251,16 +260,14 @@ wxToolBarToolBase *wxToolBar::CreateTool(wxControl *control) 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, @@ -270,7 +277,7 @@ 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 ) || @@ -278,23 +285,15 @@ bool wxToolBar::Create( wxWindow *parent, { 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); -#else - GtkOrientation orient; - GtkToolbarStyle gtkStyle; - GetGtkStyle(style, &orient, >kStyle); - - m_toolbar = GTK_TOOLBAR( gtk_toolbar_new(orient, gtkStyle) ); -#endif SetToolSeparation(7); @@ -315,49 +314,22 @@ bool wxToolBar::Create( wxWindow *parent, gtk_widget_show(GTK_WIDGET(m_toolbar)); } - gtk_toolbar_set_tooltips( GTK_TOOLBAR(m_toolbar), TRUE ); - // FIXME: there is no such function for toolbars in 2.0 -#ifndef __WXGTK20__ +#if 0 if (style & wxTB_FLAT) 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; - - gtk_widget_set_style( GTK_TOOLBAR(m_toolbar)->tooltips->tip_window, g_style ); - m_parent->DoAddChild( this ); - PostCreation(); + PostCreation(size); - Show( TRUE ); + return true; +} - return TRUE; +GdkWindow *wxToolBar::GTKGetWindow(wxArrayGdkWindows& windows) const +{ + return GTK_WIDGET(m_toolbar)->window; } void wxToolBar::GtkSetStyle() @@ -368,6 +340,7 @@ void wxToolBar::GtkSetStyle() gtk_toolbar_set_orientation(m_toolbar, orient); gtk_toolbar_set_style(m_toolbar, style); + gtk_toolbar_set_tooltips( GTK_TOOLBAR(m_toolbar), !(style & wxTB_NO_TOOLTIPS) ); } void wxToolBar::SetWindowStyleFlag( long style ) @@ -382,13 +355,7 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase) { 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() ) { @@ -396,29 +363,19 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase) { 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.GetDepth() != 1, 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; + tool->m_image = gtk_image_new(); + tool->SetImage(bitmap); - 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 ); - - gtk_misc_set_alignment( GTK_MISC(tool_pixmap), 0.5, 0.5 ); - - tool->m_pixmap = tool_pixmap; + gtk_misc_set_alignment((GtkMisc*)tool->m_image, 0.5, 0.5); } } @@ -433,16 +390,18 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase) if ( tool->IsRadio() ) { - wxToolBarToolsList::compatibility_iterator node; - if ( pos ) node = m_tools.Item(pos - 1); + wxToolBarToolsList::compatibility_iterator node + = wxToolBarToolsList::compatibility_iterator(); + 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(); } @@ -452,7 +411,7 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase) // 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); } } @@ -468,27 +427,20 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase) ? NULL : (const char*) wxGTK_CONV( tool->GetShortHelp() ), "", // tooltip_private_text (?) - tool->m_pixmap, + tool->m_image, (GtkSignalFunc)gtk_toolbar_callback, (gpointer)tool, posGtk ); - if ( !tool->m_item ) - { - wxFAIL_MSG( _T("gtk_toolbar_insert_element() failed") ); - - return FALSE; - } + wxCHECK_MSG(tool->m_item != NULL, false, _T("gtk_toolbar_insert_element() failed")); - gtk_signal_connect( GTK_OBJECT(tool->m_item), - "enter_notify_event", - GTK_SIGNAL_FUNC(gtk_toolbar_tool_callback), - (gpointer)tool ); - gtk_signal_connect( GTK_OBJECT(tool->m_item), - "leave_notify_event", - GTK_SIGNAL_FUNC(gtk_toolbar_tool_callback), - (gpointer)tool ); + g_signal_connect (tool->m_item, "enter_notify_event", + G_CALLBACK (gtk_toolbar_tool_callback), + tool); + g_signal_connect (tool->m_item, "leave_notify_event", + G_CALLBACK (gtk_toolbar_tool_callback), + tool); } break; @@ -496,7 +448,7 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase) gtk_toolbar_insert_space( m_toolbar, posGtk ); // skip the rest - return TRUE; + return true; case wxTOOL_STYLE_CONTROL: gtk_toolbar_insert_widget( @@ -514,11 +466,12 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase) (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; @@ -532,10 +485,13 @@ bool wxToolBar::DoDeleteTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolBase) gtk_widget_destroy( tool->m_item ); break; - //case wxTOOL_STYLE_SEPARATOR: -- nothing to do + case wxTOOL_STYLE_SEPARATOR: + gtk_toolbar_remove_space( m_toolbar, pos ); + break; } - return TRUE; + InvalidateBestSize(); + return true; } // ---------------------------------------------------------------------------- @@ -559,22 +515,13 @@ void wxToolBar::DoToggleTool( wxToolBarToolBase *toolBase, bool toggle ) 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 ); + tool->SetImage(tool->GetBitmap()); - GdkBitmap *mask = bitmap.GetMask() ? bitmap.GetMask()->GetBitmap() - : (GdkBitmap *)NULL; + m_blockEvent = true; - gtk_pixmap_set( pixmap, bitmap.GetPixmap(), mask ); - } + gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(item), toggle ); - m_blockEvent = TRUE; - - gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(item), toggle ); - - m_blockEvent = FALSE; + m_blockEvent = false; } } @@ -603,11 +550,6 @@ void wxToolBar::SetMargins( int x, int y ) 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; } @@ -615,7 +557,7 @@ void wxToolBar::SetMargins( int x, int y ) void wxToolBar::SetToolSeparation( int separation ) { // FIXME: this function disappeared -#ifndef __WXGTK20__ +#if 0 gtk_toolbar_set_space_size( m_toolbar, separation ); #endif @@ -640,6 +582,9 @@ void wxToolBar::SetToolShortHelp( int id, const wxString& helpString ) void wxToolBar::OnInternalIdle() { + // Check if we have to show window now + if (GtkShowFromOnIdle()) return; + wxCursor cursor = m_cursor; if (g_globalCursor.Ok()) cursor = g_globalCursor; @@ -684,4 +629,14 @@ void wxToolBar::OnInternalIdle() UpdateWindowUI(wxUPDATE_UI_FROMIDLE); } + +// ---------------------------------------------------------------------------- + +// static +wxVisualAttributes +wxToolBar::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) +{ + return GetDefaultAttributesFromGTKWidget(gtk_toolbar_new); +} + #endif // wxUSE_TOOLBAR_NATIVE