diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-11 22:16:00 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-11 22:16:00 +0000 |
| commit | 58b1db1b7575bc4de4a31605eeacb0ed298cca02 (patch) | |
| tree | 5418b2074a6281bdfc2dc8cd4ceb905f7616a520 /views/controls | |
| parent | 26012f91aa8cb47d845d68af6afdcec483e92754 (diff) | |
| download | chromium_src-58b1db1b7575bc4de4a31605eeacb0ed298cca02.zip chromium_src-58b1db1b7575bc4de4a31605eeacb0ed298cca02.tar.gz chromium_src-58b1db1b7575bc4de4a31605eeacb0ed298cca02.tar.bz2 | |
Reverts r26015. It caused a startup regression:(
BUG=20823
TEST=none
TBR=agl
Review URL: http://codereview.chromium.org/203041
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26030 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls')
| -rw-r--r-- | views/controls/button/native_button_gtk.cc | 5 | ||||
| -rw-r--r-- | views/controls/textfield/native_textfield_gtk.cc | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/views/controls/button/native_button_gtk.cc b/views/controls/button/native_button_gtk.cc index fd89da2..c5f0f1a 100644 --- a/views/controls/button/native_button_gtk.cc +++ b/views/controls/button/native_button_gtk.cc @@ -41,8 +41,11 @@ void NativeButtonGtk::UpdateFont() { if (!native_view()) return; + NOTIMPLEMENTED(); preferred_size_ = gfx::Size(); - gtk_widget_modify_font(native_view(), native_button_->font().nativeFont()); + // SendMessage(GetHWND(), WM_SETFONT, + // reinterpret_cast<WPARAM>(native_button_->font().hfont()), + // FALSE); } void NativeButtonGtk::UpdateEnabled() { diff --git a/views/controls/textfield/native_textfield_gtk.cc b/views/controls/textfield/native_textfield_gtk.cc index 34c4a1f..ef7a67d 100644 --- a/views/controls/textfield/native_textfield_gtk.cc +++ b/views/controls/textfield/native_textfield_gtk.cc @@ -105,7 +105,8 @@ void NativeTextfieldGtk::UpdateReadOnly() { void NativeTextfieldGtk::UpdateFont() { if (!native_view()) return; - gtk_widget_modify_font(native_view(), textfield_->font().nativeFont()); + gtk_widget_modify_font(native_view(), + gfx::Font::PangoFontFromGfxFont(textfield_->font())); } void NativeTextfieldGtk::UpdateEnabled() { |