- Improvement for the radio/check buttons size patch.

2 files changed, 2 insertions, 6 deletions

diff --git a/dw/fltkui.cc b/dw/fltkui.cc
index 7b867797..9255d7d2 100644
--- a/dw/fltkui.cc
+++ b/dw/fltkui.cc
@@ -678,7 +678,8 @@ template <class I>
 template <class I>
 void FltkToggleButtonResource<I>::sizeRequest (core::Requisition *requisition)
 {
-   FltkFont *font = getFont();
+   FltkFont *font = (FltkFont *)
+      (this->FltkResource::style ? this->FltkResource::style->font : NULL);
 
    if (font) {
       ::fltk::setfont(font->font, font->size);
diff --git a/dw/fltkui.hh b/dw/fltkui.hh
index a027a41b..4de99d27 100644
--- a/dw/fltkui.hh
+++ b/dw/fltkui.hh
@@ -350,8 +350,6 @@ private:
 
 protected:
    virtual ::fltk::Button *createNewButton (core::Allocation *allocation) = 0;
-   // TODO: maybe getFont() is not the best way to do it...
-   virtual FltkFont *getFont() = 0;
    ::fltk::Widget *createNewWidget (core::Allocation *allocation);
    
 public:
@@ -369,8 +367,6 @@ public:
 class FltkCheckButtonResource:
    public FltkToggleButtonResource <dw::core::ui::CheckButtonResource>
 {
-private:
-   FltkFont *getFont() {return style ? (FltkFont *)style->font : NULL;}
 protected:
    ::fltk::Button *createNewButton (core::Allocation *allocation);
 
@@ -431,7 +427,6 @@ private:
    Group *group;
 
    static void widgetCallback (::fltk::Widget *widget, void *data);
-   FltkFont *getFont() {return style ? (FltkFont *)style->font : NULL;}
    void buttonClicked ();
 
 protected: