From 617353265e4dc4e0280b565f2cd9e7749ce52bfd Mon Sep 17 00:00:00 2001 From: Jed Barber Date: Tue, 17 Apr 2018 16:00:26 +1000 Subject: More polishing --- src/c_fl_clock_output.cpp | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) (limited to 'src/c_fl_clock_output.cpp') diff --git a/src/c_fl_clock_output.cpp b/src/c_fl_clock_output.cpp index 62f5e1b..b427068 100644 --- a/src/c_fl_clock_output.cpp +++ b/src/c_fl_clock_output.cpp @@ -14,6 +14,7 @@ class My_Clock_Output : public Fl_Clock_Output { friend void fl_clock_output_draw(CLOCK_OUTPUT c); friend void clock_output_set_handle_hook(CLOCK_OUTPUT c, void * h); friend int fl_clock_output_handle(CLOCK_OUTPUT c, int e); + friend void fl_clock_output_draw2(CLOCK_OUTPUT c, int x, int y, int w, int h); protected: void draw(); void real_draw(); @@ -71,27 +72,35 @@ void free_fl_clock_output(CLOCK_OUTPUT c) { int fl_clock_output_get_hour(CLOCK_OUTPUT c) { - return reinterpret_cast(c)->hour(); + return reinterpret_cast(c)->Fl_Clock_Output::hour(); } int fl_clock_output_get_minute(CLOCK_OUTPUT c) { - return reinterpret_cast(c)->minute(); + return reinterpret_cast(c)->Fl_Clock_Output::minute(); } int fl_clock_output_get_second(CLOCK_OUTPUT c) { - return reinterpret_cast(c)->second(); + return reinterpret_cast(c)->Fl_Clock_Output::second(); } ulong fl_clock_output_get_value(CLOCK_OUTPUT c) { - return reinterpret_cast(c)->value(); + return reinterpret_cast(c)->Fl_Clock_Output::value(); } void fl_clock_output_set_value(CLOCK_OUTPUT c, ulong v) { - reinterpret_cast(c)->value(v); + reinterpret_cast(c)->Fl_Clock_Output::value(v); } void fl_clock_output_set_value2(CLOCK_OUTPUT c, int h, int m, int s) { - reinterpret_cast(c)->value(h,m,s); + reinterpret_cast(c)->Fl_Clock_Output::value(h,m,s); } + + + +void fl_clock_output_draw2(CLOCK_OUTPUT c, int x, int y, int w, int h) { + reinterpret_cast(c)->Fl_Clock_Output::draw(x,y,w,h); +} + + -- cgit