summaryrefslogtreecommitdiffstats
path: root/views/controls
diff options
context:
space:
mode:
Diffstat (limited to 'views/controls')
-rw-r--r--views/controls/button/native_button_gtk.cc5
-rw-r--r--views/controls/textfield/native_textfield_gtk.cc3
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 0632b21..d1fb0ef4 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() {