diff options
| author | John Bintz <me@johnbintz.com> | 2008-04-21 23:01:01 +0000 |
|---|---|---|
| committer | johncoswell <johncoswell@users.sourceforge.net> | 2008-04-21 23:01:01 +0000 |
| commit | 9a870a056b1cb884952f2c97ce6ca9c08071b242 (patch) | |
| tree | 5fdaedd23f5727147a7b9a2da908f02f27b33a5e /src/dialogs/swatches.cpp | |
| parent | r19076@shi: ted | 2008-04-21 15:42:45 -0700 (diff) | |
| download | inkscape-9a870a056b1cb884952f2c97ce6ca9c08071b242.tar.gz inkscape-9a870a056b1cb884952f2c97ce6ca9c08071b242.zip | |
Oops, this broke selecting a swatch, rolling back...
(bzr r5484)
Diffstat (limited to 'src/dialogs/swatches.cpp')
| -rw-r--r-- | src/dialogs/swatches.cpp | 41 |
1 files changed, 23 insertions, 18 deletions
diff --git a/src/dialogs/swatches.cpp b/src/dialogs/swatches.cpp index 72a85a43b..f464d548a 100644 --- a/src/dialogs/swatches.cpp +++ b/src/dialogs/swatches.cpp @@ -240,20 +240,20 @@ static void handleSecondaryClick( GtkWidget* widget, gint arg1, gpointer callbac } } -static void handleEnterNotify( GtkWidget* widget, GdkEventCrossing* event, gpointer callback_data ) { - ColorItem* item = reinterpret_cast<ColorItem*>(callback_data); - if ( item ) { - SPDesktop *desktop = SP_ACTIVE_DESKTOP; - if ( desktop ) { - desktop->messageStack()->flash(Inkscape::NORMAL_MESSAGE, g_strconcat( - _("Swatch info: <b>"), - item->def.descr.c_str(), - _("</b>"), - NULL - )); - } - } -} +// static void handleEnterNotify( GtkWidget* widget, GdkEventCrossing* event, gpointer callback_data ) { +// ColorItem* item = reinterpret_cast<ColorItem*>(callback_data); +// if ( item ) { +// SPDesktop *desktop = SP_ACTIVE_DESKTOP; +// if ( desktop ) { +// desktop->messageStack()->flash(Inkscape::NORMAL_MESSAGE, g_strconcat( +// _("Swatch info: <b>"), +// item->def.descr.c_str(), +// _("</b>"), +// NULL +// )); +// } +// } +// } static GtkWidget* popupMenu = 0; static ColorItem* bounceTarget = 0; @@ -604,10 +604,15 @@ Gtk::Widget* ColorItem::getPreview(PreviewStyle style, ViewType view, ::PreviewS G_CALLBACK(dragBegin), this ); - g_signal_connect( G_OBJECT(newBlot->gobj()), - "enter-notify-event", - G_CALLBACK(handleEnterNotify), - this); +// g_signal_connect( G_OBJECT(newBlot->gobj()), +// "enter-notify-event", +// G_CALLBACK(handleEnterNotify), +// this); + +// g_signal_connect( G_OBJECT(newBlot->gobj()), +// "enter-notify-event", +// G_CALLBACK(handleEnterNotify), +// this); // g_signal_connect( G_OBJECT(newBlot->gobj()), // "drag-drop", |