diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-12 19:28:50 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-12 19:28:50 +0000 |
| commit | 9e2565ee1b21c0ae681c1ead5570a327cb59501e (patch) | |
| tree | 410dcbeeaf7b50d144ecade35f79cf322ebc3f89 /chrome/browser/gtk/options/languages_page_gtk.h | |
| parent | 42808d199da05deda01d67a85a5f67b6ed3b31ac (diff) | |
| download | chromium_src-9e2565ee1b21c0ae681c1ead5570a327cb59501e.zip chromium_src-9e2565ee1b21c0ae681c1ead5570a327cb59501e.tar.gz chromium_src-9e2565ee1b21c0ae681c1ead5570a327cb59501e.tar.bz2 | |
Fix the rest of the gtk/options directory to use new callback macros.
Problematically, the callback macros don't cover the case where the GObject* isn't a GtkWidget* D:
BUG=None
TEST=compile
Review URL: http://codereview.chromium.org/857006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41458 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk/options/languages_page_gtk.h')
| -rw-r--r-- | chrome/browser/gtk/options/languages_page_gtk.h | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/chrome/browser/gtk/options/languages_page_gtk.h b/chrome/browser/gtk/options/languages_page_gtk.h index dc44006..b7140ae 100644 --- a/chrome/browser/gtk/options/languages_page_gtk.h +++ b/chrome/browser/gtk/options/languages_page_gtk.h @@ -16,6 +16,7 @@ #include <string> +#include "app/gtk_signal.h" #include "base/scoped_ptr.h" #include "chrome/browser/gtk/gtk_tree.h" #include "chrome/browser/pref_member.h" @@ -62,25 +63,18 @@ class LanguagesPageGtk virtual void NotifyPrefChanged(const std::wstring* pref_name); // Callbacks for accept languages widgets. - static void OnSelectionChanged(GtkTreeSelection *selection, + static void OnSelectionChanged(GtkTreeSelection* selection, LanguagesPageGtk* languages_page); - static void OnAddButtonClicked(GtkButton* button, - LanguagesPageGtk* languages_page); - static void OnRemoveButtonClicked(GtkButton* button, - LanguagesPageGtk* languages_page); - static void OnMoveUpButtonClicked(GtkButton* button, - LanguagesPageGtk* languages_page); - static void OnMoveDownButtonClicked(GtkButton* button, - LanguagesPageGtk* languages_page); + CHROMEGTK_CALLBACK_0(LanguagesPageGtk, void, OnAddButtonClicked); + CHROMEGTK_CALLBACK_0(LanguagesPageGtk, void, OnRemoveButtonClicked); + CHROMEGTK_CALLBACK_0(LanguagesPageGtk, void, OnMoveUpButtonClicked); + CHROMEGTK_CALLBACK_0(LanguagesPageGtk, void, OnMoveDownButtonClicked); // Callbacks for spellchecker option widgets. - static void OnEnableSpellCheckingToggled(GtkToggleButton* toggle_button, - LanguagesPageGtk* languages_page); - static void OnEnableAutoSpellCheckingToggled( - GtkToggleButton* toggle_button, LanguagesPageGtk* languages_page); - static void OnDictionaryLanguageChangedThunk( - GtkComboBox* combo_box, LanguagesPageGtk* languages_page); - void OnDictionaryLanguageChanged(); + CHROMEGTK_CALLBACK_0(LanguagesPageGtk, void, OnEnableSpellCheckingToggled); + CHROMEGTK_CALLBACK_0(LanguagesPageGtk, void, + OnEnableAutoSpellCheckingToggled); + CHROMEGTK_CALLBACK_0(LanguagesPageGtk, void, OnDictionaryLanguageChanged); // The accept languages widgets. GtkListStore* language_order_store_; |