Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

New way to grey out disabled toolbar icons.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2611 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1999-06-01 14:29:59 +00:00
parent 05060eeb83
commit f7ac40d158
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gtk/tbargtk.cpp
View File

@@ -74,10 +74,11 @@ static gint gtk_toolbar_enter_callback( GtkWidget *WXUNUSED(widget),
if (g_blockEventsOnDrag) return TRUE; if (g_blockEventsOnDrag) return TRUE;
/* we grey-out the tip text of disabled tool */
wxToolBar *tb = tool->m_owner; wxToolBar *tb = tool->m_owner;
/* we grey-out the tip text of disabled tool */
#if 0
if (tool->m_enabled) if (tool->m_enabled)
{ {
if (tb->m_fg->red != 0) if (tb->m_fg->red != 0)
@@ -121,6 +122,7 @@ static gint gtk_toolbar_enter_callback( GtkWidget *WXUNUSED(widget),
#endif #endif
} }
} }
#endif
/* emit the event */ /* emit the event */
@@ -289,7 +291,8 @@ wxToolBarTool *wxToolBar::AddTool( int toolIndex, const wxBitmap& bitmap,
mask = bitmap.GetMask()->GetBitmap(); mask = bitmap.GetMask()->GetBitmap();
tool_pixmap = gtk_pixmap_new( pixmap, mask ); 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 ); gtk_misc_set_alignment( GTK_MISC(tool_pixmap), 0.5, 0.5 );
wxToolBarTool *tool = new wxToolBarTool( this, toolIndex, bitmap, pushedBitmap, wxToolBarTool *tool = new wxToolBarTool( this, toolIndex, bitmap, pushedBitmap,
@@ -371,11 +374,10 @@ void wxToolBar::EnableTool(int toolIndex, bool enable)
tool->m_enabled = enable; tool->m_enabled = enable;
/* we don't disable the tools for now as the bitmaps don't get /* we don't disable the tools for now as the bitmaps don't get
greyed anyway and this also disables tooltips greyed anyway and this also disables tooltips */
if (tool->m_item) if (tool->m_item)
gtk_widget_set_sensitive( tool->m_item, enable ); gtk_widget_set_sensitive( tool->m_item, enable );
*/
return; return;
} }

10
src/gtk1/tbargtk.cpp
View File

@@ -74,10 +74,11 @@ static gint gtk_toolbar_enter_callback( GtkWidget *WXUNUSED(widget),
if (g_blockEventsOnDrag) return TRUE; if (g_blockEventsOnDrag) return TRUE;
/* we grey-out the tip text of disabled tool */
wxToolBar *tb = tool->m_owner; wxToolBar *tb = tool->m_owner;
/* we grey-out the tip text of disabled tool */
#if 0
if (tool->m_enabled) if (tool->m_enabled)
{ {
if (tb->m_fg->red != 0) if (tb->m_fg->red != 0)
@@ -121,6 +122,7 @@ static gint gtk_toolbar_enter_callback( GtkWidget *WXUNUSED(widget),
#endif #endif
} }
} }
#endif
/* emit the event */ /* emit the event */
@@ -289,7 +291,8 @@ wxToolBarTool *wxToolBar::AddTool( int toolIndex, const wxBitmap& bitmap,
mask = bitmap.GetMask()->GetBitmap(); mask = bitmap.GetMask()->GetBitmap();
tool_pixmap = gtk_pixmap_new( pixmap, mask ); 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 ); gtk_misc_set_alignment( GTK_MISC(tool_pixmap), 0.5, 0.5 );
wxToolBarTool *tool = new wxToolBarTool( this, toolIndex, bitmap, pushedBitmap, wxToolBarTool *tool = new wxToolBarTool( this, toolIndex, bitmap, pushedBitmap,
@@ -371,11 +374,10 @@ void wxToolBar::EnableTool(int toolIndex, bool enable)
tool->m_enabled = enable; tool->m_enabled = enable;
/* we don't disable the tools for now as the bitmaps don't get /* we don't disable the tools for now as the bitmaps don't get
greyed anyway and this also disables tooltips greyed anyway and this also disables tooltips */
if (tool->m_item) if (tool->m_item)
gtk_widget_set_sensitive( tool->m_item, enable ); gtk_widget_set_sensitive( tool->m_item, enable );
*/
return; return;
} }