diff options
| -rw-r--r-- | chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc | 8 | ||||
| -rw-r--r-- | chrome/browser/autocomplete/autocomplete_popup_view_gtk.h | 42 |
2 files changed, 17 insertions, 33 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc b/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc index 7b475d3..ffeff16 100644 --- a/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc +++ b/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc @@ -303,13 +303,13 @@ AutocompletePopupViewGtk::AutocompletePopupViewGtk( GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK); g_signal_connect(window_, "motion-notify-event", - G_CALLBACK(&HandleMotionThunk), this); + G_CALLBACK(HandleMotionThunk), this); g_signal_connect(window_, "button-press-event", - G_CALLBACK(&HandleButtonPressThunk), this); + G_CALLBACK(HandleButtonPressThunk), this); g_signal_connect(window_, "button-release-event", - G_CALLBACK(&HandleButtonReleaseThunk), this); + G_CALLBACK(HandleButtonReleaseThunk), this); g_signal_connect(window_, "expose-event", - G_CALLBACK(&HandleExposeThunk), this); + G_CALLBACK(HandleExposeThunk), this); registrar_.Add(this, NotificationType::BROWSER_THEME_CHANGED, diff --git a/chrome/browser/autocomplete/autocomplete_popup_view_gtk.h b/chrome/browser/autocomplete/autocomplete_popup_view_gtk.h index ea222e7..7152fa2 100644 --- a/chrome/browser/autocomplete/autocomplete_popup_view_gtk.h +++ b/chrome/browser/autocomplete/autocomplete_popup_view_gtk.h @@ -7,6 +7,7 @@ #pragma once #include <gtk/gtk.h> + #include <map> #include <string> @@ -16,6 +17,7 @@ #include "chrome/browser/autocomplete/autocomplete_popup_view.h" #include "content/common/notification_observer.h" #include "content/common/notification_registrar.h" +#include "ui/base/gtk/gtk_signal.h" #include "ui/gfx/font.h" #include "webkit/glue/window_open_disposition.h" @@ -75,35 +77,17 @@ class AutocompletePopupViewGtk : public AutocompletePopupView, GdkPixbuf* IconForMatch(const AutocompleteMatch& match, bool selected); - static gboolean HandleExposeThunk(GtkWidget* widget, GdkEventExpose* event, - gpointer userdata) { - return reinterpret_cast<AutocompletePopupViewGtk*>(userdata)-> - HandleExpose(widget, event); - } - gboolean HandleExpose(GtkWidget* widget, GdkEventExpose* event); - - static gboolean HandleMotionThunk(GtkWidget* widget, GdkEventMotion* event, - gpointer userdata) { - return reinterpret_cast<AutocompletePopupViewGtk*>(userdata)-> - HandleMotion(widget, event); - } - gboolean HandleMotion(GtkWidget* widget, GdkEventMotion* event); - - static gboolean HandleButtonPressThunk(GtkWidget* widget, - GdkEventButton* event, - gpointer userdata) { - return reinterpret_cast<AutocompletePopupViewGtk*>(userdata)-> - HandleButtonPress(widget, event); - } - gboolean HandleButtonPress(GtkWidget* widget, GdkEventButton* event); - - static gboolean HandleButtonReleaseThunk(GtkWidget* widget, - GdkEventButton* event, - gpointer userdata) { - return reinterpret_cast<AutocompletePopupViewGtk*>(userdata)-> - HandleButtonRelease(widget, event); - } - gboolean HandleButtonRelease(GtkWidget* widget, GdkEventButton* event); + CHROMEGTK_CALLBACK_1(AutocompletePopupViewGtk, gboolean, HandleMotion, + GdkEventMotion*); + + CHROMEGTK_CALLBACK_1(AutocompletePopupViewGtk, gboolean, HandleButtonPress, + GdkEventButton*); + + CHROMEGTK_CALLBACK_1(AutocompletePopupViewGtk, gboolean, HandleButtonRelease, + GdkEventButton*); + + CHROMEGTK_CALLBACK_1(AutocompletePopupViewGtk, gboolean, HandleExpose, + GdkEventExpose*); scoped_ptr<AutocompletePopupModel> model_; OmniboxView* omnibox_view_; |