diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-12 20:01:47 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-12 20:01:47 +0000 |
| commit | 179484d80ce158dabeaebe11fcb4dd6ce5280487 (patch) | |
| tree | cc97bc1fdafa2a342fff76813034afa1b7c45dbc /chrome/browser/gtk/options/languages_page_gtk.h | |
| parent | 97d052416394e439380cb932dfaed867e9db650b (diff) | |
| download | chromium_src-179484d80ce158dabeaebe11fcb4dd6ce5280487.zip chromium_src-179484d80ce158dabeaebe11fcb4dd6ce5280487.tar.gz chromium_src-179484d80ce158dabeaebe11fcb4dd6ce5280487.tar.bz2 | |
Revert: r41458 | estade@chromium.org | 2010-03-12 11:28:50 -0800 (Fri, 12 Mar 2010) | 8 lines
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
it's breaking unit tests
Review URL: http://codereview.chromium.org/886005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41465 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, 16 insertions, 10 deletions
diff --git a/chrome/browser/gtk/options/languages_page_gtk.h b/chrome/browser/gtk/options/languages_page_gtk.h index b7140ae..dc44006 100644 --- a/chrome/browser/gtk/options/languages_page_gtk.h +++ b/chrome/browser/gtk/options/languages_page_gtk.h @@ -16,7 +16,6 @@ #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" @@ -63,18 +62,25 @@ 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); - CHROMEGTK_CALLBACK_0(LanguagesPageGtk, void, OnAddButtonClicked); - CHROMEGTK_CALLBACK_0(LanguagesPageGtk, void, OnRemoveButtonClicked); - CHROMEGTK_CALLBACK_0(LanguagesPageGtk, void, OnMoveUpButtonClicked); - CHROMEGTK_CALLBACK_0(LanguagesPageGtk, void, OnMoveDownButtonClicked); + 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); // Callbacks for spellchecker option widgets. - CHROMEGTK_CALLBACK_0(LanguagesPageGtk, void, OnEnableSpellCheckingToggled); - CHROMEGTK_CALLBACK_0(LanguagesPageGtk, void, - OnEnableAutoSpellCheckingToggled); - CHROMEGTK_CALLBACK_0(LanguagesPageGtk, void, OnDictionaryLanguageChanged); + 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(); // The accept languages widgets. GtkListStore* language_order_store_; |