diff options
| author | corvid <corvid@lavabit.com> | 2011-01-29 03:03:03 +0000 |
|---|---|---|
| committer | corvid <corvid@lavabit.com> | 2011-01-29 03:03:03 +0000 |
| commit | 8fa799a5b00ac6a4dd5ffc064a1fb5ef776d451e (patch) | |
| tree | 47a05f55fd1f963d4519405223bfa9a148bfa686 /dw/fltkui.cc | |
| parent | f48b62538ce6b1d1108b268067b9fda8cf34a6ab (diff) | |
uncomment the font calls in fltkui
Diffstat (limited to 'dw/fltkui.cc')
| -rw-r--r-- | dw/fltkui.cc | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/dw/fltkui.cc b/dw/fltkui.cc index 974bb240..3547d7a3 100644 --- a/dw/fltkui.cc +++ b/dw/fltkui.cc @@ -254,10 +254,7 @@ void FltkLabelButtonResource::sizeRequest (core::Requisition *requisition) { if (style) { FltkFont *font = (FltkFont*)style->font; -#if 0 -PORT1.3 - ::fltk::setfont(font->font,font->size); -#endif + fl_font(font->font,font->size); requisition->width = (int)fl_width (label, strlen (label)) + 2 * RELIEF_X_THICKNESS; @@ -488,10 +485,7 @@ void FltkEntryResource::sizeRequest (core::Requisition *requisition) { if (displayed() && style) { FltkFont *font = (FltkFont*)style->font; -#if 0 -PORT1.3 - ::fltk::setfont(font->font,font->size); -#endif + fl_font(font->font,font->size); requisition->width = (int)fl_width ('n') * (maxLength == UNLIMITED_MAX_LENGTH ? 10 : maxLength) @@ -589,10 +583,7 @@ void FltkMultiLineTextResource::sizeRequest (core::Requisition *requisition) { if (style) { FltkFont *font = (FltkFont*)style->font; -#if 0 -PORT1.3 - ::fltk::setfont(font->font,font->size); -#endif + fl_font(font->font,font->size); requisition->width = (int)fl_width ('n') * numCols + 2 * RELIEF_X_THICKNESS; requisition->ascent = @@ -662,10 +653,7 @@ void FltkToggleButtonResource<I>::sizeRequest (core::Requisition *requisition) (this->FltkResource::style ? this->FltkResource::style->font : NULL); if (font) { -#if 0 -PORT1.3 - ::fltk::setfont(font->font, font->size); -#endif + fl_font(font->font, font->size); requisition->width = font->ascent + font->descent + 2*RELIEF_X_THICKNESS; requisition->ascent = font->ascent + RELIEF_Y_THICKNESS; requisition->descent = font->descent + RELIEF_Y_THICKNESS; |