summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--views/controls/combobox/native_combobox_gtk.cc9
-rw-r--r--views/controls/combobox/native_combobox_gtk.h4
-rw-r--r--views/widget/widget_gtk.cc2
3 files changed, 9 insertions, 6 deletions
diff --git a/views/controls/combobox/native_combobox_gtk.cc b/views/controls/combobox/native_combobox_gtk.cc
index 6e44fa701..3075cce 100644
--- a/views/controls/combobox/native_combobox_gtk.cc
+++ b/views/controls/combobox/native_combobox_gtk.cc
@@ -98,9 +98,6 @@ gfx::NativeView NativeComboboxGtk::GetTestingHandle() const {
return native_view();
}
-void NativeComboboxGtk::SelectionChanged() {
- combobox_->SelectionChanged();
-}
////////////////////////////////////////////////////////////////////////////////
// NativeComboboxGtk, NativeControlGtk overrides:
@@ -128,6 +125,12 @@ void NativeComboboxGtk::NativeControlCreated(GtkWidget* native_control) {
NativeControlGtk::NativeControlCreated(native_control);
}
+////////////////////////////////////////////////////////////////////////////////
+// NativeComboboxGtk, private:
+void NativeComboboxGtk::SelectionChanged() {
+ combobox_->SelectionChanged();
+}
+
// static
void NativeComboboxGtk::CallChanged(GtkWidget* widget,
NativeComboboxGtk* combo) {
diff --git a/views/controls/combobox/native_combobox_gtk.h b/views/controls/combobox/native_combobox_gtk.h
index c854367..9e754d2 100644
--- a/views/controls/combobox/native_combobox_gtk.h
+++ b/views/controls/combobox/native_combobox_gtk.h
@@ -33,10 +33,10 @@ class NativeComboboxGtk : public NativeControlGtk,
virtual void NativeControlCreated(GtkWidget* widget);
private:
- static void CallChanged(GtkWidget* widget, NativeComboboxGtk* combo);
-
void SelectionChanged();
+ static void CallChanged(GtkWidget* widget, NativeComboboxGtk* combo);
+
// The combobox we are bound to.
Combobox* combobox_;
diff --git a/views/widget/widget_gtk.cc b/views/widget/widget_gtk.cc
index 49720f3..e96543e 100644
--- a/views/widget/widget_gtk.cc
+++ b/views/widget/widget_gtk.cc
@@ -131,7 +131,7 @@ bool WidgetGtk::MakeTransparent() {
if (!gdk_screen_is_composited(gdk_screen_get_default())) {
// Transparency is only supported for compositing window managers.
- DLOG(WARNING) << "compsiting not supported";
+ DLOG(WARNING) << "compositing not supported";
return false;
}