From d3edf6d09a6eacf4db5427da9c4798b84f540cda Mon Sep 17 00:00:00 2001 From: johncoswell Date: Mon, 21 Apr 2008 23:01:01 +0000 Subject: [PATCH] Oops, this broke selecting a swatch, rolling back... --- src/dialogs/swatches.cpp | 41 ++++++++++++++++++++++------------------ 1 file 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(callback_data); - if ( item ) { - SPDesktop *desktop = SP_ACTIVE_DESKTOP; - if ( desktop ) { - desktop->messageStack()->flash(Inkscape::NORMAL_MESSAGE, g_strconcat( - _("Swatch info: "), - item->def.descr.c_str(), - _(""), - NULL - )); - } - } -} +// static void handleEnterNotify( GtkWidget* widget, GdkEventCrossing* event, gpointer callback_data ) { +// ColorItem* item = reinterpret_cast(callback_data); +// if ( item ) { +// SPDesktop *desktop = SP_ACTIVE_DESKTOP; +// if ( desktop ) { +// desktop->messageStack()->flash(Inkscape::NORMAL_MESSAGE, g_strconcat( +// _("Swatch info: "), +// item->def.descr.c_str(), +// _(""), +// 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", -- 2.30.2