X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b85229d15bb4a02a2f3058718a1cf5ed99433020..08f57d2125e7cf8b602fb7505d7c5dbbdd6b664c:/src/gtk/tbargtk.cpp diff --git a/src/gtk/tbargtk.cpp b/src/gtk/tbargtk.cpp index 458e5f1299..dd18e1d3a9 100644 --- a/src/gtk/tbargtk.cpp +++ b/src/gtk/tbargtk.cpp @@ -52,8 +52,7 @@ extern wxCursor g_globalCursor; static void GetGtkStyle(long style, GtkOrientation *orient, GtkToolbarStyle *gtkStyle) { - *orient = style & wxTB_VERTICAL ? GTK_ORIENTATION_VERTICAL - : GTK_ORIENTATION_HORIZONTAL; + *orient = ( style & wxTB_LEFT || style & wxTB_RIGHT ) ? GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL; if ( style & wxTB_TEXT ) @@ -124,21 +123,17 @@ public: } } - void SetPixmap(const wxBitmap& bitmap) + void SetImage(const wxBitmap& bitmap) { if (bitmap.Ok()) { - GdkBitmap *mask = bitmap.GetMask() ? bitmap.GetMask()->GetBitmap() - : (GdkBitmap *)NULL; - if (bitmap.HasPixbuf()) - gtk_image_set_from_pixbuf( GTK_IMAGE(m_pixmap), bitmap.GetPixbuf() ); - else - gtk_pixmap_set( GTK_PIXMAP(m_pixmap), bitmap.GetPixmap(), mask ); + // 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(); @@ -176,7 +171,7 @@ static void gtk_toolbar_callback( GtkWidget *WXUNUSED(widget), { tool->Toggle(); - tool->SetPixmap(tool->GetBitmap()); + tool->SetImage(tool->GetBitmap()); if ( tool->IsRadio() && !tool->IsToggled() ) { @@ -190,7 +185,7 @@ static void gtk_toolbar_callback( GtkWidget *WXUNUSED(widget), // revert back tool->Toggle(); - tool->SetPixmap(tool->GetBitmap()); + tool->SetImage(tool->GetBitmap()); } } } @@ -204,7 +199,7 @@ 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; @@ -237,7 +232,7 @@ static void wxInsertChildInToolBar( wxToolBar* WXUNUSED(parent), void wxToolBarTool::Init() { m_item = - m_pixmap = (GtkWidget *)NULL; + m_image = NULL; } wxToolBarToolBase *wxToolBar::CreateTool(int id, @@ -292,6 +287,8 @@ bool wxToolBar::Create( wxWindow *parent, return false; } + FixupStyle(); + m_toolbar = GTK_TOOLBAR( gtk_toolbar_new() ); GtkSetStyle(); @@ -331,6 +328,11 @@ bool wxToolBar::Create( wxWindow *parent, return true; } +GdkWindow *wxToolBar::GTKGetWindow(wxArrayGdkWindows& windows) const +{ + return GTK_WIDGET(m_toolbar)->window; +} + void wxToolBar::GtkSetStyle() { GtkOrientation orient; @@ -339,7 +341,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) ); + gtk_toolbar_set_tooltips(m_toolbar, !(style & wxTB_NO_TOOLTIPS)); } void wxToolBar::SetWindowStyleFlag( long style ) @@ -352,9 +354,7 @@ void wxToolBar::SetWindowStyleFlag( long style ) bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase) { - wxToolBarTool *tool = (wxToolBarTool *)toolBase; - - size_t posGtk = pos; + wxToolBarTool* tool = wx_static_cast(wxToolBarTool*, toolBase); if ( tool->IsButton() ) { @@ -365,39 +365,15 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase) wxCHECK_MSG( bitmap.Ok(), false, wxT("invalid bitmap for wxToolBar icon") ); - wxCHECK_MSG( bitmap.GetDepth() != 1, false, - wxT("wxToolBar doesn't support GdkBitmap") ); - - wxCHECK_MSG( bitmap.GetPixmap() != NULL, false, - wxT("wxToolBar::Add needs a wxBitmap") ); - - GtkWidget *tool_pixmap = (GtkWidget *)NULL; - - - if (bitmap.HasPixbuf()) - { - tool_pixmap = gtk_image_new(); - tool->m_pixmap = tool_pixmap; - tool->SetPixmap(bitmap); - } - else - { - 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_image = gtk_image_new(); + tool->SetImage(bitmap); - tool->m_pixmap = tool_pixmap; + gtk_misc_set_alignment((GtkMisc*)tool->m_image, 0.5, 0.5); } } + const int posGtk = int(pos); + switch ( tool->GetStyle() ) { case wxTOOL_STYLE_BUTTON: @@ -446,18 +422,13 @@ 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")); g_signal_connect (tool->m_item, "enter_notify_event", G_CALLBACK (gtk_toolbar_tool_callback), @@ -497,7 +468,7 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase) bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *toolBase) { - wxToolBarTool *tool = (wxToolBarTool *)toolBase; + wxToolBarTool* tool = wx_static_cast(wxToolBarTool*, toolBase); switch ( tool->GetStyle() ) { @@ -524,7 +495,7 @@ bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *toolBase) void wxToolBar::DoEnableTool(wxToolBarToolBase *toolBase, bool enable) { - wxToolBarTool *tool = (wxToolBarTool *)toolBase; + wxToolBarTool* tool = wx_static_cast(wxToolBarTool*, toolBase); if (tool->m_item) { @@ -534,12 +505,12 @@ void wxToolBar::DoEnableTool(wxToolBarToolBase *toolBase, bool enable) void wxToolBar::DoToggleTool( wxToolBarToolBase *toolBase, bool toggle ) { - wxToolBarTool *tool = (wxToolBarTool *)toolBase; + wxToolBarTool* tool = wx_static_cast(wxToolBarTool*, toolBase); GtkWidget *item = tool->m_item; if ( item && GTK_IS_TOGGLE_BUTTON(item) ) { - tool->SetPixmap(tool->GetBitmap()); + tool->SetImage(tool->GetBitmap()); m_blockEvent = true; @@ -590,7 +561,7 @@ void wxToolBar::SetToolSeparation( int separation ) void wxToolBar::SetToolShortHelp( int id, const wxString& helpString ) { - wxToolBarTool *tool = (wxToolBarTool *)FindById(id); + wxToolBarTool* tool = wx_static_cast(wxToolBarTool*, FindById(id)); if ( tool ) { @@ -606,6 +577,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;