diff options
Diffstat (limited to 'src')
133 files changed, 1613 insertions, 1659 deletions
@@ -8,8 +8,6 @@ #define FL_GUARD - - extern "C" size_t c_pointer_size(); @@ -39,3 +37,4 @@ extern "C" int fl_run(); #endif + diff --git a/src/c_fl_adjuster.cpp b/src/c_fl_adjuster.cpp index 1b9db8e..4cd2b70 100644 --- a/src/c_fl_adjuster.cpp +++ b/src/c_fl_adjuster.cpp @@ -60,33 +60,33 @@ ADJUSTER new_fl_adjuster(int x, int y, int w, int h, char* label) { } void free_fl_adjuster(ADJUSTER a) { - delete reinterpret_cast<My_Adjuster*>(a); + delete static_cast<My_Adjuster*>(a); } int fl_adjuster_is_soft(ADJUSTER a) { - return reinterpret_cast<Fl_Adjuster*>(a)->soft(); + return static_cast<Fl_Adjuster*>(a)->soft(); } void fl_adjuster_set_soft(ADJUSTER a, int t) { - reinterpret_cast<Fl_Adjuster*>(a)->soft(t); + static_cast<Fl_Adjuster*>(a)->soft(t); } void fl_adjuster_value_damage(ADJUSTER a) { - (reinterpret_cast<Fl_Adjuster*>(a)->*(&Friend_Adjuster::value_damage))(); + (static_cast<Fl_Adjuster*>(a)->*(&Friend_Adjuster::value_damage))(); } void fl_adjuster_draw(ADJUSTER a) { - reinterpret_cast<My_Adjuster*>(a)->Fl_Adjuster::draw(); + static_cast<My_Adjuster*>(a)->Fl_Adjuster::draw(); } int fl_adjuster_handle(ADJUSTER a, int e) { - return reinterpret_cast<My_Adjuster*>(a)->Fl_Adjuster::handle(e); + return static_cast<My_Adjuster*>(a)->Fl_Adjuster::handle(e); } diff --git a/src/c_fl_ask.h b/src/c_fl_ask.h index c1845b2..f68bc85 100644 --- a/src/c_fl_ask.h +++ b/src/c_fl_ask.h @@ -47,3 +47,4 @@ extern "C" void fl_ask_message_title_default(const char * t); #endif + diff --git a/src/c_fl_bitmap.cpp b/src/c_fl_bitmap.cpp index 00cb665..01077b2 100644 --- a/src/c_fl_bitmap.cpp +++ b/src/c_fl_bitmap.cpp @@ -11,21 +11,21 @@ BITMAP new_fl_bitmap(void *data, int w, int h) { - Fl_Bitmap *b = new Fl_Bitmap(reinterpret_cast<uchar*>(data), w, h); + Fl_Bitmap *b = new Fl_Bitmap(static_cast<uchar*>(data), w, h); return b; } void free_fl_bitmap(BITMAP b) { - delete reinterpret_cast<Fl_Bitmap*>(b); + delete static_cast<Fl_Bitmap*>(b); } BITMAP fl_bitmap_copy(BITMAP b, int w, int h) { // virtual so disable dispatch - return reinterpret_cast<Fl_Bitmap*>(b)->Fl_Bitmap::copy(w, h); + return static_cast<Fl_Bitmap*>(b)->Fl_Bitmap::copy(w, h); } BITMAP fl_bitmap_copy2(BITMAP b) { - return reinterpret_cast<Fl_Bitmap*>(b)->copy(); + return static_cast<Fl_Bitmap*>(b)->copy(); } @@ -33,18 +33,19 @@ BITMAP fl_bitmap_copy2(BITMAP b) { void fl_bitmap_uncache(BITMAP b) { // virtual so disable dispatch - reinterpret_cast<Fl_Bitmap*>(b)->Fl_Bitmap::uncache(); + static_cast<Fl_Bitmap*>(b)->Fl_Bitmap::uncache(); } void fl_bitmap_draw2(BITMAP b, int x, int y) { - reinterpret_cast<Fl_Bitmap*>(b)->draw(x, y); + static_cast<Fl_Bitmap*>(b)->draw(x, y); } void fl_bitmap_draw(BITMAP b, int x, int y, int w, int h, int cx, int cy) { // virtual so disable dispatch - reinterpret_cast<Fl_Bitmap*>(b)->Fl_Bitmap::draw(x, y, w, h, cx, cy); + static_cast<Fl_Bitmap*>(b)->Fl_Bitmap::draw(x, y, w, h, cx, cy); } + diff --git a/src/c_fl_bitmap.h b/src/c_fl_bitmap.h index a7b7999..f5f6e15 100644 --- a/src/c_fl_bitmap.h +++ b/src/c_fl_bitmap.h @@ -8,13 +8,9 @@ #define FL_BITMAP_GUARD - - typedef void* BITMAP; - - extern "C" BITMAP new_fl_bitmap(void *data, int w, int h); extern "C" void free_fl_bitmap(BITMAP b); extern "C" BITMAP fl_bitmap_copy(BITMAP b, int w, int h); @@ -30,3 +26,4 @@ extern "C" void fl_bitmap_draw(BITMAP b, int x, int y, int w, int h, int cx, int #endif + diff --git a/src/c_fl_bmp_image.cpp b/src/c_fl_bmp_image.cpp index ee39966..f068b8f 100644 --- a/src/c_fl_bmp_image.cpp +++ b/src/c_fl_bmp_image.cpp @@ -8,12 +8,15 @@ #include "c_fl_bmp_image.h" -BMP_IMAGE new_fl_bmp_image(const char * f) { + + +BMPIMAGE new_fl_bmp_image(const char * f) { Fl_BMP_Image *b = new Fl_BMP_Image(f); return b; } -void free_fl_bmp_image(BMP_IMAGE b) { - delete reinterpret_cast<Fl_BMP_Image*>(b); +void free_fl_bmp_image(BMPIMAGE b) { + delete static_cast<Fl_BMP_Image*>(b); } + diff --git a/src/c_fl_bmp_image.h b/src/c_fl_bmp_image.h index 9dd48bd..e857fb7 100644 --- a/src/c_fl_bmp_image.h +++ b/src/c_fl_bmp_image.h @@ -8,16 +8,13 @@ #define FL_BMP_IMAGE_GUARD +typedef void* BMPIMAGE; -typedef void* BMP_IMAGE; - - - - -extern "C" BMP_IMAGE new_fl_bmp_image(const char * f); -extern "C" void free_fl_bmp_image(BMP_IMAGE b); +extern "C" BMPIMAGE new_fl_bmp_image(const char * f); +extern "C" void free_fl_bmp_image(BMPIMAGE b); #endif + diff --git a/src/c_fl_box.cpp b/src/c_fl_box.cpp index 67b4e0b..e9c170d 100644 --- a/src/c_fl_box.cpp +++ b/src/c_fl_box.cpp @@ -55,18 +55,18 @@ BOX new_fl_box2(int k, int x, int y, int w, int h, char * label) { } void free_fl_box(BOX b) { - delete reinterpret_cast<My_Box*>(b); + delete static_cast<My_Box*>(b); } void fl_box_draw(BOX n) { - reinterpret_cast<My_Box*>(n)->Fl_Box::draw(); + static_cast<My_Box*>(n)->Fl_Box::draw(); } int fl_box_handle(BOX n, int e) { - return reinterpret_cast<My_Box*>(n)->Fl_Box::handle(e); + return static_cast<My_Box*>(n)->Fl_Box::handle(e); } diff --git a/src/c_fl_browser.cpp b/src/c_fl_browser.cpp index 0a29e22..bf700b7 100644 --- a/src/c_fl_browser.cpp +++ b/src/c_fl_browser.cpp @@ -183,107 +183,107 @@ BROWSER new_fl_browser(int x, int y, int w, int h, char * label) { } void free_fl_browser(BROWSER b) { - delete reinterpret_cast<My_Browser*>(b); + delete static_cast<My_Browser*>(b); } void fl_browser_add(BROWSER b, const char * text, void * d) { - reinterpret_cast<Fl_Browser*>(b)->add(text, d); + static_cast<Fl_Browser*>(b)->add(text, d); } void fl_browser_insert(BROWSER b, int line, const char * text, void * d) { - reinterpret_cast<Fl_Browser*>(b)->insert(line, text, d); + static_cast<Fl_Browser*>(b)->insert(line, text, d); } void fl_browser_move(BROWSER b, int to, int from) { - reinterpret_cast<Fl_Browser*>(b)->move(to, from); + static_cast<Fl_Browser*>(b)->move(to, from); } void fl_browser_swap(BROWSER b, int x, int y) { - reinterpret_cast<Fl_Browser*>(b)->swap(x, y); + static_cast<Fl_Browser*>(b)->swap(x, y); } void fl_browser_remove(BROWSER b, int line) { - reinterpret_cast<Fl_Browser*>(b)->remove(line); + static_cast<Fl_Browser*>(b)->remove(line); } void fl_browser_clear(BROWSER b) { - reinterpret_cast<Fl_Browser*>(b)->clear(); + static_cast<Fl_Browser*>(b)->clear(); } int fl_browser_size(BROWSER b) { - return reinterpret_cast<Fl_Browser*>(b)->size(); + return static_cast<Fl_Browser*>(b)->size(); } int fl_browser_load(BROWSER b, const char * f) { - return reinterpret_cast<Fl_Browser*>(b)->load(f); + return static_cast<Fl_Browser*>(b)->load(f); } const char * fl_browser_get_text(BROWSER b, int line) { - return reinterpret_cast<Fl_Browser*>(b)->text(line); + return static_cast<Fl_Browser*>(b)->text(line); } void fl_browser_set_text(BROWSER b, int line, const char * text) { - reinterpret_cast<Fl_Browser*>(b)->text(line, text); + static_cast<Fl_Browser*>(b)->text(line, text); } int fl_browser_get_textsize(BROWSER b) { - return reinterpret_cast<Fl_Browser*>(b)->textsize(); + return static_cast<Fl_Browser*>(b)->textsize(); } void fl_browser_set_textsize(BROWSER b, int size) { - reinterpret_cast<Fl_Browser*>(b)->textsize(size); + static_cast<Fl_Browser*>(b)->textsize(size); } char fl_browser_get_column_char(BROWSER b) { - return reinterpret_cast<Fl_Browser*>(b)->column_char(); + return static_cast<Fl_Browser*>(b)->column_char(); } void fl_browser_set_column_char(BROWSER b, char c) { - reinterpret_cast<Fl_Browser*>(b)->column_char(c); + static_cast<Fl_Browser*>(b)->column_char(c); } void fl_browser_set_column_widths(BROWSER b, void * w) { - reinterpret_cast<Fl_Browser*>(b)->column_widths(reinterpret_cast<const int *>(w)); + static_cast<Fl_Browser*>(b)->column_widths(static_cast<const int *>(w)); } char fl_browser_get_format_char(BROWSER b) { - return reinterpret_cast<Fl_Browser*>(b)->format_char(); + return static_cast<Fl_Browser*>(b)->format_char(); } void fl_browser_set_format_char(BROWSER b, char c) { - reinterpret_cast<Fl_Browser*>(b)->format_char(c); + static_cast<Fl_Browser*>(b)->format_char(c); } int fl_browser_get_topline(BROWSER b) { - return reinterpret_cast<Fl_Browser*>(b)->topline(); + return static_cast<Fl_Browser*>(b)->topline(); } void fl_browser_set_topline(BROWSER b, int line) { - reinterpret_cast<Fl_Browser*>(b)->topline(line); + static_cast<Fl_Browser*>(b)->topline(line); } void fl_browser_middleline(BROWSER b, int line) { - reinterpret_cast<Fl_Browser*>(b)->middleline(line); + static_cast<Fl_Browser*>(b)->middleline(line); } void fl_browser_bottomline(BROWSER b, int line) { - reinterpret_cast<Fl_Browser*>(b)->bottomline(line); + static_cast<Fl_Browser*>(b)->bottomline(line); } void fl_browser_lineposition(BROWSER b, int line, int p) { - reinterpret_cast<Fl_Browser*>(b)->lineposition + static_cast<Fl_Browser*>(b)->lineposition (line, static_cast<Fl_Browser::Fl_Line_Position>(p)); } @@ -291,133 +291,133 @@ void fl_browser_lineposition(BROWSER b, int line, int p) { int fl_browser_select(BROWSER b, int l, int v) { - return reinterpret_cast<Fl_Browser*>(b)->select(l, v); + return static_cast<Fl_Browser*>(b)->select(l, v); } int fl_browser_selected(BROWSER b, int l) { - return reinterpret_cast<Fl_Browser*>(b)->selected(l); + return static_cast<Fl_Browser*>(b)->selected(l); } int fl_browser_value(BROWSER b) { - return reinterpret_cast<Fl_Browser*>(b)->value(); + return static_cast<Fl_Browser*>(b)->value(); } int fl_browser_visible(BROWSER b, int l) { - return reinterpret_cast<Fl_Browser*>(b)->visible(l); + return static_cast<Fl_Browser*>(b)->visible(l); } void fl_browser_make_visible(BROWSER b, int l) { - reinterpret_cast<Fl_Browser*>(b)->make_visible(l); + static_cast<Fl_Browser*>(b)->make_visible(l); } int fl_browser_displayed(BROWSER b, int l) { - return reinterpret_cast<Fl_Browser*>(b)->displayed(l); + return static_cast<Fl_Browser*>(b)->displayed(l); } void fl_browser_show_line(BROWSER b, int l) { - reinterpret_cast<Fl_Browser*>(b)->show(l); + static_cast<Fl_Browser*>(b)->show(l); } void fl_browser_hide_line(BROWSER b, int l) { - reinterpret_cast<Fl_Browser*>(b)->hide(l); + static_cast<Fl_Browser*>(b)->hide(l); } void fl_browser_show(BROWSER b) { - reinterpret_cast<Fl_Browser*>(b)->show(); + static_cast<Fl_Browser*>(b)->show(); } void fl_browser_hide(BROWSER b) { - reinterpret_cast<Fl_Browser*>(b)->hide(); + static_cast<Fl_Browser*>(b)->hide(); } void fl_browser_set_size(BROWSER b, int w, int h) { - reinterpret_cast<Fl_Browser*>(b)->size(w, h); + static_cast<Fl_Browser*>(b)->size(w, h); } void fl_browser_set_icon(BROWSER b, int l, void * c) { - reinterpret_cast<Fl_Browser*>(b)->icon(l, reinterpret_cast<Fl_Image*>(c)); + static_cast<Fl_Browser*>(b)->icon(l, static_cast<Fl_Image*>(c)); } void fl_browser_remove_icon(BROWSER b, int l) { - reinterpret_cast<Fl_Browser*>(b)->remove_icon(l); + static_cast<Fl_Browser*>(b)->remove_icon(l); } int fl_browser_full_height(BROWSER c) { - return reinterpret_cast<My_Browser*>(c)->Fl_Browser::full_height(); + return static_cast<My_Browser*>(c)->Fl_Browser::full_height(); } int fl_browser_incr_height(BROWSER c) { - return reinterpret_cast<My_Browser*>(c)->Fl_Browser::incr_height(); + return static_cast<My_Browser*>(c)->Fl_Browser::incr_height(); } int fl_browser_item_width(BROWSER b, void * item) { - return reinterpret_cast<My_Browser*>(b)->Fl_Browser::item_width(item); + return static_cast<My_Browser*>(b)->Fl_Browser::item_width(item); } int fl_browser_item_height(BROWSER b, void * item) { - return reinterpret_cast<My_Browser*>(b)->Fl_Browser::item_height(item); + return static_cast<My_Browser*>(b)->Fl_Browser::item_height(item); } void * fl_browser_item_first(BROWSER b) { - return reinterpret_cast<My_Browser*>(b)->Fl_Browser::item_first(); + return static_cast<My_Browser*>(b)->Fl_Browser::item_first(); } void * fl_browser_item_last(BROWSER b) { - return reinterpret_cast<My_Browser*>(b)->Fl_Browser::item_last(); + return static_cast<My_Browser*>(b)->Fl_Browser::item_last(); } void * fl_browser_item_next(BROWSER b, void * item) { - return reinterpret_cast<My_Browser*>(b)->Fl_Browser::item_next(item); + return static_cast<My_Browser*>(b)->Fl_Browser::item_next(item); } void * fl_browser_item_prev(BROWSER b, void * item) { - return reinterpret_cast<My_Browser*>(b)->Fl_Browser::item_prev(item); + return static_cast<My_Browser*>(b)->Fl_Browser::item_prev(item); } void * fl_browser_item_at(BROWSER b, int index) { - return reinterpret_cast<My_Browser*>(b)->Fl_Browser::item_at(index); + return static_cast<My_Browser*>(b)->Fl_Browser::item_at(index); } void fl_browser_item_select(BROWSER b, void * item, int val) { - reinterpret_cast<My_Browser*>(b)->Fl_Browser::item_select(item, val); + static_cast<My_Browser*>(b)->Fl_Browser::item_select(item, val); } int fl_browser_item_selected(BROWSER b, void * item) { - return reinterpret_cast<My_Browser*>(b)->Fl_Browser::item_selected(item); + return static_cast<My_Browser*>(b)->Fl_Browser::item_selected(item); } void fl_browser_item_swap(BROWSER b, void * x, void * y) { - reinterpret_cast<My_Browser*>(b)->Fl_Browser::item_swap(x, y); + static_cast<My_Browser*>(b)->Fl_Browser::item_swap(x, y); } const char * fl_browser_item_text(BROWSER b, void * item) { - return reinterpret_cast<My_Browser*>(b)->Fl_Browser::item_text(item); + return static_cast<My_Browser*>(b)->Fl_Browser::item_text(item); } void fl_browser_item_draw(BROWSER b, void * item, int x, int y, int w, int h) { - reinterpret_cast<My_Browser*>(b)->Fl_Browser::item_draw(item, x, y, w, h); + static_cast<My_Browser*>(b)->Fl_Browser::item_draw(item, x, y, w, h); } int fl_browser_lineno(BROWSER b, void * item) { - return (reinterpret_cast<Fl_Browser*>(b)->*(&Friend_Browser::lineno))(item); + return (static_cast<Fl_Browser*>(b)->*(&Friend_Browser::lineno))(item); } @@ -427,22 +427,22 @@ int fl_browser_lineno(BROWSER b, void * item) { int fl_browser_full_width(BROWSER c) { - return reinterpret_cast<My_Browser*>(c)->Fl_Browser::full_width(); + return static_cast<My_Browser*>(c)->Fl_Browser::full_width(); } int fl_browser_item_quick_height(BROWSER c, void * i) { - return reinterpret_cast<My_Browser*>(c)->Fl_Browser::item_quick_height(i); + return static_cast<My_Browser*>(c)->Fl_Browser::item_quick_height(i); } void fl_browser_draw(BROWSER b) { - reinterpret_cast<My_Browser*>(b)->Fl_Browser::draw(); + static_cast<My_Browser*>(b)->Fl_Browser::draw(); } int fl_browser_handle(BROWSER b, int e) { - return reinterpret_cast<My_Browser*>(b)->Fl_Browser::handle(e); + return static_cast<My_Browser*>(b)->Fl_Browser::handle(e); } diff --git a/src/c_fl_browser_.cpp b/src/c_fl_browser_.cpp index 3c0812c..58eaa3d 100644 --- a/src/c_fl_browser_.cpp +++ b/src/c_fl_browser_.cpp @@ -190,203 +190,203 @@ ABSTRACTBROWSER new_fl_abstract_browser(int x, int y, int w, int h, char * label } void free_fl_abstract_browser(ABSTRACTBROWSER b) { - delete reinterpret_cast<My_Browser_*>(b); + delete static_cast<My_Browser_*>(b); } void * fl_abstract_browser_hscrollbar(ABSTRACTBROWSER b) { - return &reinterpret_cast<Fl_Browser_*>(b)->hscrollbar; + return &static_cast<Fl_Browser_*>(b)->hscrollbar; } void * fl_abstract_browser_scrollbar(ABSTRACTBROWSER b) { - return &reinterpret_cast<Fl_Browser_*>(b)->scrollbar; + return &static_cast<Fl_Browser_*>(b)->scrollbar; } int fl_abstract_browser_select(ABSTRACTBROWSER b, void * i, int v, int c) { - return reinterpret_cast<Fl_Browser_*>(b)->select(i, v, c); + return static_cast<Fl_Browser_*>(b)->select(i, v, c); } int fl_abstract_browser_select_only(ABSTRACTBROWSER b, void * i, int c) { - return reinterpret_cast<Fl_Browser_*>(b)->select_only(i, c); + return static_cast<Fl_Browser_*>(b)->select_only(i, c); } void * fl_abstract_browser_selection(ABSTRACTBROWSER b) { - return (reinterpret_cast<Fl_Browser_*>(b)->*(&Friend_Browser_::selection))(); + return (static_cast<Fl_Browser_*>(b)->*(&Friend_Browser_::selection))(); } int fl_abstract_browser_deselect(ABSTRACTBROWSER b, int c) { - return reinterpret_cast<Fl_Browser_*>(b)->deselect(c); + return static_cast<Fl_Browser_*>(b)->deselect(c); } void fl_abstract_browser_display(ABSTRACTBROWSER b, void * i) { - reinterpret_cast<Fl_Browser_*>(b)->display(i); + static_cast<Fl_Browser_*>(b)->display(i); } int fl_abstract_browser_displayed(ABSTRACTBROWSER b, void * i) { - return (reinterpret_cast<Fl_Browser_*>(b)->*(&Friend_Browser_::displayed))(i); + return (static_cast<Fl_Browser_*>(b)->*(&Friend_Browser_::displayed))(i); } void * fl_abstract_browser_find_item(ABSTRACTBROWSER b, int y) { - return (reinterpret_cast<Fl_Browser_*>(b)->*(&Friend_Browser_::find_item))(y); + return (static_cast<Fl_Browser_*>(b)->*(&Friend_Browser_::find_item))(y); } void * fl_abstract_browser_top(ABSTRACTBROWSER b) { - return (reinterpret_cast<Fl_Browser_*>(b)->*(&Friend_Browser_::top))(); + return (static_cast<Fl_Browser_*>(b)->*(&Friend_Browser_::top))(); } void fl_abstract_browser_sort(ABSTRACTBROWSER b, int f) { - reinterpret_cast<Fl_Browser_*>(b)->sort(f); + static_cast<Fl_Browser_*>(b)->sort(f); } unsigned char fl_abstract_browser_get_has_scrollbar(ABSTRACTBROWSER b) { - return reinterpret_cast<Fl_Browser_*>(b)->has_scrollbar(); + return static_cast<Fl_Browser_*>(b)->has_scrollbar(); } void fl_abstract_browser_set_has_scrollbar(ABSTRACTBROWSER b, unsigned char m) { - reinterpret_cast<Fl_Browser_*>(b)->has_scrollbar(m); + static_cast<Fl_Browser_*>(b)->has_scrollbar(m); } int fl_abstract_browser_get_hposition(ABSTRACTBROWSER b) { - return reinterpret_cast<Fl_Browser_*>(b)->hposition(); + return static_cast<Fl_Browser_*>(b)->hposition(); } void fl_abstract_browser_set_hposition(ABSTRACTBROWSER b, int p) { - reinterpret_cast<Fl_Browser_*>(b)->hposition(p); + static_cast<Fl_Browser_*>(b)->hposition(p); } int fl_abstract_browser_get_position(ABSTRACTBROWSER b) { - return reinterpret_cast<Fl_Browser_*>(b)->position(); + return static_cast<Fl_Browser_*>(b)->position(); } void fl_abstract_browser_set_position(ABSTRACTBROWSER b, int p) { - reinterpret_cast<Fl_Browser_*>(b)->position(p); + static_cast<Fl_Browser_*>(b)->position(p); } void fl_abstract_browser_scrollbar_left(ABSTRACTBROWSER b) { - reinterpret_cast<Fl_Browser_*>(b)->scrollbar_left(); + static_cast<Fl_Browser_*>(b)->scrollbar_left(); } void fl_abstract_browser_scrollbar_right(ABSTRACTBROWSER b) { - reinterpret_cast<Fl_Browser_*>(b)->scrollbar_right(); + static_cast<Fl_Browser_*>(b)->scrollbar_right(); } int fl_abstract_browser_get_scrollbar_size(ABSTRACTBROWSER b) { - return reinterpret_cast<Fl_Browser_*>(b)->scrollbar_size(); + return static_cast<Fl_Browser_*>(b)->scrollbar_size(); } void fl_abstract_browser_set_scrollbar_size(ABSTRACTBROWSER b, int s) { - reinterpret_cast<Fl_Browser_*>(b)->scrollbar_size(s); + static_cast<Fl_Browser_*>(b)->scrollbar_size(s); } unsigned int fl_abstract_browser_get_textcolor(ABSTRACTBROWSER b) { - return reinterpret_cast<Fl_Browser_*>(b)->textcolor(); + return static_cast<Fl_Browser_*>(b)->textcolor(); } void fl_abstract_browser_set_textcolor(ABSTRACTBROWSER b, unsigned int c) { - reinterpret_cast<Fl_Browser_*>(b)->textcolor(c); + static_cast<Fl_Browser_*>(b)->textcolor(c); } int fl_abstract_browser_get_textfont(ABSTRACTBROWSER b) { - return reinterpret_cast<Fl_Browser_*>(b)->textfont(); + return static_cast<Fl_Browser_*>(b)->textfont(); } void fl_abstract_browser_set_textfont(ABSTRACTBROWSER b, int f) { - reinterpret_cast<Fl_Browser_*>(b)->textfont(f); + static_cast<Fl_Browser_*>(b)->textfont(f); } int fl_abstract_browser_get_textsize(ABSTRACTBROWSER b) { - return reinterpret_cast<Fl_Browser_*>(b)->textsize(); + return static_cast<Fl_Browser_*>(b)->textsize(); } void fl_abstract_browser_set_textsize(ABSTRACTBROWSER b, int s) { - reinterpret_cast<Fl_Browser_*>(b)->textsize(s); + static_cast<Fl_Browser_*>(b)->textsize(s); } void fl_abstract_browser_resize(ABSTRACTBROWSER b, int x, int y, int w, int h) { - reinterpret_cast<Fl_Browser_*>(b)->resize(x, y, w, h); + static_cast<Fl_Browser_*>(b)->resize(x, y, w, h); } void fl_abstract_browser_bbox(ABSTRACTBROWSER b, int &x, int &y, int &w, int &h) { - (reinterpret_cast<Fl_Browser_*>(b)->*(&Friend_Browser_::bbox))(x, y, w, h); + (static_cast<Fl_Browser_*>(b)->*(&Friend_Browser_::bbox))(x, y, w, h); } int fl_abstract_browser_leftedge(ABSTRACTBROWSER b) { - return (reinterpret_cast<Fl_Browser_*>(b)->*(&Friend_Browser_::leftedge))(); + return (static_cast<Fl_Browser_*>(b)->*(&Friend_Browser_::leftedge))(); } void fl_abstract_browser_redraw_line(ABSTRACTBROWSER b, void * i) { - (reinterpret_cast<Fl_Browser_*>(b)->*(&Friend_Browser_::redraw_line))(i); + (static_cast<Fl_Browser_*>(b)->*(&Friend_Browser_::redraw_line))(i); } void fl_abstract_browser_redraw_lines(ABSTRACTBROWSER b) { - (reinterpret_cast<Fl_Browser_*>(b)->*(&Friend_Browser_::redraw_lines))(); + (static_cast<Fl_Browser_*>(b)->*(&Friend_Browser_::redraw_lines))(); } int fl_abstract_browser_full_width(ABSTRACTBROWSER b) { - return reinterpret_cast<My_Browser_*>(b)->Fl_Browser_::full_width(); + return static_cast<My_Browser_*>(b)->Fl_Browser_::full_width(); } int fl_abstract_browser_full_height(ABSTRACTBROWSER b) { - return reinterpret_cast<My_Browser_*>(b)->Fl_Browser_::full_height(); + return static_cast<My_Browser_*>(b)->Fl_Browser_::full_height(); } int fl_abstract_browser_incr_height(ABSTRACTBROWSER b) { - return reinterpret_cast<My_Browser_*>(b)->Fl_Browser_::incr_height(); + return static_cast<My_Browser_*>(b)->Fl_Browser_::incr_height(); } int fl_abstract_browser_item_quick_height(ABSTRACTBROWSER b, void * i) { - return reinterpret_cast<My_Browser_*>(b)->Fl_Browser_::item_quick_height(i); + return static_cast<My_Browser_*>(b)->Fl_Browser_::item_quick_height(i); } void fl_abstract_browser_new_list(ABSTRACTBROWSER b) { - (reinterpret_cast<Fl_Browser_*>(b)->*(&Friend_Browser_::new_list))(); + (static_cast<Fl_Browser_*>(b)->*(&Friend_Browser_::new_list))(); } void fl_abstract_browser_inserting(ABSTRACTBROWSER b, void * a1, void * a2) { - (reinterpret_cast<Fl_Browser_*>(b)->*(&Friend_Browser_::inserting))(a1, a2); + (static_cast<Fl_Browser_*>(b)->*(&Friend_Browser_::inserting))(a1, a2); } void fl_abstract_browser_deleting(ABSTRACTBROWSER b, void * item) { - (reinterpret_cast<Fl_Browser_*>(b)->*(&Friend_Browser_::deleting))(item); + (static_cast<Fl_Browser_*>(b)->*(&Friend_Browser_::deleting))(item); } void fl_abstract_browser_replacing(ABSTRACTBROWSER b, void * a1, void * a2) { - (reinterpret_cast<Fl_Browser_*>(b)->*(&Friend_Browser_::replacing))(a1, a2); + (static_cast<Fl_Browser_*>(b)->*(&Friend_Browser_::replacing))(a1, a2); } void fl_abstract_browser_swapping(ABSTRACTBROWSER b, void * a1, void * a2) { - (reinterpret_cast<Fl_Browser_*>(b)->*(&Friend_Browser_::swapping))(a1, a2); + (static_cast<Fl_Browser_*>(b)->*(&Friend_Browser_::swapping))(a1, a2); } void fl_abstract_browser_draw(ABSTRACTBROWSER b) { - reinterpret_cast<My_Browser_*>(b)->Fl_Browser_::draw(); + static_cast<My_Browser_*>(b)->Fl_Browser_::draw(); } int fl_abstract_browser_handle(ABSTRACTBROWSER b, int e) { - return reinterpret_cast<My_Browser_*>(b)->Fl_Browser_::handle(e); + return static_cast<My_Browser_*>(b)->Fl_Browser_::handle(e); } diff --git a/src/c_fl_button.cpp b/src/c_fl_button.cpp index 1cff342..409b190 100644 --- a/src/c_fl_button.cpp +++ b/src/c_fl_button.cpp @@ -75,59 +75,59 @@ BUTTON new_fl_button(int x, int y, int w, int h, char* label) { } void free_fl_button(BUTTON b) { - delete reinterpret_cast<My_Button*>(b); + delete static_cast<My_Button*>(b); } int fl_button_get_state(BUTTON b) { - return reinterpret_cast<Fl_Button*>(b)->Fl_Button::value(); + return static_cast<Fl_Button*>(b)->Fl_Button::value(); } void fl_button_set_state(BUTTON b, int s) { - reinterpret_cast<Fl_Button*>(b)->Fl_Button::value(s); + static_cast<Fl_Button*>(b)->Fl_Button::value(s); } void fl_button_set_only(BUTTON b) { - reinterpret_cast<Fl_Button*>(b)->Fl_Button::setonly(); + static_cast<Fl_Button*>(b)->Fl_Button::setonly(); } int fl_button_get_down_box(BUTTON b) { - return reinterpret_cast<Fl_Button*>(b)->Fl_Button::down_box(); + return static_cast<Fl_Button*>(b)->Fl_Button::down_box(); } void fl_button_set_down_box(BUTTON b, int t) { - reinterpret_cast<Fl_Button*>(b)->Fl_Button::down_box(static_cast<Fl_Boxtype>(t)); + static_cast<Fl_Button*>(b)->Fl_Button::down_box(static_cast<Fl_Boxtype>(t)); } int fl_button_get_shortcut(BUTTON b) { - return reinterpret_cast<Fl_Button*>(b)->Fl_Button::shortcut(); + return static_cast<Fl_Button*>(b)->Fl_Button::shortcut(); } void fl_button_set_shortcut(BUTTON b, int k) { - reinterpret_cast<Fl_Button*>(b)->Fl_Button::shortcut(k); + static_cast<Fl_Button*>(b)->Fl_Button::shortcut(k); } void fl_button_draw(BUTTON b) { - reinterpret_cast<My_Button*>(b)->Fl_Button::draw(); + static_cast<My_Button*>(b)->Fl_Button::draw(); } int fl_button_handle(BUTTON b, int e) { - return reinterpret_cast<My_Button*>(b)->Fl_Button::handle(e); + return static_cast<My_Button*>(b)->Fl_Button::handle(e); } void fl_button_simulate_key_action(BUTTON b) { - (reinterpret_cast<Fl_Button*>(b)->*(&Friend_Button::simulate_key_action))(); + (static_cast<Fl_Button*>(b)->*(&Friend_Button::simulate_key_action))(); } diff --git a/src/c_fl_cairo_window.cpp b/src/c_fl_cairo_window.cpp index c1a815e..4bf75f0 100644 --- a/src/c_fl_cairo_window.cpp +++ b/src/c_fl_cairo_window.cpp @@ -61,7 +61,7 @@ CAIROWINDOW new_fl_cairo_window(int w, int h) { } void free_fl_cairo_window(CAIROWINDOW w) { - delete reinterpret_cast<My_Cairo_Window*>(w); + delete static_cast<My_Cairo_Window*>(w); } @@ -69,7 +69,7 @@ void free_fl_cairo_window(CAIROWINDOW w) { void fl_cairo_window_set_draw_cb(CAIROWINDOW w, void * cb) { #ifdef FLTK_HAVE_CAIRO - reinterpret_cast<Fl_Cairo_Window*>(w)->set_draw_cb(reinterpret_cast<cairo_draw_cb>(cb)); + static_cast<Fl_Cairo_Window*>(w)->set_draw_cb(reinterpret_cast<cairo_draw_cb>(cb)); #else (void)(w); (void)(cb); @@ -81,17 +81,17 @@ void fl_cairo_window_set_draw_cb(CAIROWINDOW w, void * cb) { void fl_cairo_window_draw(CAIROWINDOW w) { #ifdef FLTK_HAVE_CAIRO - reinterpret_cast<My_Cairo_Window*>(w)->Fl_Cairo_Window::draw(); + static_cast<My_Cairo_Window*>(w)->Fl_Cairo_Window::draw(); #else - reinterpret_cast<My_Cairo_Window*>(w)->Fl_Double_Window::draw(); + static_cast<My_Cairo_Window*>(w)->Fl_Double_Window::draw(); #endif } int fl_cairo_window_handle(CAIROWINDOW w, int e) { #ifdef FLTK_HAVE_CAIRO - return reinterpret_cast<My_Cairo_Window*>(w)->Fl_Cairo_Window::handle(e); + return static_cast<My_Cairo_Window*>(w)->Fl_Cairo_Window::handle(e); #else - return reinterpret_cast<My_Cairo_Window*>(w)->Fl_Double_Window::handle(e); + return static_cast<My_Cairo_Window*>(w)->Fl_Double_Window::handle(e); #endif } diff --git a/src/c_fl_chart.cpp b/src/c_fl_chart.cpp index 56bfb80..c065327 100644 --- a/src/c_fl_chart.cpp +++ b/src/c_fl_chart.cpp @@ -50,102 +50,102 @@ CHART new_fl_chart(int x, int y, int w, int h, char* label) { } void free_fl_chart(CHART b) { - delete reinterpret_cast<My_Chart*>(b); + delete static_cast<My_Chart*>(b); } void fl_chart_add(CHART b, double v, char * s, unsigned int c) { - reinterpret_cast<Fl_Chart*>(b)->add(v,s,c); + static_cast<Fl_Chart*>(b)->add(v,s,c); } void fl_chart_insert(CHART b, int i, double v, char * s, unsigned int c) { - reinterpret_cast<Fl_Chart*>(b)->insert(i,v,s,c); + static_cast<Fl_Chart*>(b)->insert(i,v,s,c); } void fl_chart_replace(CHART b, int i, double v, char * s, unsigned int c) { - reinterpret_cast<Fl_Chart*>(b)->replace(i,v,s,c); + static_cast<Fl_Chart*>(b)->replace(i,v,s,c); } void fl_chart_clear(CHART b) { - reinterpret_cast<Fl_Chart*>(b)->clear(); + static_cast<Fl_Chart*>(b)->clear(); } int fl_chart_get_autosize(CHART b) { - return reinterpret_cast<Fl_Chart*>(b)->autosize(); + return static_cast<Fl_Chart*>(b)->autosize(); } void fl_chart_set_autosize(CHART b, int a) { - reinterpret_cast<Fl_Chart*>(b)->autosize(a); + static_cast<Fl_Chart*>(b)->autosize(a); } void fl_chart_get_bounds(CHART b, double * l, double * u) { - reinterpret_cast<Fl_Chart*>(b)->bounds(l,u); + static_cast<Fl_Chart*>(b)->bounds(l,u); } void fl_chart_set_bounds(CHART b, double l, double u) { - reinterpret_cast<Fl_Chart*>(b)->bounds(l,u); + static_cast<Fl_Chart*>(b)->bounds(l,u); } int fl_chart_get_maxsize(CHART b) { - return reinterpret_cast<Fl_Chart*>(b)->maxsize(); + return static_cast<Fl_Chart*>(b)->maxsize(); } void fl_chart_set_maxsize(CHART b, int m) { - reinterpret_cast<Fl_Chart*>(b)->maxsize(m); + static_cast<Fl_Chart*>(b)->maxsize(m); } int fl_chart_size(CHART b) { - return reinterpret_cast<Fl_Chart*>(b)->size(); + return static_cast<Fl_Chart*>(b)->size(); } void fl_chart_size2(CHART b, int w, int h) { - reinterpret_cast<Fl_Chart*>(b)->size(w, h); + static_cast<Fl_Chart*>(b)->size(w, h); } unsigned int fl_chart_get_textcolor(CHART b) { - return reinterpret_cast<Fl_Chart*>(b)->textcolor(); + return static_cast<Fl_Chart*>(b)->textcolor(); } void fl_chart_set_textcolor(CHART b, unsigned int c) { - reinterpret_cast<Fl_Chart*>(b)->textcolor(c); + static_cast<Fl_Chart*>(b)->textcolor(c); } int fl_chart_get_textfont(CHART b) { - return reinterpret_cast<Fl_Chart*>(b)->textfont(); + return static_cast<Fl_Chart*>(b)->textfont(); } void fl_chart_set_textfont(CHART b, int f) { - reinterpret_cast<Fl_Chart*>(b)->textfont(f); + static_cast<Fl_Chart*>(b)->textfont(f); } int fl_chart_get_textsize(CHART b) { - return reinterpret_cast<Fl_Chart*>(b)->textsize(); + return static_cast<Fl_Chart*>(b)->textsize(); } void fl_chart_set_textsize(CHART b, int s) { - reinterpret_cast<Fl_Chart*>(b)->textsize(s); + static_cast<Fl_Chart*>(b)->textsize(s); } void fl_chart_draw(CHART n) { - reinterpret_cast<My_Chart*>(n)->Fl_Chart::draw(); + static_cast<My_Chart*>(n)->Fl_Chart::draw(); } int fl_chart_handle(CHART n, int e) { - return reinterpret_cast<My_Chart*>(n)->Fl_Chart::handle(e); + return static_cast<My_Chart*>(n)->Fl_Chart::handle(e); } diff --git a/src/c_fl_check_browser.cpp b/src/c_fl_check_browser.cpp index cfb5658..947dc63 100644 --- a/src/c_fl_check_browser.cpp +++ b/src/c_fl_check_browser.cpp @@ -197,140 +197,140 @@ CHECKBROWSER new_fl_check_browser(int x, int y, int w, int h, char * label) { } void free_fl_check_browser(CHECKBROWSER c) { - delete reinterpret_cast<My_Check_Browser*>(c); + delete static_cast<My_Check_Browser*>(c); } int fl_check_browser_add(CHECKBROWSER c, const char * s, int b) { - return reinterpret_cast<Fl_Check_Browser*>(c)->add(s, b); + return static_cast<Fl_Check_Browser*>(c)->add(s, b); } int fl_check_browser_remove(CHECKBROWSER c, int i) { - return reinterpret_cast<Fl_Check_Browser*>(c)->remove(i); + return static_cast<Fl_Check_Browser*>(c)->remove(i); } void fl_check_browser_clear(CHECKBROWSER c) { - reinterpret_cast<Fl_Check_Browser*>(c)->clear(); + static_cast<Fl_Check_Browser*>(c)->clear(); } int fl_check_browser_nitems(CHECKBROWSER c) { - return reinterpret_cast<Fl_Check_Browser*>(c)->nitems(); + return static_cast<Fl_Check_Browser*>(c)->nitems(); } void fl_check_browser_check_all(CHECKBROWSER c) { - reinterpret_cast<Fl_Check_Browser*>(c)->check_all(); + static_cast<Fl_Check_Browser*>(c)->check_all(); } void fl_check_browser_check_none(CHECKBROWSER c) { - reinterpret_cast<Fl_Check_Browser*>(c)->check_none(); + static_cast<Fl_Check_Browser*>(c)->check_none(); } int fl_check_browser_get_checked(CHECKBROWSER c, int i) { - return reinterpret_cast<Fl_Check_Browser*>(c)->checked(i); + return static_cast<Fl_Check_Browser*>(c)->checked(i); } void fl_check_browser_set_checked(CHECKBROWSER c, int i, int b) { - reinterpret_cast<Fl_Check_Browser*>(c)->checked(i, b); + static_cast<Fl_Check_Browser*>(c)->checked(i, b); } int fl_check_browser_nchecked(CHECKBROWSER c) { - return reinterpret_cast<Fl_Check_Browser*>(c)->nchecked(); + return static_cast<Fl_Check_Browser*>(c)->nchecked(); } const char * fl_check_browser_text(CHECKBROWSER c, int i) { - return reinterpret_cast<Fl_Check_Browser*>(c)->text(i); + return static_cast<Fl_Check_Browser*>(c)->text(i); } int fl_check_browser_value(CHECKBROWSER c) { - return reinterpret_cast<Fl_Check_Browser*>(c)->value(); + return static_cast<Fl_Check_Browser*>(c)->value(); } int fl_check_browser_full_width(CHECKBROWSER c) { - return reinterpret_cast<My_Check_Browser*>(c)->Fl_Check_Browser::full_width(); + return static_cast<My_Check_Browser*>(c)->Fl_Check_Browser::full_width(); } int fl_check_browser_full_height(CHECKBROWSER c) { - return reinterpret_cast<My_Check_Browser*>(c)->Fl_Check_Browser::full_height(); + return static_cast<My_Check_Browser*>(c)->Fl_Check_Browser::full_height(); } int fl_check_browser_incr_height(CHECKBROWSER c) { - return reinterpret_cast<My_Check_Browser*>(c)->Fl_Check_Browser::incr_height(); + return static_cast<My_Check_Browser*>(c)->Fl_Check_Browser::incr_height(); } int fl_check_browser_item_quick_height(CHECKBROWSER c, void * i) { - return reinterpret_cast<My_Check_Browser*>(c)->Fl_Check_Browser::item_quick_height(i); + return static_cast<My_Check_Browser*>(c)->Fl_Check_Browser::item_quick_height(i); } int fl_check_browser_item_width(CHECKBROWSER c, void * i) { - return (reinterpret_cast<Fl_Check_Browser*>(c)->*(&Friend_Browser::item_width))(i); - // return reinterpret_cast<My_Check_Browser*>(c)->Fl_Check_Browser::item_width(i); + return (static_cast<Fl_Check_Browser*>(c)->*(&Friend_Browser::item_width))(i); + // return static_cast<My_Check_Browser*>(c)->Fl_Check_Browser::item_width(i); } int fl_check_browser_item_height(CHECKBROWSER c, void * i) { - return (reinterpret_cast<Fl_Check_Browser*>(c)->*(&Friend_Browser::item_height))(i); - // return reinterpret_cast<My_Check_Browser*>(c)->Fl_Check_Browser::item_height(i); + return (static_cast<Fl_Check_Browser*>(c)->*(&Friend_Browser::item_height))(i); + // return static_cast<My_Check_Browser*>(c)->Fl_Check_Browser::item_height(i); } void * fl_check_browser_item_first(CHECKBROWSER c) { - return (reinterpret_cast<Fl_Check_Browser*>(c)->*(&Friend_Browser::item_first))(); - // return reinterpret_cast<My_Check_Browser*>(c)->Fl_Check_Browser::item_first(); + return (static_cast<Fl_Check_Browser*>(c)->*(&Friend_Browser::item_first))(); + // return static_cast<My_Check_Browser*>(c)->Fl_Check_Browser::item_first(); } // missing item_last void * fl_check_browser_item_next(CHECKBROWSER c, void * i) { - return (reinterpret_cast<Fl_Check_Browser*>(c)->*(&Friend_Browser::item_next))(i); - // return reinterpret_cast<My_Check_Browser*>(c)->Fl_Check_Browser::item_next(i); + return (static_cast<Fl_Check_Browser*>(c)->*(&Friend_Browser::item_next))(i); + // return static_cast<My_Check_Browser*>(c)->Fl_Check_Browser::item_next(i); } void * fl_check_browser_item_prev(CHECKBROWSER c, void * i) { - return (reinterpret_cast<Fl_Check_Browser*>(c)->*(&Friend_Browser::item_prev))(i); - // return reinterpret_cast<My_Check_Browser*>(c)->Fl_Check_Browser::item_prev(i); + return (static_cast<Fl_Check_Browser*>(c)->*(&Friend_Browser::item_prev))(i); + // return static_cast<My_Check_Browser*>(c)->Fl_Check_Browser::item_prev(i); } // missing item_at void fl_check_browser_item_select(CHECKBROWSER c, void * i, int v) { - (reinterpret_cast<Fl_Check_Browser*>(c)->*(&Friend_Browser::item_select))(i, v); - // reinterpret_cast<My_Check_Browser*>(c)->Fl_Check_Browser::item_select(i, v); + (static_cast<Fl_Check_Browser*>(c)->*(&Friend_Browser::item_select))(i, v); + // static_cast<My_Check_Browser*>(c)->Fl_Check_Browser::item_select(i, v); } int fl_check_browser_item_selected(CHECKBROWSER c, void * i) { - return (reinterpret_cast<Fl_Check_Browser*>(c)->*(&Friend_Browser::item_selected))(i); - // return reinterpret_cast<My_Check_Browser*>(c)->Fl_Check_Browser::item_selected(i); + return (static_cast<Fl_Check_Browser*>(c)->*(&Friend_Browser::item_selected))(i); + // return static_cast<My_Check_Browser*>(c)->Fl_Check_Browser::item_selected(i); } // missing item_swap // missing item_text void fl_check_browser_item_draw(CHECKBROWSER c, void * item, int x, int y, int w, int h) { - (reinterpret_cast<Fl_Check_Browser*>(c)->*(&Friend_Browser::item_draw))(item, x, y, w, h); - // reinterpret_cast<My_Check_Browser*>(c)->Fl_Check_Browser::item_draw(item, x, y, w, h); + (static_cast<Fl_Check_Browser*>(c)->*(&Friend_Browser::item_draw))(item, x, y, w, h); + // static_cast<My_Check_Browser*>(c)->Fl_Check_Browser::item_draw(item, x, y, w, h); } void fl_check_browser_draw(CHECKBROWSER c) { - reinterpret_cast<My_Check_Browser*>(c)->Fl_Check_Browser::draw(); + static_cast<My_Check_Browser*>(c)->Fl_Check_Browser::draw(); } int fl_check_browser_handle(CHECKBROWSER c, int e) { - return reinterpret_cast<My_Check_Browser*>(c)->Fl_Check_Browser::handle(e); + return static_cast<My_Check_Browser*>(c)->Fl_Check_Browser::handle(e); } diff --git a/src/c_fl_check_button.cpp b/src/c_fl_check_button.cpp index 2eb61a1..8dab449 100644 --- a/src/c_fl_check_button.cpp +++ b/src/c_fl_check_button.cpp @@ -66,18 +66,18 @@ CHECKBUTTON new_fl_check_button(int x, int y, int w, int h, char* label) { } void free_fl_check_button(CHECKBUTTON b) { - delete reinterpret_cast<My_Check_Button*>(b); + delete static_cast<My_Check_Button*>(b); } void fl_check_button_draw(CHECKBUTTON b) { - reinterpret_cast<My_Check_Button*>(b)->Fl_Check_Button::draw(); + static_cast<My_Check_Button*>(b)->Fl_Check_Button::draw(); } int fl_check_button_handle(CHECKBUTTON b, int e) { - return reinterpret_cast<My_Check_Button*>(b)->Fl_Check_Button::handle(e); + return static_cast<My_Check_Button*>(b)->Fl_Check_Button::handle(e); } diff --git a/src/c_fl_choice.cpp b/src/c_fl_choice.cpp index 0b7c65c..4b03532 100644 --- a/src/c_fl_choice.cpp +++ b/src/c_fl_choice.cpp @@ -50,33 +50,33 @@ CHOICE new_fl_choice(int x, int y, int w, int h, char* label) { } void free_fl_choice(CHOICE b) { - delete reinterpret_cast<My_Choice*>(b); + delete static_cast<My_Choice*>(b); } int fl_choice_value(CHOICE c) { - return reinterpret_cast<Fl_Choice*>(c)->value(); + return static_cast<Fl_Choice*>(c)->value(); } int fl_choice_set_value(CHOICE c, void * i) { - return reinterpret_cast<Fl_Choice*>(c)->value(reinterpret_cast<Fl_Menu_Item*>(i)); + return static_cast<Fl_Choice*>(c)->value(static_cast<Fl_Menu_Item*>(i)); } int fl_choice_set_value2(CHOICE c, int p) { - return reinterpret_cast<Fl_Choice*>(c)->value(p); + return static_cast<Fl_Choice*>(c)->value(p); } void fl_choice_draw(CHOICE n) { - reinterpret_cast<My_Choice*>(n)->Fl_Choice::draw(); + static_cast<My_Choice*>(n)->Fl_Choice::draw(); } int fl_choice_handle(CHOICE n, int e) { - return reinterpret_cast<My_Choice*>(n)->Fl_Choice::handle(e); + return static_cast<My_Choice*>(n)->Fl_Choice::handle(e); } diff --git a/src/c_fl_clock.cpp b/src/c_fl_clock.cpp index a7e570e..e2df99c 100644 --- a/src/c_fl_clock.cpp +++ b/src/c_fl_clock.cpp @@ -55,18 +55,18 @@ CLOCK new_fl_clock2(unsigned char k, int x, int y, int w, int h, char* label) { } void free_fl_clock(CLOCK c) { - delete reinterpret_cast<My_Clock*>(c); + delete static_cast<My_Clock*>(c); } void fl_clock_draw(CLOCK c) { - reinterpret_cast<My_Clock*>(c)->Fl_Clock::draw(); + static_cast<My_Clock*>(c)->Fl_Clock::draw(); } int fl_clock_handle(CLOCK c, int e) { - return reinterpret_cast<My_Clock*>(c)->Fl_Clock::handle(e); + return static_cast<My_Clock*>(c)->Fl_Clock::handle(e); } diff --git a/src/c_fl_clock_output.cpp b/src/c_fl_clock_output.cpp index 91aaae4..a34b1c4 100644 --- a/src/c_fl_clock_output.cpp +++ b/src/c_fl_clock_output.cpp @@ -35,8 +35,8 @@ class My_Clock_Output : public Fl_Clock_Output { public: using Fl_Clock_Output::Fl_Clock_Output; - friend void fl_clock_output_draw(CLOCK_OUTPUT c); - friend int fl_clock_output_handle(CLOCK_OUTPUT c, int e); + friend void fl_clock_output_draw(CLOCKOUTPUT c); + friend int fl_clock_output_handle(CLOCKOUTPUT c, int e); void draw(); int handle(int e); @@ -55,57 +55,57 @@ int My_Clock_Output::handle(int e) { // Flattened C API -CLOCK_OUTPUT new_fl_clock_output(int x, int y, int w, int h, char* label) { +CLOCKOUTPUT new_fl_clock_output(int x, int y, int w, int h, char* label) { My_Clock_Output *c = new My_Clock_Output(x, y, w, h, label); return c; } -void free_fl_clock_output(CLOCK_OUTPUT c) { - delete reinterpret_cast<My_Clock_Output*>(c); +void free_fl_clock_output(CLOCKOUTPUT c) { + delete static_cast<My_Clock_Output*>(c); } -int fl_clock_output_get_hour(CLOCK_OUTPUT c) { - return reinterpret_cast<Fl_Clock_Output*>(c)->Fl_Clock_Output::hour(); +int fl_clock_output_get_hour(CLOCKOUTPUT c) { + return static_cast<Fl_Clock_Output*>(c)->Fl_Clock_Output::hour(); } -int fl_clock_output_get_minute(CLOCK_OUTPUT c) { - return reinterpret_cast<Fl_Clock_Output*>(c)->Fl_Clock_Output::minute(); +int fl_clock_output_get_minute(CLOCKOUTPUT c) { + return static_cast<Fl_Clock_Output*>(c)->Fl_Clock_Output::minute(); } -int fl_clock_output_get_second(CLOCK_OUTPUT c) { - return reinterpret_cast<Fl_Clock_Output*>(c)->Fl_Clock_Output::second(); +int fl_clock_output_get_second(CLOCKOUTPUT c) { + return static_cast<Fl_Clock_Output*>(c)->Fl_Clock_Output::second(); } -unsigned long fl_clock_output_get_value(CLOCK_OUTPUT c) { - return reinterpret_cast<Fl_Clock_Output*>(c)->Fl_Clock_Output::value(); +unsigned long fl_clock_output_get_value(CLOCKOUTPUT c) { + return static_cast<Fl_Clock_Output*>(c)->Fl_Clock_Output::value(); } -void fl_clock_output_set_value(CLOCK_OUTPUT c, unsigned long v) { - reinterpret_cast<Fl_Clock_Output*>(c)->Fl_Clock_Output::value(v); +void fl_clock_output_set_value(CLOCKOUTPUT c, unsigned long v) { + static_cast<Fl_Clock_Output*>(c)->Fl_Clock_Output::value(v); } -void fl_clock_output_set_value2(CLOCK_OUTPUT c, int h, int m, int s) { - reinterpret_cast<Fl_Clock_Output*>(c)->Fl_Clock_Output::value(h,m,s); +void fl_clock_output_set_value2(CLOCKOUTPUT c, int h, int m, int s) { + static_cast<Fl_Clock_Output*>(c)->Fl_Clock_Output::value(h,m,s); } -void fl_clock_output_draw(CLOCK_OUTPUT c) { - reinterpret_cast<My_Clock_Output*>(c)->Fl_Clock_Output::draw(); +void fl_clock_output_draw(CLOCKOUTPUT c) { + static_cast<My_Clock_Output*>(c)->Fl_Clock_Output::draw(); } -void fl_clock_output_draw2(CLOCK_OUTPUT c, int x, int y, int w, int h) { +void fl_clock_output_draw2(CLOCKOUTPUT c, int x, int y, int w, int h) { void (Fl_Clock_Output::*mydraw)(int,int,int,int) = &Friend_Clock_Output::draw; - (reinterpret_cast<Fl_Clock_Output*>(c)->*mydraw)(x, y, w, h); + (static_cast<Fl_Clock_Output*>(c)->*mydraw)(x, y, w, h); } -int fl_clock_output_handle(CLOCK_OUTPUT c, int e) { - return reinterpret_cast<My_Clock_Output*>(c)->Fl_Clock_Output::handle(e); +int fl_clock_output_handle(CLOCKOUTPUT c, int e) { + return static_cast<My_Clock_Output*>(c)->Fl_Clock_Output::handle(e); } diff --git a/src/c_fl_clock_output.h b/src/c_fl_clock_output.h index 6adb98d..6098b25 100644 --- a/src/c_fl_clock_output.h +++ b/src/c_fl_clock_output.h @@ -8,26 +8,26 @@ #define FL_CLOCK_OUTPUT_GUARD -typedef void* CLOCK_OUTPUT; +typedef void* CLOCKOUTPUT; -extern "C" CLOCK_OUTPUT new_fl_clock_output(int x, int y, int w, int h, char* label); -extern "C" void free_fl_clock_output(CLOCK_OUTPUT c); +extern "C" CLOCKOUTPUT new_fl_clock_output(int x, int y, int w, int h, char* label); +extern "C" void free_fl_clock_output(CLOCKOUTPUT c); -extern "C" int fl_clock_output_get_hour(CLOCK_OUTPUT c); -extern "C" int fl_clock_output_get_minute(CLOCK_OUTPUT c); -extern "C" int fl_clock_output_get_second(CLOCK_OUTPUT c); +extern "C" int fl_clock_output_get_hour(CLOCKOUTPUT c); +extern "C" int fl_clock_output_get_minute(CLOCKOUTPUT c); +extern "C" int fl_clock_output_get_second(CLOCKOUTPUT c); -extern "C" unsigned long fl_clock_output_get_value(CLOCK_OUTPUT c); -extern "C" void fl_clock_output_set_value(CLOCK_OUTPUT c, unsigned long v); -extern "C" void fl_clock_output_set_value2(CLOCK_OUTPUT c, int h, int m, int s); +extern "C" unsigned long fl_clock_output_get_value(CLOCKOUTPUT c); +extern "C" void fl_clock_output_set_value(CLOCKOUTPUT c, unsigned long v); +extern "C" void fl_clock_output_set_value2(CLOCKOUTPUT c, int h, int m, int s); -extern "C" void fl_clock_output_draw(CLOCK_OUTPUT c); -extern "C" void fl_clock_output_draw2(CLOCK_OUTPUT c, int x, int y, int w, int h); -extern "C" int fl_clock_output_handle(CLOCK_OUTPUT c, int e); +extern "C" void fl_clock_output_draw(CLOCKOUTPUT c); +extern "C" void fl_clock_output_draw2(CLOCKOUTPUT c, int x, int y, int w, int h); +extern "C" int fl_clock_output_handle(CLOCKOUTPUT c, int e); #endif diff --git a/src/c_fl_color_chooser.cpp b/src/c_fl_color_chooser.cpp index 171155d..31551b8 100644 --- a/src/c_fl_color_chooser.cpp +++ b/src/c_fl_color_chooser.cpp @@ -50,45 +50,45 @@ COLORCHOOSER new_fl_color_chooser(int x, int y, int w, int h, char* label) { } void free_fl_color_chooser(COLORCHOOSER n) { - delete reinterpret_cast<My_Color_Chooser*>(n); + delete static_cast<My_Color_Chooser*>(n); } double fl_color_chooser_r(COLORCHOOSER n) { - return reinterpret_cast<Fl_Color_Chooser*>(n)->r(); + return static_cast<Fl_Color_Chooser*>(n)->r(); } double fl_color_chooser_g(COLORCHOOSER n) { - return reinterpret_cast<Fl_Color_Chooser*>(n)->g(); + return static_cast<Fl_Color_Chooser*>(n)->g(); } double fl_color_chooser_b(COLORCHOOSER n) { - return reinterpret_cast<Fl_Color_Chooser*>(n)->b(); + return static_cast<Fl_Color_Chooser*>(n)->b(); } int fl_color_chooser_rgb(COLORCHOOSER n, int r, int g, int b) { - return reinterpret_cast<Fl_Color_Chooser*>(n)->rgb(r,g,b); + return static_cast<Fl_Color_Chooser*>(n)->rgb(r,g,b); } double fl_color_chooser_hue(COLORCHOOSER n) { - return reinterpret_cast<Fl_Color_Chooser*>(n)->hue(); + return static_cast<Fl_Color_Chooser*>(n)->hue(); } double fl_color_chooser_saturation(COLORCHOOSER n) { - return reinterpret_cast<Fl_Color_Chooser*>(n)->saturation(); + return static_cast<Fl_Color_Chooser*>(n)->saturation(); } double fl_color_chooser_value(COLORCHOOSER n) { - return reinterpret_cast<Fl_Color_Chooser*>(n)->value(); + return static_cast<Fl_Color_Chooser*>(n)->value(); } int fl_color_chooser_hsv(COLORCHOOSER n, int h, int s, int v) { - return reinterpret_cast<Fl_Color_Chooser*>(n)->hsv(h,s,v); + return static_cast<Fl_Color_Chooser*>(n)->hsv(h,s,v); } @@ -106,22 +106,22 @@ void fl_color_chooser_rgb2hsv(double r, double g, double b, double &h, double &s int fl_color_chooser_get_mode(COLORCHOOSER n) { - return reinterpret_cast<Fl_Color_Chooser*>(n)->mode(); + return static_cast<Fl_Color_Chooser*>(n)->mode(); } void fl_color_chooser_set_mode(COLORCHOOSER n, int m) { - reinterpret_cast<Fl_Color_Chooser*>(n)->mode(m); + static_cast<Fl_Color_Chooser*>(n)->mode(m); } void fl_color_chooser_draw(COLORCHOOSER n) { - reinterpret_cast<My_Color_Chooser*>(n)->Fl_Color_Chooser::draw(); + static_cast<My_Color_Chooser*>(n)->Fl_Color_Chooser::draw(); } int fl_color_chooser_handle(COLORCHOOSER n, int e) { - return reinterpret_cast<My_Color_Chooser*>(n)->Fl_Color_Chooser::handle(e); + return static_cast<My_Color_Chooser*>(n)->Fl_Color_Chooser::handle(e); } diff --git a/src/c_fl_copy_surface.cpp b/src/c_fl_copy_surface.cpp index ff88735..a13b314 100644 --- a/src/c_fl_copy_surface.cpp +++ b/src/c_fl_copy_surface.cpp @@ -14,42 +14,42 @@ // Flattened C API -COPY_SURFACE new_fl_copy_surface(int w, int h) { +COPYSURFACE new_fl_copy_surface(int w, int h) { Fl_Copy_Surface *c = new Fl_Copy_Surface(w,h); return c; } -void free_fl_copy_surface(COPY_SURFACE c) { - delete reinterpret_cast<Fl_Copy_Surface*>(c); +void free_fl_copy_surface(COPYSURFACE c) { + delete static_cast<Fl_Copy_Surface*>(c); } -int fl_copy_surface_get_w(COPY_SURFACE c) { - return reinterpret_cast<Fl_Copy_Surface*>(c)->w(); +int fl_copy_surface_get_w(COPYSURFACE c) { + return static_cast<Fl_Copy_Surface*>(c)->w(); } -int fl_copy_surface_get_h(COPY_SURFACE c) { - return reinterpret_cast<Fl_Copy_Surface*>(c)->h(); +int fl_copy_surface_get_h(COPYSURFACE c) { + return static_cast<Fl_Copy_Surface*>(c)->h(); } -void fl_copy_surface_draw(COPY_SURFACE c, void * w, int dx, int dy) { - reinterpret_cast<Fl_Copy_Surface*>(c)->draw(reinterpret_cast<Fl_Widget*>(w),dx,dy); +void fl_copy_surface_draw(COPYSURFACE c, void * w, int dx, int dy) { + static_cast<Fl_Copy_Surface*>(c)->draw(static_cast<Fl_Widget*>(w),dx,dy); } -void fl_copy_surface_draw_decorated_window(COPY_SURFACE c, void * w, int dx, int dy) { - reinterpret_cast<Fl_Copy_Surface*>(c)->draw_decorated_window(reinterpret_cast<Fl_Window*>(w),dx,dy); +void fl_copy_surface_draw_decorated_window(COPYSURFACE c, void * w, int dx, int dy) { + static_cast<Fl_Copy_Surface*>(c)->draw_decorated_window(static_cast<Fl_Window*>(w),dx,dy); } -void fl_copy_surface_set_current(COPY_SURFACE c) { - reinterpret_cast<Fl_Copy_Surface*>(c)->set_current(); +void fl_copy_surface_set_current(COPYSURFACE c) { + static_cast<Fl_Copy_Surface*>(c)->set_current(); } diff --git a/src/c_fl_copy_surface.h b/src/c_fl_copy_surface.h index ed74e39..81d14b8 100644 --- a/src/c_fl_copy_surface.h +++ b/src/c_fl_copy_surface.h @@ -8,22 +8,22 @@ #define CL_COPY_SURFACE_GUARD -typedef void* COPY_SURFACE; +typedef void* COPYSURFACE; -extern "C" COPY_SURFACE new_fl_copy_surface(int w, int h); -extern "C" void free_fl_copy_surface(COPY_SURFACE c); +extern "C" COPYSURFACE new_fl_copy_surface(int w, int h); +extern "C" void free_fl_copy_surface(COPYSURFACE c); -extern "C" int fl_copy_surface_get_w(COPY_SURFACE c); -extern "C" int fl_copy_surface_get_h(COPY_SURFACE c); +extern "C" int fl_copy_surface_get_w(COPYSURFACE c); +extern "C" int fl_copy_surface_get_h(COPYSURFACE c); -extern "C" void fl_copy_surface_draw(COPY_SURFACE c, void * w, int dx, int dy); -extern "C" void fl_copy_surface_draw_decorated_window(COPY_SURFACE c, void * w, int dx, int dy); +extern "C" void fl_copy_surface_draw(COPYSURFACE c, void * w, int dx, int dy); +extern "C" void fl_copy_surface_draw_decorated_window(COPYSURFACE c, void * w, int dx, int dy); -extern "C" void fl_copy_surface_set_current(COPY_SURFACE c); +extern "C" void fl_copy_surface_set_current(COPYSURFACE c); #endif diff --git a/src/c_fl_counter.cpp b/src/c_fl_counter.cpp index df8130e..b4e0cdf 100644 --- a/src/c_fl_counter.cpp +++ b/src/c_fl_counter.cpp @@ -50,64 +50,64 @@ COUNTER new_fl_counter(int x, int y, int w, int h, char* label) { } void free_fl_counter(COUNTER c) { - delete reinterpret_cast<My_Counter*>(c); + delete static_cast<My_Counter*>(c); } double fl_counter_get_step(COUNTER c) { - return reinterpret_cast<Fl_Counter*>(c)->step(); + return static_cast<Fl_Counter*>(c)->step(); } void fl_counter_set_step_top(COUNTER c, double t) { - reinterpret_cast<Fl_Counter*>(c)->step(t); + static_cast<Fl_Counter*>(c)->step(t); } void fl_counter_set_lstep(COUNTER c, double t) { - reinterpret_cast<Fl_Counter*>(c)->lstep(t); + static_cast<Fl_Counter*>(c)->lstep(t); } void fl_counter_set_step_both(COUNTER c, double s, double l) { - reinterpret_cast<Fl_Counter*>(c)->step(s, l); + static_cast<Fl_Counter*>(c)->step(s, l); } unsigned int fl_counter_get_textcolor(COUNTER c) { - return reinterpret_cast<Fl_Counter*>(c)->textcolor(); + return static_cast<Fl_Counter*>(c)->textcolor(); } void fl_counter_set_textcolor(COUNTER c, unsigned int t) { - reinterpret_cast<Fl_Counter*>(c)->textcolor(t); + static_cast<Fl_Counter*>(c)->textcolor(t); } int fl_counter_get_textfont(COUNTER c) { - return reinterpret_cast<Fl_Counter*>(c)->textfont(); + return static_cast<Fl_Counter*>(c)->textfont(); } void fl_counter_set_textfont(COUNTER c, int t) { - reinterpret_cast<Fl_Counter*>(c)->textfont(t); + static_cast<Fl_Counter*>(c)->textfont(t); } int fl_counter_get_textsize(COUNTER c) { - return reinterpret_cast<Fl_Counter*>(c)->textsize(); + return static_cast<Fl_Counter*>(c)->textsize(); } void fl_counter_set_textsize(COUNTER c, int t) { - reinterpret_cast<Fl_Counter*>(c)->textsize(t); + static_cast<Fl_Counter*>(c)->textsize(t); } void fl_counter_draw(COUNTER c) { - reinterpret_cast<My_Counter*>(c)->Fl_Counter::draw(); + static_cast<My_Counter*>(c)->Fl_Counter::draw(); } int fl_counter_handle(COUNTER c, int e) { - return reinterpret_cast<My_Counter*>(c)->Fl_Counter::handle(e); + return static_cast<My_Counter*>(c)->Fl_Counter::handle(e); } diff --git a/src/c_fl_dial.cpp b/src/c_fl_dial.cpp index 8e32820..34c6df8 100644 --- a/src/c_fl_dial.cpp +++ b/src/c_fl_dial.cpp @@ -62,51 +62,51 @@ DIAL new_fl_dial(int x, int y, int w, int h, char* label) { } void free_fl_dial(DIAL v) { - delete reinterpret_cast<My_Dial*>(v); + delete static_cast<My_Dial*>(v); } short fl_dial_get_angle1(DIAL v) { - return reinterpret_cast<Fl_Dial*>(v)->angle1(); + return static_cast<Fl_Dial*>(v)->angle1(); } void fl_dial_set_angle1(DIAL v, short t) { - reinterpret_cast<Fl_Dial*>(v)->angle1(t); + static_cast<Fl_Dial*>(v)->angle1(t); } short fl_dial_get_angle2(DIAL v) { - return reinterpret_cast<Fl_Dial*>(v)->angle2(); + return static_cast<Fl_Dial*>(v)->angle2(); } void fl_dial_set_angle2(DIAL v, short t) { - reinterpret_cast<Fl_Dial*>(v)->angle2(t); + static_cast<Fl_Dial*>(v)->angle2(t); } void fl_dial_set_angles(DIAL v, short a, short b) { - reinterpret_cast<Fl_Dial*>(v)->angles(a,b); + static_cast<Fl_Dial*>(v)->angles(a,b); } void fl_dial_draw(DIAL v) { - reinterpret_cast<My_Dial*>(v)->Fl_Dial::draw(); + static_cast<My_Dial*>(v)->Fl_Dial::draw(); } void fl_dial_draw2(DIAL v, int x, int y, int w, int h) { void (Fl_Dial::*mydraw)(int,int,int,int) = &Friend_Dial::draw; - (reinterpret_cast<Fl_Dial*>(v)->*mydraw)(x, y, w, h); + (static_cast<Fl_Dial*>(v)->*mydraw)(x, y, w, h); } int fl_dial_handle(DIAL v, int e) { - return reinterpret_cast<My_Dial*>(v)->Fl_Dial::handle(e); + return static_cast<My_Dial*>(v)->Fl_Dial::handle(e); } int fl_dial_handle2(DIAL v, int e, int x, int y, int w, int h) { int (Fl_Dial::*myhandle)(int,int,int,int,int) = &Friend_Dial::handle; - return (reinterpret_cast<Fl_Dial*>(v)->*myhandle)(e, x, y, w, h); + return (static_cast<Fl_Dial*>(v)->*myhandle)(e, x, y, w, h); } diff --git a/src/c_fl_display_device.cpp b/src/c_fl_display_device.cpp index 9c88151..f4f53bf 100644 --- a/src/c_fl_display_device.cpp +++ b/src/c_fl_display_device.cpp @@ -11,12 +11,12 @@ DISPLAYDEVICE new_fl_display_device(void * g) { - Fl_Display_Device *d = new Fl_Display_Device(reinterpret_cast<Fl_Graphics_Driver*>(g)); + Fl_Display_Device *d = new Fl_Display_Device(static_cast<Fl_Graphics_Driver*>(g)); return d; } void free_fl_display_device(DISPLAYDEVICE d) { - delete reinterpret_cast<Fl_Display_Device*>(d); + delete static_cast<Fl_Display_Device*>(d); } diff --git a/src/c_fl_double_window.cpp b/src/c_fl_double_window.cpp index 93c3f49..67db73b 100644 --- a/src/c_fl_double_window.cpp +++ b/src/c_fl_double_window.cpp @@ -66,49 +66,49 @@ DOUBLEWINDOW new_fl_double_window2(int w, int h, char* label) { } void free_fl_double_window(DOUBLEWINDOW d) { - delete reinterpret_cast<My_Double_Window*>(d); + delete static_cast<My_Double_Window*>(d); } void fl_double_window_show(DOUBLEWINDOW d) { - reinterpret_cast<Fl_Double_Window*>(d)->show(); + static_cast<Fl_Double_Window*>(d)->show(); } void fl_double_window_show2(DOUBLEWINDOW d, int c, void * v) { - reinterpret_cast<Fl_Double_Window*>(d)->show(c, static_cast<char**>(v)); + static_cast<Fl_Double_Window*>(d)->show(c, static_cast<char**>(v)); } void fl_double_window_hide(DOUBLEWINDOW d) { - reinterpret_cast<Fl_Double_Window*>(d)->hide(); + static_cast<Fl_Double_Window*>(d)->hide(); } void fl_double_window_flush(DOUBLEWINDOW d) { - reinterpret_cast<Fl_Double_Window*>(d)->flush(); + static_cast<Fl_Double_Window*>(d)->flush(); } void fl_double_window_flush2(DOUBLEWINDOW d, int e) { void (Fl_Double_Window::*myflush)(int) = &Friend_Double_Window::flush; - (reinterpret_cast<Fl_Double_Window*>(d)->*myflush)(e); + (static_cast<Fl_Double_Window*>(d)->*myflush)(e); } void fl_double_window_resize(DOUBLEWINDOW d, int x, int y, int w, int h) { - reinterpret_cast<Fl_Double_Window*>(d)->resize(x, y, w, h); + static_cast<Fl_Double_Window*>(d)->resize(x, y, w, h); } void fl_double_window_draw(DOUBLEWINDOW n) { - reinterpret_cast<My_Double_Window*>(n)->Fl_Double_Window::draw(); + static_cast<My_Double_Window*>(n)->Fl_Double_Window::draw(); } int fl_double_window_handle(DOUBLEWINDOW n, int e) { - return reinterpret_cast<My_Double_Window*>(n)->Fl_Double_Window::handle(e); + return static_cast<My_Double_Window*>(n)->Fl_Double_Window::handle(e); } diff --git a/src/c_fl_draw.cpp b/src/c_fl_draw.cpp index a649ceb..ff5477c 100644 --- a/src/c_fl_draw.cpp +++ b/src/c_fl_draw.cpp @@ -16,7 +16,7 @@ void fl_draw_reset_spot() { } void fl_draw_set_spot(int f, int s, int x, int y, int w, int h, void * ptr) { - fl_set_spot(f, s, x, y, w, h, reinterpret_cast<Fl_Window*>(ptr)); + fl_set_spot(f, s, x, y, w, h, static_cast<Fl_Window*>(ptr)); } void fl_draw_set_status(int x, int y, int w, int h) { @@ -201,7 +201,7 @@ void fl_draw_vertex(double x, double y) { void fl_draw_draw_image(void * data, int x, int y, int w, int h, int d, int l) { - fl_draw_image(reinterpret_cast<uchar*>(data), x, y, w, h, d, l); + fl_draw_image(static_cast<uchar*>(data), x, y, w, h, d, l); } void fl_draw_draw_image2(void * func, void * data, int x, int y, int w, int h, int d) { @@ -209,7 +209,7 @@ void fl_draw_draw_image2(void * func, void * data, int x, int y, int w, int h, i } void fl_draw_draw_image_mono(void * data, int x, int y, int w, int h, int d, int l) { - fl_draw_image_mono(reinterpret_cast<uchar*>(data), x, y, w, h, d, l); + fl_draw_image_mono(static_cast<uchar*>(data), x, y, w, h, d, l); } void fl_draw_draw_image_mono2(void * func, void * data, int x, int y, int w, int h, int d) { @@ -217,7 +217,7 @@ void fl_draw_draw_image_mono2(void * func, void * data, int x, int y, int w, int } void * fl_draw_read_image(void * data, int x, int y, int w, int h, int alpha) { - return fl_read_image(reinterpret_cast<uchar*>(data), x, y, w, h, alpha); + return fl_read_image(static_cast<uchar*>(data), x, y, w, h, alpha); } diff --git a/src/c_fl_draw.h b/src/c_fl_draw.h index 50084f4..89f9428 100644 --- a/src/c_fl_draw.h +++ b/src/c_fl_draw.h @@ -8,8 +8,6 @@ #define FL_DRAW_GUARD - - extern "C" void fl_draw_reset_spot(); extern "C" void fl_draw_set_spot(int f, int s, int x, int y, int w, int h, void * ptr); extern "C" void fl_draw_set_status(int x, int y, int w, int h); @@ -136,3 +134,4 @@ extern "C" void fl_draw_end_polygon(); #endif + diff --git a/src/c_fl_event.cpp b/src/c_fl_event.cpp index c5d7651..cdb8185 100644 --- a/src/c_fl_event.cpp +++ b/src/c_fl_event.cpp @@ -21,7 +21,7 @@ void fl_event_set_event_dispatch(void * f) { } int fl_event_handle(int e, void * w) { - return Fl::handle_(e, reinterpret_cast<Fl_Window*>(w)); + return Fl::handle_(e, static_cast<Fl_Window*>(w)); } @@ -32,7 +32,7 @@ void * fl_event_get_grab() { } void fl_event_set_grab(void * w) { - Fl::grab(reinterpret_cast<Fl_Window*>(w)); + Fl::grab(static_cast<Fl_Window*>(w)); } void * fl_event_get_pushed() { @@ -40,7 +40,7 @@ void * fl_event_get_pushed() { } void fl_event_set_pushed(void * w) { - Fl::pushed(reinterpret_cast<Fl_Widget*>(w)); + Fl::pushed(static_cast<Fl_Widget*>(w)); } void * fl_event_get_belowmouse() { @@ -48,7 +48,7 @@ void * fl_event_get_belowmouse() { } void fl_event_set_belowmouse(void * w) { - Fl::belowmouse(reinterpret_cast<Fl_Widget*>(w)); + Fl::belowmouse(static_cast<Fl_Widget*>(w)); } void * fl_event_get_focus() { @@ -56,7 +56,7 @@ void * fl_event_get_focus() { } void fl_event_set_focus(void * w) { - Fl::focus(reinterpret_cast<Fl_Widget*>(w)); + Fl::focus(static_cast<Fl_Widget*>(w)); } diff --git a/src/c_fl_event.h b/src/c_fl_event.h index 58c8314..24ef7c9 100644 --- a/src/c_fl_event.h +++ b/src/c_fl_event.h @@ -8,8 +8,6 @@ #define FL_EVENT_GUARD - - extern "C" void fl_event_add_handler(void * f); extern "C" void fl_event_set_event_dispatch(void * f); extern "C" int fl_event_handle(int e, void * w); @@ -65,3 +63,4 @@ extern "C" int fl_event_shift(); #endif + diff --git a/src/c_fl_file_browser.cpp b/src/c_fl_file_browser.cpp index 8b5b632..2e4f4c9 100644 --- a/src/c_fl_file_browser.cpp +++ b/src/c_fl_file_browser.cpp @@ -191,49 +191,49 @@ FILEBROWSER new_fl_file_browser(int x, int y, int w, int h, char * label) { } void free_fl_file_browser(FILEBROWSER b) { - delete reinterpret_cast<My_File_Browser*>(b); + delete static_cast<My_File_Browser*>(b); } int fl_file_browser_load(FILEBROWSER b, const char * d, void * s) { - return reinterpret_cast<Fl_File_Browser*>(b)->load(d, reinterpret_cast<Fl_File_Sort_F*>(s)); + return static_cast<Fl_File_Browser*>(b)->load(d, reinterpret_cast<Fl_File_Sort_F*>(s)); } int fl_file_browser_get_filetype(FILEBROWSER b) { - return reinterpret_cast<Fl_File_Browser*>(b)->filetype(); + return static_cast<Fl_File_Browser*>(b)->filetype(); } void fl_file_browser_set_filetype(FILEBROWSER b, int f) { - reinterpret_cast<Fl_File_Browser*>(b)->filetype(f); + static_cast<Fl_File_Browser*>(b)->filetype(f); } const char * fl_file_browser_get_filter(FILEBROWSER b) { - return reinterpret_cast<Fl_File_Browser*>(b)->filter(); + return static_cast<Fl_File_Browser*>(b)->filter(); } void fl_file_browser_set_filter(FILEBROWSER b, const char * f) { - reinterpret_cast<Fl_File_Browser*>(b)->filter(f); + static_cast<Fl_File_Browser*>(b)->filter(f); } unsigned char fl_file_browser_get_iconsize(FILEBROWSER b) { - return reinterpret_cast<Fl_File_Browser*>(b)->iconsize(); + return static_cast<Fl_File_Browser*>(b)->iconsize(); } void fl_file_browser_set_iconsize(FILEBROWSER b, unsigned int i) { - reinterpret_cast<Fl_File_Browser*>(b)->iconsize(i); + static_cast<Fl_File_Browser*>(b)->iconsize(i); } int fl_file_browser_get_textsize(FILEBROWSER b) { - return reinterpret_cast<Fl_File_Browser*>(b)->textsize(); + return static_cast<Fl_File_Browser*>(b)->textsize(); } void fl_file_browser_set_textsize(FILEBROWSER b, int s) { - reinterpret_cast<Fl_File_Browser*>(b)->textsize(s); + static_cast<Fl_File_Browser*>(b)->textsize(s); } @@ -243,89 +243,89 @@ void fl_file_browser_set_textsize(FILEBROWSER b, int s) { int fl_file_browser_full_height(FILEBROWSER c) { - // return reinterpret_cast<My_File_Browser*>(c)->Fl_File_Browser::full_height(); - return (reinterpret_cast<Fl_File_Browser*>(c)->*(&Friend_Browser::full_height))(); + // return static_cast<My_File_Browser*>(c)->Fl_File_Browser::full_height(); + return (static_cast<Fl_File_Browser*>(c)->*(&Friend_Browser::full_height))(); } int fl_file_browser_incr_height(FILEBROWSER c) { - // return reinterpret_cast<My_File_Browser*>(c)->Fl_File_Browser::incr_height(); - return (reinterpret_cast<Fl_File_Browser*>(c)->*(&Friend_Browser::incr_height))(); + // return static_cast<My_File_Browser*>(c)->Fl_File_Browser::incr_height(); + return (static_cast<Fl_File_Browser*>(c)->*(&Friend_Browser::incr_height))(); } int fl_file_browser_item_width(FILEBROWSER b, void * item) { - // return reinterpret_cast<My_File_Browser*>(b)->Fl_File_Browser::item_width(item); - return (reinterpret_cast<Fl_File_Browser*>(b)->*(&Friend_Browser::item_width))(item); + // return static_cast<My_File_Browser*>(b)->Fl_File_Browser::item_width(item); + return (static_cast<Fl_File_Browser*>(b)->*(&Friend_Browser::item_width))(item); } int fl_file_browser_item_height(FILEBROWSER b, void * item) { - // return reinterpret_cast<My_File_Browser*>(b)->Fl_File_Browser::item_height(item); - return (reinterpret_cast<My_File_Browser*>(b)->*(&Friend_Browser::item_height))(item); + // return static_cast<My_File_Browser*>(b)->Fl_File_Browser::item_height(item); + return (static_cast<Fl_File_Browser*>(b)->*(&Friend_Browser::item_height))(item); } void * fl_file_browser_item_first(FILEBROWSER b) { - return reinterpret_cast<My_File_Browser*>(b)->Fl_File_Browser::item_first(); + return static_cast<My_File_Browser*>(b)->Fl_File_Browser::item_first(); } void * fl_file_browser_item_last(FILEBROWSER b) { - return reinterpret_cast<My_File_Browser*>(b)->Fl_File_Browser::item_last(); + return static_cast<My_File_Browser*>(b)->Fl_File_Browser::item_last(); } void * fl_file_browser_item_next(FILEBROWSER b, void * item) { - return reinterpret_cast<My_File_Browser*>(b)->Fl_File_Browser::item_next(item); + return static_cast<My_File_Browser*>(b)->Fl_File_Browser::item_next(item); } void * fl_file_browser_item_prev(FILEBROWSER b, void * item) { - return reinterpret_cast<My_File_Browser*>(b)->Fl_File_Browser::item_prev(item); + return static_cast<My_File_Browser*>(b)->Fl_File_Browser::item_prev(item); } void * fl_file_browser_item_at(FILEBROWSER b, int index) { - return reinterpret_cast<My_File_Browser*>(b)->Fl_File_Browser::item_at(index); + return static_cast<My_File_Browser*>(b)->Fl_File_Browser::item_at(index); } void fl_file_browser_item_select(FILEBROWSER b, void * item, int val) { - reinterpret_cast<My_File_Browser*>(b)->Fl_File_Browser::item_select(item, val); + static_cast<My_File_Browser*>(b)->Fl_File_Browser::item_select(item, val); } int fl_file_browser_item_selected(FILEBROWSER b, void * item) { - return reinterpret_cast<My_File_Browser*>(b)->Fl_File_Browser::item_selected(item); + return static_cast<My_File_Browser*>(b)->Fl_File_Browser::item_selected(item); } void fl_file_browser_item_swap(FILEBROWSER b, void * x, void * y) { - reinterpret_cast<My_File_Browser*>(b)->Fl_File_Browser::item_swap(x, y); + static_cast<My_File_Browser*>(b)->Fl_File_Browser::item_swap(x, y); } const char * fl_file_browser_item_text(FILEBROWSER b, void * item) { - return reinterpret_cast<My_File_Browser*>(b)->Fl_File_Browser::item_text(item); + return static_cast<My_File_Browser*>(b)->Fl_File_Browser::item_text(item); } void fl_file_browser_item_draw(FILEBROWSER b, void * item, int x, int y, int w, int h) { - // reinterpret_cast<My_File_Browser*>(b)->Fl_File_Browser::item_draw(item, x, y, w, h); - (reinterpret_cast<Fl_File_Browser*>(b)->*(&Friend_Browser::item_draw))(item, x, y, w, h); + // static_cast<My_File_Browser*>(b)->Fl_File_Browser::item_draw(item, x, y, w, h); + (static_cast<Fl_File_Browser*>(b)->*(&Friend_Browser::item_draw))(item, x, y, w, h); } int fl_file_browser_full_width(FILEBROWSER c) { - return reinterpret_cast<My_File_Browser*>(c)->Fl_File_Browser::full_width(); + return static_cast<My_File_Browser*>(c)->Fl_File_Browser::full_width(); } int fl_file_browser_item_quick_height(FILEBROWSER c, void * i) { - return reinterpret_cast<My_File_Browser*>(c)->Fl_File_Browser::item_quick_height(i); + return static_cast<My_File_Browser*>(c)->Fl_File_Browser::item_quick_height(i); } void fl_file_browser_draw(FILEBROWSER b) { - reinterpret_cast<My_File_Browser*>(b)->Fl_File_Browser::draw(); + static_cast<My_File_Browser*>(b)->Fl_File_Browser::draw(); } int fl_file_browser_handle(FILEBROWSER b, int e) { - return reinterpret_cast<My_File_Browser*>(b)->Fl_File_Browser::handle(e); + return static_cast<My_File_Browser*>(b)->Fl_File_Browser::handle(e); } diff --git a/src/c_fl_file_chooser.cpp b/src/c_fl_file_chooser.cpp index 3ca16e2..bdb35b0 100644 --- a/src/c_fl_file_chooser.cpp +++ b/src/c_fl_file_chooser.cpp @@ -39,33 +39,33 @@ FILECHOOSER new_fl_file_chooser(const char * n, const char * p, int k, const cha } void free_fl_file_chooser(FILECHOOSER f) { - delete reinterpret_cast<Fl_File_Chooser*>(f); + delete static_cast<Fl_File_Chooser*>(f); } void * fl_file_chooser_get_user_data(FILECHOOSER f) { - return reinterpret_cast<Fl_File_Chooser*>(f)->user_data(); + return static_cast<Fl_File_Chooser*>(f)->user_data(); } void fl_file_chooser_set_user_data(FILECHOOSER f, void * ud) { - reinterpret_cast<Fl_File_Chooser*>(f)->user_data(ud); + static_cast<Fl_File_Chooser*>(f)->user_data(ud); } void * fl_file_chooser_newbutton(FILECHOOSER f) { - return reinterpret_cast<Fl_File_Chooser*>(f)->newButton; + return static_cast<Fl_File_Chooser*>(f)->newButton; } void * fl_file_chooser_previewbutton(FILECHOOSER f) { - return reinterpret_cast<Fl_File_Chooser*>(f)->previewButton; + return static_cast<Fl_File_Chooser*>(f)->previewButton; } void * fl_file_chooser_showhiddenbutton(FILECHOOSER f) { - return reinterpret_cast<Fl_File_Chooser*>(f)->showHiddenButton; + return static_cast<Fl_File_Chooser*>(f)->showHiddenButton; } @@ -187,154 +187,154 @@ void fl_file_chooser_set_show_label(const char * s) { void * fl_file_chooser_add_extra(FILECHOOSER f, void * w) { - return reinterpret_cast<Fl_File_Chooser*>(f)->add_extra(reinterpret_cast<Fl_Widget*>(w)); + return static_cast<Fl_File_Chooser*>(f)->add_extra(static_cast<Fl_Widget*>(w)); } typedef void (*Chooser_Callback)(Fl_File_Chooser *, void *); void fl_file_chooser_callback(FILECHOOSER f, void * c, void * u) { - reinterpret_cast<Fl_File_Chooser*>(f)->callback(reinterpret_cast<Chooser_Callback>(c), u); + static_cast<Fl_File_Chooser*>(f)->callback(reinterpret_cast<Chooser_Callback>(c), u); } unsigned int fl_file_chooser_get_color(FILECHOOSER f) { - return reinterpret_cast<Fl_File_Chooser*>(f)->color(); + return static_cast<Fl_File_Chooser*>(f)->color(); } void fl_file_chooser_set_color(FILECHOOSER f, unsigned int c) { - reinterpret_cast<Fl_File_Chooser*>(f)->color(c); + static_cast<Fl_File_Chooser*>(f)->color(c); } unsigned char fl_file_chooser_get_iconsize(FILECHOOSER f) { - return reinterpret_cast<Fl_File_Chooser*>(f)->iconsize(); + return static_cast<Fl_File_Chooser*>(f)->iconsize(); } void fl_file_chooser_set_iconsize(FILECHOOSER f, unsigned char i) { - reinterpret_cast<Fl_File_Chooser*>(f)->iconsize(i); + static_cast<Fl_File_Chooser*>(f)->iconsize(i); } const char * fl_file_chooser_get_label(FILECHOOSER f) { - return reinterpret_cast<Fl_File_Chooser*>(f)->label(); + return static_cast<Fl_File_Chooser*>(f)->label(); } void fl_file_chooser_set_label(FILECHOOSER f, const char * t) { - reinterpret_cast<Fl_File_Chooser*>(f)->label(t); + static_cast<Fl_File_Chooser*>(f)->label(t); } const char * fl_file_chooser_get_ok_label(FILECHOOSER f) { - return reinterpret_cast<Fl_File_Chooser*>(f)->ok_label(); + return static_cast<Fl_File_Chooser*>(f)->ok_label(); } void fl_file_chooser_set_ok_label(FILECHOOSER f, const char * t) { - reinterpret_cast<Fl_File_Chooser*>(f)->ok_label(t); + static_cast<Fl_File_Chooser*>(f)->ok_label(t); } int fl_file_chooser_get_preview(FILECHOOSER f) { - return reinterpret_cast<Fl_File_Chooser*>(f)->preview(); + return static_cast<Fl_File_Chooser*>(f)->preview(); } void fl_file_chooser_set_preview(FILECHOOSER f, int p) { - reinterpret_cast<Fl_File_Chooser*>(f)->preview(p); + static_cast<Fl_File_Chooser*>(f)->preview(p); } unsigned int fl_file_chooser_get_textcolor(FILECHOOSER f) { - return reinterpret_cast<Fl_File_Chooser*>(f)->textcolor(); + return static_cast<Fl_File_Chooser*>(f)->textcolor(); } void fl_file_chooser_set_textcolor(FILECHOOSER f, unsigned int c) { - reinterpret_cast<Fl_File_Chooser*>(f)->textcolor(c); + static_cast<Fl_File_Chooser*>(f)->textcolor(c); } int fl_file_chooser_get_textfont(FILECHOOSER f) { - return reinterpret_cast<Fl_File_Chooser*>(f)->textfont(); + return static_cast<Fl_File_Chooser*>(f)->textfont(); } void fl_file_chooser_set_textfont(FILECHOOSER f, int n) { - reinterpret_cast<Fl_File_Chooser*>(f)->textfont(n); + static_cast<Fl_File_Chooser*>(f)->textfont(n); } int fl_file_chooser_get_textsize(FILECHOOSER f) { - return reinterpret_cast<Fl_File_Chooser*>(f)->textsize(); + return static_cast<Fl_File_Chooser*>(f)->textsize(); } void fl_file_chooser_set_textsize(FILECHOOSER f, int s) { - reinterpret_cast<Fl_File_Chooser*>(f)->textsize(s); + static_cast<Fl_File_Chooser*>(f)->textsize(s); } int fl_file_chooser_get_type(FILECHOOSER f) { - return reinterpret_cast<Fl_File_Chooser*>(f)->type(); + return static_cast<Fl_File_Chooser*>(f)->type(); } void fl_file_chooser_set_type(FILECHOOSER f, int t) { - reinterpret_cast<Fl_File_Chooser*>(f)->type(t); + static_cast<Fl_File_Chooser*>(f)->type(t); } int fl_file_chooser_count(FILECHOOSER f) { - return reinterpret_cast<Fl_File_Chooser*>(f)->count(); + return static_cast<Fl_File_Chooser*>(f)->count(); } const char * fl_file_chooser_get_directory(FILECHOOSER f) { - return reinterpret_cast<Fl_File_Chooser*>(f)->directory(); + return static_cast<Fl_File_Chooser*>(f)->directory(); } void fl_file_chooser_set_directory(FILECHOOSER f, const char * v) { - reinterpret_cast<Fl_File_Chooser*>(f)->directory(v); + static_cast<Fl_File_Chooser*>(f)->directory(v); } const char * fl_file_chooser_get_filter(FILECHOOSER f) { - return reinterpret_cast<Fl_File_Chooser*>(f)->filter(); + return static_cast<Fl_File_Chooser*>(f)->filter(); } void fl_file_chooser_set_filter(FILECHOOSER f, const char * v) { - reinterpret_cast<Fl_File_Chooser*>(f)->filter(v); + static_cast<Fl_File_Chooser*>(f)->filter(v); } int fl_file_chooser_get_filter_value(FILECHOOSER f) { - return reinterpret_cast<Fl_File_Chooser*>(f)->filter_value(); + return static_cast<Fl_File_Chooser*>(f)->filter_value(); } void fl_file_chooser_set_filter_value(FILECHOOSER f, int v) { - reinterpret_cast<Fl_File_Chooser*>(f)->filter_value(v); + static_cast<Fl_File_Chooser*>(f)->filter_value(v); } void fl_file_chooser_rescan(FILECHOOSER f) { - reinterpret_cast<Fl_File_Chooser*>(f)->rescan(); + static_cast<Fl_File_Chooser*>(f)->rescan(); } void fl_file_chooser_rescan_keep_filename(FILECHOOSER f) { - reinterpret_cast<Fl_File_Chooser*>(f)->rescan_keep_filename(); + static_cast<Fl_File_Chooser*>(f)->rescan_keep_filename(); } const char * fl_file_chooser_get_value(FILECHOOSER f, int n) { - return reinterpret_cast<Fl_File_Chooser*>(f)->value(n); + return static_cast<Fl_File_Chooser*>(f)->value(n); } void fl_file_chooser_set_value(FILECHOOSER f, const char * v) { - reinterpret_cast<Fl_File_Chooser*>(f)->value(v); + static_cast<Fl_File_Chooser*>(f)->value(v); } void fl_file_chooser_show(FILECHOOSER f) { - reinterpret_cast<Fl_File_Chooser*>(f)->show(); + static_cast<Fl_File_Chooser*>(f)->show(); } void fl_file_chooser_hide(FILECHOOSER f) { - reinterpret_cast<Fl_File_Chooser*>(f)->hide(); + static_cast<Fl_File_Chooser*>(f)->hide(); } int fl_file_chooser_shown(FILECHOOSER f) { - return reinterpret_cast<Fl_File_Chooser*>(f)->shown(); + return static_cast<Fl_File_Chooser*>(f)->shown(); } int fl_file_chooser_visible(FILECHOOSER f) { - return reinterpret_cast<Fl_File_Chooser*>(f)->visible(); + return static_cast<Fl_File_Chooser*>(f)->visible(); } diff --git a/src/c_fl_file_input.cpp b/src/c_fl_file_input.cpp index adf8f37..8d0b15f 100644 --- a/src/c_fl_file_input.cpp +++ b/src/c_fl_file_input.cpp @@ -50,48 +50,48 @@ FILEINPUT new_fl_file_input(int x, int y, int w, int h, char* label) { } void free_fl_file_input(FILEINPUT i) { - delete reinterpret_cast<My_File_Input*>(i); + delete static_cast<My_File_Input*>(i); } int fl_file_input_get_down_box(FILEINPUT i) { - return reinterpret_cast<Fl_File_Input*>(i)->down_box(); + return static_cast<Fl_File_Input*>(i)->down_box(); } void fl_file_input_set_down_box(FILEINPUT i, int t) { - reinterpret_cast<Fl_File_Input*>(i)->down_box(static_cast<Fl_Boxtype>(t)); + static_cast<Fl_File_Input*>(i)->down_box(static_cast<Fl_Boxtype>(t)); } unsigned int fl_file_input_get_errorcolor(FILEINPUT i) { - return reinterpret_cast<Fl_File_Input*>(i)->errorcolor(); + return static_cast<Fl_File_Input*>(i)->errorcolor(); } void fl_file_input_set_errorcolor(FILEINPUT i, unsigned int t) { - reinterpret_cast<Fl_File_Input*>(i)->errorcolor(t); + static_cast<Fl_File_Input*>(i)->errorcolor(t); } const char * fl_file_input_get_value(FILEINPUT i) { - return reinterpret_cast<Fl_File_Input*>(i)->value(); + return static_cast<Fl_File_Input*>(i)->value(); } int fl_file_input_set_value(FILEINPUT i, const char * s, int len) { - return reinterpret_cast<Fl_File_Input*>(i)->value(s,len); + return static_cast<Fl_File_Input*>(i)->value(s,len); } void fl_file_input_draw(FILEINPUT i) { - reinterpret_cast<My_File_Input*>(i)->Fl_File_Input::draw(); + static_cast<My_File_Input*>(i)->Fl_File_Input::draw(); } int fl_file_input_handle(FILEINPUT i, int e) { - return reinterpret_cast<My_File_Input*>(i)->Fl_File_Input::handle(e); + return static_cast<My_File_Input*>(i)->Fl_File_Input::handle(e); } diff --git a/src/c_fl_filename.cpp b/src/c_fl_filename.cpp index 39af3d1..300f4ff 100644 --- a/src/c_fl_filename.cpp +++ b/src/c_fl_filename.cpp @@ -17,12 +17,12 @@ const int fl_path_max = FL_PATH_MAX; void free_filename_file_list(void * l, int n) { - struct dirent ** p = reinterpret_cast<struct dirent **>(l); + struct dirent ** p = static_cast<struct dirent **>(l); fl_filename_free_list(&p, n); } const char * filename_dname(void * l, int n) { - return (reinterpret_cast<struct dirent **>(l)[n])->d_name; + return (static_cast<struct dirent **>(l)[n])->d_name; } @@ -49,7 +49,7 @@ int filename_isdir(const char * name) { } int filename_list(const char * d, void * l, void * f) { - return fl_filename_list(d, reinterpret_cast<struct dirent ***>(l), + return fl_filename_list(d, static_cast<struct dirent ***>(l), reinterpret_cast<Fl_File_Sort_F*>(f)); } diff --git a/src/c_fl_fill_dial.cpp b/src/c_fl_fill_dial.cpp index 43f0167..57fd28b 100644 --- a/src/c_fl_fill_dial.cpp +++ b/src/c_fl_fill_dial.cpp @@ -24,8 +24,8 @@ class My_Fill_Dial : public Fl_Fill_Dial { public: using Fl_Fill_Dial::Fl_Fill_Dial; - friend void fl_fill_dial_draw(FILL_DIAL v); - friend int fl_fill_dial_handle(FILL_DIAL v, int e); + friend void fl_fill_dial_draw(FILLDIAL v); + friend int fl_fill_dial_handle(FILLDIAL v, int e); void draw(); int handle(int e); @@ -44,24 +44,24 @@ int My_Fill_Dial::handle(int e) { // Flattened C API -FILL_DIAL new_fl_fill_dial(int x, int y, int w, int h, char* label) { +FILLDIAL new_fl_fill_dial(int x, int y, int w, int h, char* label) { My_Fill_Dial *v = new My_Fill_Dial(x, y, w, h, label); return v; } -void free_fl_fill_dial(FILL_DIAL v) { - delete reinterpret_cast<My_Fill_Dial*>(v); +void free_fl_fill_dial(FILLDIAL v) { + delete static_cast<My_Fill_Dial*>(v); } -void fl_fill_dial_draw(FILL_DIAL v) { - reinterpret_cast<My_Fill_Dial*>(v)->Fl_Fill_Dial::draw(); +void fl_fill_dial_draw(FILLDIAL v) { + static_cast<My_Fill_Dial*>(v)->Fl_Fill_Dial::draw(); } -int fl_fill_dial_handle(FILL_DIAL v, int e) { - return reinterpret_cast<My_Fill_Dial*>(v)->Fl_Fill_Dial::handle(e); +int fl_fill_dial_handle(FILLDIAL v, int e) { + return static_cast<My_Fill_Dial*>(v)->Fl_Fill_Dial::handle(e); } diff --git a/src/c_fl_fill_dial.h b/src/c_fl_fill_dial.h index 84ecab8..00a8094 100644 --- a/src/c_fl_fill_dial.h +++ b/src/c_fl_fill_dial.h @@ -8,15 +8,15 @@ #define FL_FILL_DIAL_GUARD -typedef void* FILL_DIAL; +typedef void* FILLDIAL; -extern "C" FILL_DIAL new_fl_fill_dial(int x, int y, int w, int h, char* label); -extern "C" void free_fl_fill_dial(FILL_DIAL v); +extern "C" FILLDIAL new_fl_fill_dial(int x, int y, int w, int h, char* label); +extern "C" void free_fl_fill_dial(FILLDIAL v); -extern "C" void fl_fill_dial_draw(FILL_DIAL v); -extern "C" int fl_fill_dial_handle(FILL_DIAL v, int e); +extern "C" void fl_fill_dial_draw(FILLDIAL v); +extern "C" int fl_fill_dial_handle(FILLDIAL v, int e); #endif diff --git a/src/c_fl_fill_slider.cpp b/src/c_fl_fill_slider.cpp index d443684..d5552a4 100644 --- a/src/c_fl_fill_slider.cpp +++ b/src/c_fl_fill_slider.cpp @@ -50,18 +50,18 @@ FILLSLIDER new_fl_fill_slider(int x, int y, int w, int h, char* label) { } void free_fl_fill_slider(FILLSLIDER s) { - delete reinterpret_cast<My_Fill_Slider*>(s); + delete static_cast<My_Fill_Slider*>(s); } void fl_fill_slider_draw(FILLSLIDER s) { - reinterpret_cast<My_Fill_Slider*>(s)->Fl_Fill_Slider::draw(); + static_cast<My_Fill_Slider*>(s)->Fl_Fill_Slider::draw(); } int fl_fill_slider_handle(FILLSLIDER s, int e) { - return reinterpret_cast<My_Fill_Slider*>(s)->Fl_Fill_Slider::handle(e); + return static_cast<My_Fill_Slider*>(s)->Fl_Fill_Slider::handle(e); } diff --git a/src/c_fl_float_input.cpp b/src/c_fl_float_input.cpp index c5ce3e1..eedfa36 100644 --- a/src/c_fl_float_input.cpp +++ b/src/c_fl_float_input.cpp @@ -50,18 +50,18 @@ FLOATINPUT new_fl_float_input(int x, int y, int w, int h, char* label) { } void free_fl_float_input(FLOATINPUT i) { - delete reinterpret_cast<My_Float_Input*>(i); + delete static_cast<My_Float_Input*>(i); } void fl_float_input_draw(FLOATINPUT i) { - reinterpret_cast<My_Float_Input*>(i)->Fl_Float_Input::draw(); + static_cast<My_Float_Input*>(i)->Fl_Float_Input::draw(); } int fl_float_input_handle(FLOATINPUT i, int e) { - return reinterpret_cast<My_Float_Input*>(i)->Fl_Float_Input::handle(e); + return static_cast<My_Float_Input*>(i)->Fl_Float_Input::handle(e); } diff --git a/src/c_fl_gif_image.cpp b/src/c_fl_gif_image.cpp index 142bcc6..9ab5519 100644 --- a/src/c_fl_gif_image.cpp +++ b/src/c_fl_gif_image.cpp @@ -10,12 +10,13 @@ -GIF_IMAGE new_fl_gif_image(const char * f) { +GIFIMAGE new_fl_gif_image(const char * f) { Fl_GIF_Image *j = new Fl_GIF_Image(f); return j; } -void free_fl_gif_image(GIF_IMAGE j) { - delete reinterpret_cast<Fl_GIF_Image*>(j); +void free_fl_gif_image(GIFIMAGE j) { + delete static_cast<Fl_GIF_Image*>(j); } + diff --git a/src/c_fl_gif_image.h b/src/c_fl_gif_image.h index 1aa3721..4d340cd 100644 --- a/src/c_fl_gif_image.h +++ b/src/c_fl_gif_image.h @@ -8,16 +8,13 @@ #define FL_GIF_IMAGE_GUARD +typedef void* GIFIMAGE; -typedef void* GIF_IMAGE; - - - - -extern "C" GIF_IMAGE new_fl_gif_image(const char * f); -extern "C" void free_fl_gif_image(GIF_IMAGE j); +extern "C" GIFIMAGE new_fl_gif_image(const char * f); +extern "C" void free_fl_gif_image(GIFIMAGE j); #endif + diff --git a/src/c_fl_gl_window.cpp b/src/c_fl_gl_window.cpp index ac2d7a5..3d6cbd5 100644 --- a/src/c_fl_gl_window.cpp +++ b/src/c_fl_gl_window.cpp @@ -55,60 +55,60 @@ GLWINDOW new_fl_gl_window2(int w, int h, char* label) { } void free_fl_gl_window(GLWINDOW w) { - delete reinterpret_cast<My_Gl_Window*>(w); + delete static_cast<My_Gl_Window*>(w); } void fl_gl_window_show(GLWINDOW w) { - reinterpret_cast<Fl_Gl_Window*>(w)->show(); + static_cast<Fl_Gl_Window*>(w)->show(); } void fl_gl_window_show2(GLWINDOW w, int c, void * v) { - reinterpret_cast<Fl_Gl_Window*>(w)->show(c, static_cast<char**>(v)); + static_cast<Fl_Gl_Window*>(w)->show(c, static_cast<char**>(v)); } void fl_gl_window_hide(GLWINDOW w) { - reinterpret_cast<Fl_Gl_Window*>(w)->hide(); + static_cast<Fl_Gl_Window*>(w)->hide(); } void fl_gl_window_hide_overlay(GLWINDOW w) { - reinterpret_cast<Fl_Gl_Window*>(w)->hide_overlay(); + static_cast<Fl_Gl_Window*>(w)->hide_overlay(); } void fl_gl_window_flush(GLWINDOW w) { - reinterpret_cast<Fl_Gl_Window*>(w)->flush(); + static_cast<Fl_Gl_Window*>(w)->flush(); } int fl_gl_window_pixel_h(GLWINDOW w) { - return reinterpret_cast<Fl_Gl_Window*>(w)->pixel_h(); + return static_cast<Fl_Gl_Window*>(w)->pixel_h(); } int fl_gl_window_pixel_w(GLWINDOW w) { - return reinterpret_cast<Fl_Gl_Window*>(w)->pixel_w(); + return static_cast<Fl_Gl_Window*>(w)->pixel_w(); } float fl_gl_window_pixels_per_unit(GLWINDOW w) { - return reinterpret_cast<Fl_Gl_Window*>(w)->pixels_per_unit(); + return static_cast<Fl_Gl_Window*>(w)->pixels_per_unit(); } void fl_gl_window_resize(GLWINDOW gw, int x, int y, int w, int h) { - reinterpret_cast<Fl_Gl_Window*>(gw)->resize(x, y, w, h); + static_cast<Fl_Gl_Window*>(gw)->resize(x, y, w, h); } unsigned int fl_gl_window_get_mode(GLWINDOW w) { - return reinterpret_cast<Fl_Gl_Window*>(w)->mode(); + return static_cast<Fl_Gl_Window*>(w)->mode(); } void fl_gl_window_set_mode(GLWINDOW w, unsigned int a) { - reinterpret_cast<Fl_Gl_Window*>(w)->mode(a); + static_cast<Fl_Gl_Window*>(w)->mode(a); } int fl_gl_window_static_can_do(unsigned int m) { @@ -116,76 +116,76 @@ int fl_gl_window_static_can_do(unsigned int m) { } int fl_gl_window_can_do(GLWINDOW w) { - return reinterpret_cast<Fl_Gl_Window*>(w)->can_do(); + return static_cast<Fl_Gl_Window*>(w)->can_do(); } int fl_gl_window_can_do_overlay(GLWINDOW w) { - return reinterpret_cast<Fl_Gl_Window*>(w)->can_do_overlay(); + return static_cast<Fl_Gl_Window*>(w)->can_do_overlay(); } void * fl_gl_window_get_context(GLWINDOW w) { - return reinterpret_cast<Fl_Gl_Window*>(w)->context(); + return static_cast<Fl_Gl_Window*>(w)->context(); } void fl_gl_window_set_context(GLWINDOW w, void * con, int des) { - reinterpret_cast<Fl_Gl_Window*>(w)->context(con, des); + static_cast<Fl_Gl_Window*>(w)->context(con, des); } char fl_gl_window_context_valid(GLWINDOW w) { - return reinterpret_cast<Fl_Gl_Window*>(w)->context_valid(); + return static_cast<Fl_Gl_Window*>(w)->context_valid(); } void fl_gl_window_set_context_valid(GLWINDOW w, char v) { - reinterpret_cast<Fl_Gl_Window*>(w)->context_valid(v); + static_cast<Fl_Gl_Window*>(w)->context_valid(v); } char fl_gl_window_valid(GLWINDOW w) { - return reinterpret_cast<Fl_Gl_Window*>(w)->valid(); + return static_cast<Fl_Gl_Window*>(w)->valid(); } void fl_gl_window_set_valid(GLWINDOW w, char v) { - reinterpret_cast<Fl_Gl_Window*>(w)->valid(v); + static_cast<Fl_Gl_Window*>(w)->valid(v); } void fl_gl_window_invalidate(GLWINDOW w) { - reinterpret_cast<Fl_Gl_Window*>(w)->invalidate(); + static_cast<Fl_Gl_Window*>(w)->invalidate(); } void fl_gl_window_make_current(GLWINDOW w) { - reinterpret_cast<Fl_Gl_Window*>(w)->make_current(); + static_cast<Fl_Gl_Window*>(w)->make_current(); } void fl_gl_window_make_overlay_current(GLWINDOW w) { - reinterpret_cast<Fl_Gl_Window*>(w)->make_overlay_current(); + static_cast<Fl_Gl_Window*>(w)->make_overlay_current(); } void fl_gl_window_ortho(GLWINDOW w) { - reinterpret_cast<Fl_Gl_Window*>(w)->ortho(); + static_cast<Fl_Gl_Window*>(w)->ortho(); } void fl_gl_window_redraw_overlay(GLWINDOW w) { - reinterpret_cast<Fl_Gl_Window*>(w)->redraw_overlay(); + static_cast<Fl_Gl_Window*>(w)->redraw_overlay(); } void fl_gl_window_swap_buffers(GLWINDOW w) { - reinterpret_cast<Fl_Gl_Window*>(w)->swap_buffers(); + static_cast<Fl_Gl_Window*>(w)->swap_buffers(); } void fl_gl_window_draw(GLWINDOW n) { - reinterpret_cast<My_Gl_Window*>(n)->Fl_Gl_Window::draw(); + static_cast<My_Gl_Window*>(n)->Fl_Gl_Window::draw(); } int fl_gl_window_handle(GLWINDOW n, int e) { - return reinterpret_cast<My_Gl_Window*>(n)->Fl_Gl_Window::handle(e); + return static_cast<My_Gl_Window*>(n)->Fl_Gl_Window::handle(e); } diff --git a/src/c_fl_graphics_driver.cpp b/src/c_fl_graphics_driver.cpp index d524aac..56bcf62 100644 --- a/src/c_fl_graphics_driver.cpp +++ b/src/c_fl_graphics_driver.cpp @@ -11,52 +11,53 @@ -unsigned int fl_graphics_driver_color(GRAPHICS_DRIVER g) { - return reinterpret_cast<Fl_Graphics_Driver*>(g)->color(); +unsigned int fl_graphics_driver_color(GRAPHICSDRIVER g) { + return static_cast<Fl_Graphics_Driver*>(g)->color(); } -int fl_graphics_driver_descent(GRAPHICS_DRIVER g) { +int fl_graphics_driver_descent(GRAPHICSDRIVER g) { // virtual so disable dispatch - return reinterpret_cast<Fl_Graphics_Driver*>(g)->Fl_Graphics_Driver::descent(); + return static_cast<Fl_Graphics_Driver*>(g)->Fl_Graphics_Driver::descent(); } -int fl_graphics_driver_height(GRAPHICS_DRIVER g) { +int fl_graphics_driver_height(GRAPHICSDRIVER g) { // virtual so disable dispatch - return reinterpret_cast<Fl_Graphics_Driver*>(g)->Fl_Graphics_Driver::height(); + return static_cast<Fl_Graphics_Driver*>(g)->Fl_Graphics_Driver::height(); } -double fl_graphics_driver_width(GRAPHICS_DRIVER g, unsigned int c) { +double fl_graphics_driver_width(GRAPHICSDRIVER g, unsigned int c) { // virtual so disable dispatch - return reinterpret_cast<Fl_Graphics_Driver*>(g)->Fl_Graphics_Driver::width(c); + return static_cast<Fl_Graphics_Driver*>(g)->Fl_Graphics_Driver::width(c); } -double fl_graphics_driver_width2(GRAPHICS_DRIVER g, const char * s, int l) { +double fl_graphics_driver_width2(GRAPHICSDRIVER g, const char * s, int l) { // virtual so disable dispatch - return reinterpret_cast<Fl_Graphics_Driver*>(g)->Fl_Graphics_Driver::width(s,l); + return static_cast<Fl_Graphics_Driver*>(g)->Fl_Graphics_Driver::width(s,l); } -int fl_graphics_driver_get_font(GRAPHICS_DRIVER g) { - return reinterpret_cast<Fl_Graphics_Driver*>(g)->font(); +int fl_graphics_driver_get_font(GRAPHICSDRIVER g) { + return static_cast<Fl_Graphics_Driver*>(g)->font(); } -int fl_graphics_driver_size(GRAPHICS_DRIVER g) { - return reinterpret_cast<Fl_Graphics_Driver*>(g)->size(); +int fl_graphics_driver_size(GRAPHICSDRIVER g) { + return static_cast<Fl_Graphics_Driver*>(g)->size(); } -void fl_graphics_driver_set_font(GRAPHICS_DRIVER g, int f, int s) { +void fl_graphics_driver_set_font(GRAPHICSDRIVER g, int f, int s) { // virtual so disable dispatch - reinterpret_cast<Fl_Graphics_Driver*>(g)->Fl_Graphics_Driver::font(f,s); + static_cast<Fl_Graphics_Driver*>(g)->Fl_Graphics_Driver::font(f,s); } -void fl_graphics_driver_draw_scaled(GRAPHICS_DRIVER g, void * i, int x, int y, int w, int h) { +void fl_graphics_driver_draw_scaled(GRAPHICSDRIVER g, void * i, int x, int y, int w, int h) { // virtual so disable dispatch - reinterpret_cast<Fl_Graphics_Driver*>(g)->Fl_Graphics_Driver::draw_scaled(reinterpret_cast<Fl_Image*>(i),x,y,w,h); + static_cast<Fl_Graphics_Driver*>(g)->Fl_Graphics_Driver::draw_scaled + (static_cast<Fl_Image*>(i),x,y,w,h); } diff --git a/src/c_fl_graphics_driver.h b/src/c_fl_graphics_driver.h index f68ad1f..e070235 100644 --- a/src/c_fl_graphics_driver.h +++ b/src/c_fl_graphics_driver.h @@ -8,27 +8,25 @@ #define FL_GRAPHICS_DRIVER_GUARD +typedef void* GRAPHICSDRIVER; -typedef void* GRAPHICS_DRIVER; +extern "C" unsigned int fl_graphics_driver_color(GRAPHICSDRIVER g); +extern "C" int fl_graphics_driver_descent(GRAPHICSDRIVER g); +extern "C" int fl_graphics_driver_height(GRAPHICSDRIVER g); +extern "C" double fl_graphics_driver_width(GRAPHICSDRIVER g, unsigned int c); +extern "C" double fl_graphics_driver_width2(GRAPHICSDRIVER g, const char * s, int l); +extern "C" int fl_graphics_driver_get_font(GRAPHICSDRIVER g); +extern "C" int fl_graphics_driver_size(GRAPHICSDRIVER g); +extern "C" void fl_graphics_driver_set_font(GRAPHICSDRIVER g, int f, int s); -extern "C" unsigned int fl_graphics_driver_color(GRAPHICS_DRIVER g); - - -extern "C" int fl_graphics_driver_descent(GRAPHICS_DRIVER g); -extern "C" int fl_graphics_driver_height(GRAPHICS_DRIVER g); -extern "C" double fl_graphics_driver_width(GRAPHICS_DRIVER g, unsigned int c); -extern "C" double fl_graphics_driver_width2(GRAPHICS_DRIVER g, const char * s, int l); -extern "C" int fl_graphics_driver_get_font(GRAPHICS_DRIVER g); -extern "C" int fl_graphics_driver_size(GRAPHICS_DRIVER g); -extern "C" void fl_graphics_driver_set_font(GRAPHICS_DRIVER g, int f, int s); - - -extern "C" void fl_graphics_driver_draw_scaled(GRAPHICS_DRIVER g, void * i, int x, int y, int w, int h); +extern "C" void fl_graphics_driver_draw_scaled(GRAPHICSDRIVER g, void * i, + int x, int y, int w, int h); #endif + diff --git a/src/c_fl_help_dialog.cpp b/src/c_fl_help_dialog.cpp index 5eb719e..850fb07 100644 --- a/src/c_fl_help_dialog.cpp +++ b/src/c_fl_help_dialog.cpp @@ -16,90 +16,90 @@ HELPDIALOG new_fl_help_dialog() { } void free_fl_help_dialog(HELPDIALOG d) { - delete reinterpret_cast<Fl_Help_Dialog*>(d); + delete static_cast<Fl_Help_Dialog*>(d); } void fl_help_dialog_show(HELPDIALOG d) { - reinterpret_cast<Fl_Help_Dialog*>(d)->show(); + static_cast<Fl_Help_Dialog*>(d)->show(); } void fl_help_dialog_show2(HELPDIALOG d, int c, void * v) { - reinterpret_cast<Fl_Help_Dialog*>(d)->show(c, static_cast<char**>(v)); + static_cast<Fl_Help_Dialog*>(d)->show(c, static_cast<char**>(v)); } void fl_help_dialog_hide(HELPDIALOG d) { - reinterpret_cast<Fl_Help_Dialog*>(d)->hide(); + static_cast<Fl_Help_Dialog*>(d)->hide(); } int fl_help_dialog_visible(HELPDIALOG d) { - return reinterpret_cast<Fl_Help_Dialog*>(d)->visible(); + return static_cast<Fl_Help_Dialog*>(d)->visible(); } void fl_help_dialog_set_topline_number(HELPDIALOG d, int n) { - reinterpret_cast<Fl_Help_Dialog*>(d)->topline(n); + static_cast<Fl_Help_Dialog*>(d)->topline(n); } void fl_help_dialog_set_topline_target(HELPDIALOG d, const char * t) { - reinterpret_cast<Fl_Help_Dialog*>(d)->topline(t); + static_cast<Fl_Help_Dialog*>(d)->topline(t); } void fl_help_dialog_load(HELPDIALOG d, const char * n) { - reinterpret_cast<Fl_Help_Dialog*>(d)->load(n); + static_cast<Fl_Help_Dialog*>(d)->load(n); } const char * fl_help_dialog_get_value(HELPDIALOG d) { - return reinterpret_cast<Fl_Help_Dialog*>(d)->value(); + return static_cast<Fl_Help_Dialog*>(d)->value(); } void fl_help_dialog_set_value(HELPDIALOG d, const char * v) { - reinterpret_cast<Fl_Help_Dialog*>(d)->value(v); + static_cast<Fl_Help_Dialog*>(d)->value(v); } int fl_help_dialog_get_textsize(HELPDIALOG d) { - return reinterpret_cast<Fl_Help_Dialog*>(d)->textsize(); + return static_cast<Fl_Help_Dialog*>(d)->textsize(); } void fl_help_dialog_set_textsize(HELPDIALOG d, int s) { - reinterpret_cast<Fl_Help_Dialog*>(d)->textsize(s); + static_cast<Fl_Help_Dialog*>(d)->textsize(s); } int fl_help_dialog_get_x(HELPDIALOG d) { - return reinterpret_cast<Fl_Help_Dialog*>(d)->x(); + return static_cast<Fl_Help_Dialog*>(d)->x(); } int fl_help_dialog_get_y(HELPDIALOG d) { - return reinterpret_cast<Fl_Help_Dialog*>(d)->y(); + return static_cast<Fl_Help_Dialog*>(d)->y(); } int fl_help_dialog_get_w(HELPDIALOG d) { - return reinterpret_cast<Fl_Help_Dialog*>(d)->w(); + return static_cast<Fl_Help_Dialog*>(d)->w(); } int fl_help_dialog_get_h(HELPDIALOG d) { - return reinterpret_cast<Fl_Help_Dialog*>(d)->h(); + return static_cast<Fl_Help_Dialog*>(d)->h(); } void fl_help_dialog_resize(HELPDIALOG d, int xx, int yy, int ww, int hh) { - reinterpret_cast<Fl_Help_Dialog*>(d)->resize(xx, yy, ww, hh); + static_cast<Fl_Help_Dialog*>(d)->resize(xx, yy, ww, hh); } void fl_help_dialog_position(HELPDIALOG d, int xx, int yy) { - reinterpret_cast<Fl_Help_Dialog*>(d)->position(xx, yy); + static_cast<Fl_Help_Dialog*>(d)->position(xx, yy); } diff --git a/src/c_fl_help_view.cpp b/src/c_fl_help_view.cpp index 6275052..aa2fd65 100644 --- a/src/c_fl_help_view.cpp +++ b/src/c_fl_help_view.cpp @@ -52,123 +52,123 @@ HELPVIEW new_fl_help_view(int x, int y, int w, int h, char * label) { } void free_fl_help_view(HELPVIEW v) { - delete reinterpret_cast<My_Help_View*>(v); + delete static_cast<My_Help_View*>(v); } void fl_help_view_clear_selection(HELPVIEW v) { - reinterpret_cast<Fl_Help_View*>(v)->clear_selection(); + static_cast<Fl_Help_View*>(v)->clear_selection(); } void fl_help_view_select_all(HELPVIEW v) { - reinterpret_cast<Fl_Help_View*>(v)->select_all(); + static_cast<Fl_Help_View*>(v)->select_all(); } int fl_help_view_find(HELPVIEW v, const char * s, int p) { - return reinterpret_cast<Fl_Help_View*>(v)->find(s, p); + return static_cast<Fl_Help_View*>(v)->find(s, p); } int fl_help_view_get_leftline(HELPVIEW v) { - return reinterpret_cast<Fl_Help_View*>(v)->leftline(); + return static_cast<Fl_Help_View*>(v)->leftline(); } void fl_help_view_set_leftline(HELPVIEW v, int t) { - reinterpret_cast<Fl_Help_View*>(v)->leftline(t); + static_cast<Fl_Help_View*>(v)->leftline(t); } int fl_help_view_get_topline(HELPVIEW v) { - return reinterpret_cast<Fl_Help_View*>(v)->topline(); + return static_cast<Fl_Help_View*>(v)->topline(); } void fl_help_view_set_topline(HELPVIEW v, int t) { - reinterpret_cast<Fl_Help_View*>(v)->topline(t); + static_cast<Fl_Help_View*>(v)->topline(t); } void fl_help_view_set_topline_target(HELPVIEW v, const char * t) { - reinterpret_cast<Fl_Help_View*>(v)->topline(t); + static_cast<Fl_Help_View*>(v)->topline(t); } const char * fl_help_view_directory(HELPVIEW v) { - return reinterpret_cast<Fl_Help_View*>(v)->directory(); + return static_cast<Fl_Help_View*>(v)->directory(); } const char * fl_help_view_filename(HELPVIEW v) { - return reinterpret_cast<Fl_Help_View*>(v)->filename(); + return static_cast<Fl_Help_View*>(v)->filename(); } int fl_help_view_load(HELPVIEW v, const char * f) { - return reinterpret_cast<Fl_Help_View*>(v)->load(f); + return static_cast<Fl_Help_View*>(v)->load(f); } const char * fl_help_view_title(HELPVIEW v) { - return reinterpret_cast<Fl_Help_View*>(v)->title(); + return static_cast<Fl_Help_View*>(v)->title(); } const char * fl_help_view_get_value(HELPVIEW v) { - return reinterpret_cast<Fl_Help_View*>(v)->value(); + return static_cast<Fl_Help_View*>(v)->value(); } void fl_help_view_set_value(HELPVIEW v, const char * t) { - reinterpret_cast<Fl_Help_View*>(v)->value(t); + static_cast<Fl_Help_View*>(v)->value(t); } void fl_help_view_link(HELPVIEW v, void * f) { - reinterpret_cast<Fl_Help_View*>(v)->link(reinterpret_cast<Fl_Help_Func*>(f)); + static_cast<Fl_Help_View*>(v)->link(reinterpret_cast<Fl_Help_Func*>(f)); } int fl_help_view_get_scrollbar_size(HELPVIEW v) { - return reinterpret_cast<Fl_Help_View*>(v)->scrollbar_size(); + return static_cast<Fl_Help_View*>(v)->scrollbar_size(); } void fl_help_view_set_scrollbar_size(HELPVIEW v, int s) { - reinterpret_cast<Fl_Help_View*>(v)->scrollbar_size(s); + static_cast<Fl_Help_View*>(v)->scrollbar_size(s); } int fl_help_view_get_size(HELPVIEW v) { - return reinterpret_cast<Fl_Help_View*>(v)->size(); + return static_cast<Fl_Help_View*>(v)->size(); } void fl_help_view_set_size(HELPVIEW v, int w, int h) { - reinterpret_cast<Fl_Help_View*>(v)->size(w, h); + static_cast<Fl_Help_View*>(v)->size(w, h); } void fl_help_view_resize(HELPVIEW v, int x, int y, int w, int h) { - reinterpret_cast<Fl_Help_View*>(v)->resize(x, y, w, h); + static_cast<Fl_Help_View*>(v)->resize(x, y, w, h); } unsigned int fl_help_view_get_textcolor(HELPVIEW v) { - return reinterpret_cast<Fl_Help_View*>(v)->textcolor(); + return static_cast<Fl_Help_View*>(v)->textcolor(); } void fl_help_view_set_textcolor(HELPVIEW v, unsigned int c) { - reinterpret_cast<Fl_Help_View*>(v)->textcolor(c); + static_cast<Fl_Help_View*>(v)->textcolor(c); } int fl_help_view_get_textfont(HELPVIEW v) { - return reinterpret_cast<Fl_Help_View*>(v)->textfont(); + return static_cast<Fl_Help_View*>(v)->textfont(); } void fl_help_view_set_textfont(HELPVIEW v, int f) { - reinterpret_cast<Fl_Help_View*>(v)->textfont(f); + static_cast<Fl_Help_View*>(v)->textfont(f); } int fl_help_view_get_textsize(HELPVIEW v) { - return reinterpret_cast<Fl_Help_View*>(v)->textsize(); + return static_cast<Fl_Help_View*>(v)->textsize(); } void fl_help_view_set_textsize(HELPVIEW v, int s) { - reinterpret_cast<Fl_Help_View*>(v)->textsize(s); + static_cast<Fl_Help_View*>(v)->textsize(s); } @@ -176,17 +176,17 @@ void fl_help_view_set_textsize(HELPVIEW v, int s) { void fl_help_view_draw(HELPVIEW v) { #if FL_ABI_VERSION >= 10303 - reinterpret_cast<My_Help_View*>(v)->Fl_Help_View::draw(); + static_cast<My_Help_View*>(v)->Fl_Help_View::draw(); #else - reinterpret_cast<My_Help_View*>(v)->Fl_Group::draw(); + static_cast<My_Help_View*>(v)->Fl_Group::draw(); #endif } int fl_help_view_handle(HELPVIEW v, int e) { #if FL_ABI_VERSION >= 10303 - return reinterpret_cast<My_Help_View*>(v)->Fl_Help_View::handle(e); + return static_cast<My_Help_View*>(v)->Fl_Help_View::handle(e); #else - return reinterpret_cast<My_Help_View*>(v)->Fl_Group::handle(e); + return static_cast<My_Help_View*>(v)->Fl_Group::handle(e); #endif } diff --git a/src/c_fl_hold_browser.cpp b/src/c_fl_hold_browser.cpp index e9ccae0..023e9ec 100644 --- a/src/c_fl_hold_browser.cpp +++ b/src/c_fl_hold_browser.cpp @@ -172,7 +172,7 @@ HOLDBROWSER new_fl_hold_browser(int x, int y, int w, int h, char * label) { } void free_fl_hold_browser(HOLDBROWSER b) { - delete reinterpret_cast<My_Hold_Browser*>(b); + delete static_cast<My_Hold_Browser*>(b); } @@ -182,84 +182,84 @@ void free_fl_hold_browser(HOLDBROWSER b) { int fl_hold_browser_full_height(HOLDBROWSER c) { - return reinterpret_cast<My_Hold_Browser*>(c)->Fl_Hold_Browser::full_height(); + return static_cast<My_Hold_Browser*>(c)->Fl_Hold_Browser::full_height(); } int fl_hold_browser_incr_height(HOLDBROWSER c) { - return reinterpret_cast<My_Hold_Browser*>(c)->Fl_Hold_Browser::incr_height(); + return static_cast<My_Hold_Browser*>(c)->Fl_Hold_Browser::incr_height(); } int fl_hold_browser_item_width(HOLDBROWSER b, void * item) { - return reinterpret_cast<My_Hold_Browser*>(b)->Fl_Hold_Browser::item_width(item); + return static_cast<My_Hold_Browser*>(b)->Fl_Hold_Browser::item_width(item); } int fl_hold_browser_item_height(HOLDBROWSER b, void * item) { - return reinterpret_cast<My_Hold_Browser*>(b)->Fl_Hold_Browser::item_height(item); + return static_cast<My_Hold_Browser*>(b)->Fl_Hold_Browser::item_height(item); } void * fl_hold_browser_item_first(HOLDBROWSER b) { - return reinterpret_cast<My_Hold_Browser*>(b)->Fl_Hold_Browser::item_first(); + return static_cast<My_Hold_Browser*>(b)->Fl_Hold_Browser::item_first(); } void * fl_hold_browser_item_last(HOLDBROWSER b) { - return reinterpret_cast<My_Hold_Browser*>(b)->Fl_Hold_Browser::item_last(); + return static_cast<My_Hold_Browser*>(b)->Fl_Hold_Browser::item_last(); } void * fl_hold_browser_item_next(HOLDBROWSER b, void * item) { - return reinterpret_cast<My_Hold_Browser*>(b)->Fl_Hold_Browser::item_next(item); + return static_cast<My_Hold_Browser*>(b)->Fl_Hold_Browser::item_next(item); } void * fl_hold_browser_item_prev(HOLDBROWSER b, void * item) { - return reinterpret_cast<My_Hold_Browser*>(b)->Fl_Hold_Browser::item_prev(item); + return static_cast<My_Hold_Browser*>(b)->Fl_Hold_Browser::item_prev(item); } void * fl_hold_browser_item_at(HOLDBROWSER b, int index) { - return reinterpret_cast<My_Hold_Browser*>(b)->Fl_Hold_Browser::item_at(index); + return static_cast<My_Hold_Browser*>(b)->Fl_Hold_Browser::item_at(index); } void fl_hold_browser_item_select(HOLDBROWSER b, void * item, int val) { - reinterpret_cast<My_Hold_Browser*>(b)->Fl_Hold_Browser::item_select(item, val); + static_cast<My_Hold_Browser*>(b)->Fl_Hold_Browser::item_select(item, val); } int fl_hold_browser_item_selected(HOLDBROWSER b, void * item) { - return reinterpret_cast<My_Hold_Browser*>(b)->Fl_Hold_Browser::item_selected(item); + return static_cast<My_Hold_Browser*>(b)->Fl_Hold_Browser::item_selected(item); } void fl_hold_browser_item_swap(HOLDBROWSER b, void * x, void * y) { - reinterpret_cast<My_Hold_Browser*>(b)->Fl_Hold_Browser::item_swap(x, y); + static_cast<My_Hold_Browser*>(b)->Fl_Hold_Browser::item_swap(x, y); } const char * fl_hold_browser_item_text(HOLDBROWSER b, void * item) { - return reinterpret_cast<My_Hold_Browser*>(b)->Fl_Hold_Browser::item_text(item); + return static_cast<My_Hold_Browser*>(b)->Fl_Hold_Browser::item_text(item); } void fl_hold_browser_item_draw(HOLDBROWSER b, void * item, int x, int y, int w, int h) { - reinterpret_cast<My_Hold_Browser*>(b)->Fl_Hold_Browser::item_draw(item, x, y, w, h); + static_cast<My_Hold_Browser*>(b)->Fl_Hold_Browser::item_draw(item, x, y, w, h); } int fl_hold_browser_full_width(HOLDBROWSER c) { - return reinterpret_cast<My_Hold_Browser*>(c)->Fl_Hold_Browser::full_width(); + return static_cast<My_Hold_Browser*>(c)->Fl_Hold_Browser::full_width(); } int fl_hold_browser_item_quick_height(HOLDBROWSER c, void * i) { - return reinterpret_cast<My_Hold_Browser*>(c)->Fl_Hold_Browser::item_quick_height(i); + return static_cast<My_Hold_Browser*>(c)->Fl_Hold_Browser::item_quick_height(i); } void fl_hold_browser_draw(HOLDBROWSER b) { - reinterpret_cast<My_Hold_Browser*>(b)->Fl_Hold_Browser::draw(); + static_cast<My_Hold_Browser*>(b)->Fl_Hold_Browser::draw(); } int fl_hold_browser_handle(HOLDBROWSER b, int e) { - return reinterpret_cast<My_Hold_Browser*>(b)->Fl_Hold_Browser::handle(e); + return static_cast<My_Hold_Browser*>(b)->Fl_Hold_Browser::handle(e); } diff --git a/src/c_fl_hor_fill_slider.cpp b/src/c_fl_hor_fill_slider.cpp index d146698..c6416a9 100644 --- a/src/c_fl_hor_fill_slider.cpp +++ b/src/c_fl_hor_fill_slider.cpp @@ -50,18 +50,18 @@ HORFILLSLIDER new_fl_hor_fill_slider(int x, int y, int w, int h, char* label) { } void free_fl_hor_fill_slider(HORFILLSLIDER s) { - delete reinterpret_cast<My_Hor_Fill_Slider*>(s); + delete static_cast<My_Hor_Fill_Slider*>(s); } void fl_hor_fill_slider_draw(HORFILLSLIDER s) { - reinterpret_cast<My_Hor_Fill_Slider*>(s)->Fl_Hor_Fill_Slider::draw(); + static_cast<My_Hor_Fill_Slider*>(s)->Fl_Hor_Fill_Slider::draw(); } int fl_hor_fill_slider_handle(HORFILLSLIDER s, int e) { - return reinterpret_cast<My_Hor_Fill_Slider*>(s)->Fl_Hor_Fill_Slider::handle(e); + return static_cast<My_Hor_Fill_Slider*>(s)->Fl_Hor_Fill_Slider::handle(e); } diff --git a/src/c_fl_hor_nice_slider.cpp b/src/c_fl_hor_nice_slider.cpp index e3f828f..141a85b 100644 --- a/src/c_fl_hor_nice_slider.cpp +++ b/src/c_fl_hor_nice_slider.cpp @@ -50,18 +50,18 @@ HORNICESLIDER new_fl_hor_nice_slider(int x, int y, int w, int h, char* label) { } void free_fl_hor_nice_slider(HORNICESLIDER s) { - delete reinterpret_cast<My_Hor_Nice_Slider*>(s); + delete static_cast<My_Hor_Nice_Slider*>(s); } void fl_hor_nice_slider_draw(HORNICESLIDER s) { - reinterpret_cast<My_Hor_Nice_Slider*>(s)->Fl_Hor_Nice_Slider::draw(); + static_cast<My_Hor_Nice_Slider*>(s)->Fl_Hor_Nice_Slider::draw(); } int fl_hor_nice_slider_handle(HORNICESLIDER s, int e) { - return reinterpret_cast<My_Hor_Nice_Slider*>(s)->Fl_Hor_Nice_Slider::handle(e); + return static_cast<My_Hor_Nice_Slider*>(s)->Fl_Hor_Nice_Slider::handle(e); } diff --git a/src/c_fl_hor_value_slider.cpp b/src/c_fl_hor_value_slider.cpp index 0630b12..7f5bc87 100644 --- a/src/c_fl_hor_value_slider.cpp +++ b/src/c_fl_hor_value_slider.cpp @@ -50,18 +50,18 @@ HORVALUESLIDER new_fl_hor_value_slider(int x, int y, int w, int h, char* label) } void free_fl_hor_value_slider(HORVALUESLIDER s) { - delete reinterpret_cast<My_Hor_Value_Slider*>(s); + delete static_cast<My_Hor_Value_Slider*>(s); } void fl_hor_value_slider_draw(HORVALUESLIDER s) { - reinterpret_cast<My_Hor_Value_Slider*>(s)->Fl_Hor_Value_Slider::draw(); + static_cast<My_Hor_Value_Slider*>(s)->Fl_Hor_Value_Slider::draw(); } int fl_hor_value_slider_handle(HORVALUESLIDER s, int e) { - return reinterpret_cast<My_Hor_Value_Slider*>(s)->Fl_Hor_Value_Slider::handle(e); + return static_cast<My_Hor_Value_Slider*>(s)->Fl_Hor_Value_Slider::handle(e); } diff --git a/src/c_fl_horizontal_slider.cpp b/src/c_fl_horizontal_slider.cpp index 2856a21..638502d 100644 --- a/src/c_fl_horizontal_slider.cpp +++ b/src/c_fl_horizontal_slider.cpp @@ -50,18 +50,18 @@ HORIZONTALSLIDER new_fl_horizontal_slider(int x, int y, int w, int h, char* labe } void free_fl_horizontal_slider(HORIZONTALSLIDER s) { - delete reinterpret_cast<My_Horizontal_Slider*>(s); + delete static_cast<My_Horizontal_Slider*>(s); } void fl_horizontal_slider_draw(HORIZONTALSLIDER s) { - reinterpret_cast<My_Horizontal_Slider*>(s)->Fl_Hor_Slider::draw(); + static_cast<My_Horizontal_Slider*>(s)->Fl_Hor_Slider::draw(); } int fl_horizontal_slider_handle(HORIZONTALSLIDER s, int e) { - return reinterpret_cast<My_Horizontal_Slider*>(s)->Fl_Hor_Slider::handle(e); + return static_cast<My_Horizontal_Slider*>(s)->Fl_Hor_Slider::handle(e); } diff --git a/src/c_fl_image.cpp b/src/c_fl_image.cpp index 2aacc02..328c187 100644 --- a/src/c_fl_image.cpp +++ b/src/c_fl_image.cpp @@ -25,7 +25,7 @@ IMAGE new_fl_image(int w, int h, int d) { } void free_fl_image(IMAGE i) { - delete reinterpret_cast<My_Image*>(i); + delete static_cast<My_Image*>(i); } @@ -41,11 +41,11 @@ void fl_image_set_rgb_scaling(int t) { IMAGE fl_image_copy(IMAGE i, int w, int h) { // virtual so disable dispatch - return reinterpret_cast<Fl_Image*>(i)->Fl_Image::copy(w, h); + return static_cast<Fl_Image*>(i)->Fl_Image::copy(w, h); } IMAGE fl_image_copy2(IMAGE i) { - return reinterpret_cast<Fl_Image*>(i)->copy(); + return static_cast<Fl_Image*>(i)->copy(); } @@ -53,23 +53,23 @@ IMAGE fl_image_copy2(IMAGE i) { void fl_image_color_average(IMAGE i, int c, float b) { // virtual so disable dispatch - reinterpret_cast<Fl_Image*>(i)->Fl_Image::color_average(c, b); + static_cast<Fl_Image*>(i)->Fl_Image::color_average(c, b); } void fl_image_desaturate(IMAGE i) { // virtual so disable dispatch - reinterpret_cast<Fl_Image*>(i)->Fl_Image::desaturate(); + static_cast<Fl_Image*>(i)->Fl_Image::desaturate(); } void fl_image_inactive(IMAGE i) { - reinterpret_cast<Fl_Image*>(i)->inactive(); + static_cast<Fl_Image*>(i)->inactive(); } int fl_image_fail(IMAGE i) { - switch (reinterpret_cast<Fl_Image*>(i)->fail()) { + switch (static_cast<Fl_Image*>(i)->fail()) { case Fl_Image::ERR_NO_IMAGE: return 1; case Fl_Image::ERR_FILE_ACCESS: @@ -83,37 +83,37 @@ int fl_image_fail(IMAGE i) { void fl_image_uncache(IMAGE i) { // virtual so disable dispatch - reinterpret_cast<Fl_Image*>(i)->Fl_Image::uncache(); + static_cast<Fl_Image*>(i)->Fl_Image::uncache(); } int fl_image_w(IMAGE i) { - return reinterpret_cast<Fl_Image*>(i)->w(); + return static_cast<Fl_Image*>(i)->w(); } int fl_image_h(IMAGE i) { - return reinterpret_cast<Fl_Image*>(i)->h(); + return static_cast<Fl_Image*>(i)->h(); } int fl_image_d(IMAGE i) { - return reinterpret_cast<Fl_Image*>(i)->d(); + return static_cast<Fl_Image*>(i)->d(); } int fl_image_ld(IMAGE i) { - return reinterpret_cast<Fl_Image*>(i)->ld(); + return static_cast<Fl_Image*>(i)->ld(); } int fl_image_count(IMAGE i) { - return reinterpret_cast<Fl_Image*>(i)->count(); + return static_cast<Fl_Image*>(i)->count(); } const void * fl_image_data(IMAGE i) { - return reinterpret_cast<Fl_Image*>(i)->data(); + return static_cast<Fl_Image*>(i)->data(); } char fl_image_get_pixel(char *c, int off) { @@ -128,15 +128,15 @@ void fl_image_set_pixel(char *c, int off, char val) { void fl_image_draw(IMAGE i, int x, int y) { - reinterpret_cast<Fl_Image*>(i)->draw(x, y); + static_cast<Fl_Image*>(i)->draw(x, y); } void fl_image_draw2(IMAGE i, int x, int y, int w, int h, int cx, int cy) { // virtual so disable dispatch - reinterpret_cast<Fl_Image*>(i)->Fl_Image::draw(x, y, w, h, cx, cy); + static_cast<Fl_Image*>(i)->Fl_Image::draw(x, y, w, h, cx, cy); } void fl_image_draw_empty(IMAGE i, int x, int y) { - reinterpret_cast<My_Image*>(i)->draw_empty(x, y); + static_cast<My_Image*>(i)->draw_empty(x, y); } diff --git a/src/c_fl_image.h b/src/c_fl_image.h index 75afb4a..ee96b7a 100644 --- a/src/c_fl_image.h +++ b/src/c_fl_image.h @@ -8,13 +8,9 @@ #define FL_IMAGE_GUARD - - typedef void* IMAGE; - - extern "C" IMAGE new_fl_image(int w, int h, int d); extern "C" void free_fl_image(IMAGE i); @@ -25,8 +21,6 @@ extern "C" IMAGE fl_image_copy(IMAGE i, int w, int h); extern "C" IMAGE fl_image_copy2(IMAGE i); - - extern "C" void fl_image_color_average(IMAGE i, int c, float b); extern "C" void fl_image_desaturate(IMAGE i); @@ -55,3 +49,4 @@ extern "C" void fl_image_draw_empty(IMAGE i, int x, int y); #endif + diff --git a/src/c_fl_image_surface.cpp b/src/c_fl_image_surface.cpp index b03659f..51df5fb 100644 --- a/src/c_fl_image_surface.cpp +++ b/src/c_fl_image_surface.cpp @@ -14,42 +14,42 @@ // Flattened C API -IMAGE_SURFACE new_fl_image_surface(int w, int h, int r) { +IMAGESURFACE new_fl_image_surface(int w, int h, int r) { Fl_Image_Surface *s = new Fl_Image_Surface(w,h,r); return s; } -void free_fl_image_surface(IMAGE_SURFACE s) { - delete reinterpret_cast<Fl_Image_Surface*>(s); +void free_fl_image_surface(IMAGESURFACE s) { + delete static_cast<Fl_Image_Surface*>(s); } -void fl_image_surface_draw(IMAGE_SURFACE s, void * w, int dx, int dy) { - reinterpret_cast<Fl_Image_Surface*>(s)->draw(reinterpret_cast<Fl_Widget*>(w),dx,dy); +void fl_image_surface_draw(IMAGESURFACE s, void * w, int dx, int dy) { + static_cast<Fl_Image_Surface*>(s)->draw(static_cast<Fl_Widget*>(w),dx,dy); } -void fl_image_surface_draw_decorated_window(IMAGE_SURFACE s, void * w, int dx, int dy) { - reinterpret_cast<Fl_Image_Surface*>(s)->draw_decorated_window(reinterpret_cast<Fl_Window*>(w),dx,dy); +void fl_image_surface_draw_decorated_window(IMAGESURFACE s, void * w, int dx, int dy) { + static_cast<Fl_Image_Surface*>(s)->draw_decorated_window(static_cast<Fl_Window*>(w),dx,dy); } -void * fl_image_surface_image(IMAGE_SURFACE s) { - return reinterpret_cast<Fl_Image_Surface*>(s)->image(); +void * fl_image_surface_image(IMAGESURFACE s) { + return static_cast<Fl_Image_Surface*>(s)->image(); } -void * fl_image_surface_highres_image(IMAGE_SURFACE s) { - return reinterpret_cast<Fl_Image_Surface*>(s)->highres_image(); +void * fl_image_surface_highres_image(IMAGESURFACE s) { + return static_cast<Fl_Image_Surface*>(s)->highres_image(); } -void fl_image_surface_set_current(IMAGE_SURFACE s) { - reinterpret_cast<Fl_Image_Surface*>(s)->set_current(); +void fl_image_surface_set_current(IMAGESURFACE s) { + static_cast<Fl_Image_Surface*>(s)->set_current(); } diff --git a/src/c_fl_image_surface.h b/src/c_fl_image_surface.h index d0f671b..a4ffd65 100644 --- a/src/c_fl_image_surface.h +++ b/src/c_fl_image_surface.h @@ -8,22 +8,22 @@ #define FL_IMAGE_SURFACE_GUARD -typedef void* IMAGE_SURFACE; +typedef void* IMAGESURFACE; -extern "C" IMAGE_SURFACE new_fl_image_surface(int w, int h, int r); -extern "C" void free_fl_image_surface(IMAGE_SURFACE s); +extern "C" IMAGESURFACE new_fl_image_surface(int w, int h, int r); +extern "C" void free_fl_image_surface(IMAGESURFACE s); -extern "C" void fl_image_surface_draw(IMAGE_SURFACE s, void * w, int dx, int dy); -extern "C" void fl_image_surface_draw_decorated_window(IMAGE_SURFACE s, void * w, int dx, int dy); +extern "C" void fl_image_surface_draw(IMAGESURFACE s, void * w, int dx, int dy); +extern "C" void fl_image_surface_draw_decorated_window(IMAGESURFACE s, void * w, int dx, int dy); -extern "C" void * fl_image_surface_image(IMAGE_SURFACE s); -extern "C" void * fl_image_surface_highres_image(IMAGE_SURFACE s); +extern "C" void * fl_image_surface_image(IMAGESURFACE s); +extern "C" void * fl_image_surface_highres_image(IMAGESURFACE s); -extern "C" void fl_image_surface_set_current(IMAGE_SURFACE s); +extern "C" void fl_image_surface_set_current(IMAGESURFACE s); #endif diff --git a/src/c_fl_input.cpp b/src/c_fl_input.cpp index c66b46d..6fa6b2d 100644 --- a/src/c_fl_input.cpp +++ b/src/c_fl_input.cpp @@ -65,18 +65,18 @@ TEXTINPUT new_fl_text_input(int x, int y, int w, int h, char * label) { } void free_fl_text_input(TEXTINPUT t) { - delete reinterpret_cast<My_Text_Input*>(t); + delete static_cast<My_Text_Input*>(t); } void fl_text_input_draw(TEXTINPUT t) { - reinterpret_cast<My_Text_Input*>(t)->Fl_Input::draw(); + static_cast<My_Text_Input*>(t)->Fl_Input::draw(); } int fl_text_input_handle(TEXTINPUT t, int e) { - return reinterpret_cast<My_Text_Input*>(t)->Fl_Input::handle(e); + return static_cast<My_Text_Input*>(t)->Fl_Input::handle(e); } diff --git a/src/c_fl_input_.cpp b/src/c_fl_input_.cpp index 0971d1d..158a18c 100644 --- a/src/c_fl_input_.cpp +++ b/src/c_fl_input_.cpp @@ -50,184 +50,184 @@ INPUT new_fl_input(int x, int y, int w, int h, char* label) { } void free_fl_input(INPUT i) { - delete reinterpret_cast<My_Input*>(i); + delete static_cast<My_Input*>(i); } int fl_input_copy(INPUT i, int c) { - return reinterpret_cast<Fl_Input_*>(i)->copy(c); + return static_cast<Fl_Input_*>(i)->copy(c); } int fl_input_cut(INPUT i) { - return reinterpret_cast<Fl_Input_*>(i)->cut(); + return static_cast<Fl_Input_*>(i)->cut(); } int fl_input_cut2(INPUT i, int b) { - return reinterpret_cast<Fl_Input_*>(i)->cut(b); + return static_cast<Fl_Input_*>(i)->cut(b); } int fl_input_cut3(INPUT i, int a, int b) { - return reinterpret_cast<Fl_Input_*>(i)->cut(a,b); + return static_cast<Fl_Input_*>(i)->cut(a,b); } int fl_input_copy_cuts(INPUT i) { - return reinterpret_cast<Fl_Input_*>(i)->copy_cuts(); + return static_cast<Fl_Input_*>(i)->copy_cuts(); } int fl_input_undo(INPUT i) { - return reinterpret_cast<Fl_Input_*>(i)->undo(); + return static_cast<Fl_Input_*>(i)->undo(); } int fl_input_get_readonly(INPUT i) { - return reinterpret_cast<Fl_Input_*>(i)->readonly(); + return static_cast<Fl_Input_*>(i)->readonly(); } void fl_input_set_readonly(INPUT i, int t) { - reinterpret_cast<Fl_Input_*>(i)->readonly(t); + static_cast<Fl_Input_*>(i)->readonly(t); } int fl_input_get_tab_nav(INPUT i) { - return reinterpret_cast<Fl_Input_*>(i)->tab_nav(); + return static_cast<Fl_Input_*>(i)->tab_nav(); } void fl_input_set_tab_nav(INPUT i, int t) { - reinterpret_cast<Fl_Input_*>(i)->tab_nav(t); + static_cast<Fl_Input_*>(i)->tab_nav(t); } int fl_input_get_wrap(INPUT i) { - return reinterpret_cast<Fl_Input_*>(i)->wrap(); + return static_cast<Fl_Input_*>(i)->wrap(); } void fl_input_set_wrap(INPUT i, int t) { - reinterpret_cast<Fl_Input_*>(i)->wrap(t); + static_cast<Fl_Input_*>(i)->wrap(t); } int fl_input_get_input_type(INPUT i) { - return reinterpret_cast<Fl_Input_*>(i)->input_type(); + return static_cast<Fl_Input_*>(i)->input_type(); } void fl_input_set_input_type(INPUT i, int t) { - reinterpret_cast<Fl_Input_*>(i)->input_type(t); + static_cast<Fl_Input_*>(i)->input_type(t); } unsigned long fl_input_get_shortcut(INPUT i) { - return reinterpret_cast<Fl_Input_*>(i)->shortcut(); + return static_cast<Fl_Input_*>(i)->shortcut(); } void fl_input_set_shortcut(INPUT i, unsigned long t) { - reinterpret_cast<Fl_Input_*>(i)->shortcut(t); + static_cast<Fl_Input_*>(i)->shortcut(t); } int fl_input_get_mark(INPUT i) { - return reinterpret_cast<Fl_Input_*>(i)->mark(); + return static_cast<Fl_Input_*>(i)->mark(); } int fl_input_set_mark(INPUT i, int t) { - return reinterpret_cast<Fl_Input_*>(i)->mark(t); + return static_cast<Fl_Input_*>(i)->mark(t); } int fl_input_get_position(INPUT i) { - return reinterpret_cast<Fl_Input_*>(i)->position(); + return static_cast<Fl_Input_*>(i)->position(); } int fl_input_set_position(INPUT i, int t) { - return reinterpret_cast<Fl_Input_*>(i)->position(t); + return static_cast<Fl_Input_*>(i)->position(t); } int fl_input_set_position2(INPUT i, int p, int m) { - return reinterpret_cast<Fl_Input_*>(i)->position(p, m); + return static_cast<Fl_Input_*>(i)->position(p, m); } unsigned int fl_input_index(INPUT i, int p) { - return reinterpret_cast<Fl_Input_*>(i)->index(p); + return static_cast<Fl_Input_*>(i)->index(p); } int fl_input_insert(INPUT i, const char * s, int l) { - return reinterpret_cast<Fl_Input_*>(i)->insert(s,l); + return static_cast<Fl_Input_*>(i)->insert(s,l); } int fl_input_replace(INPUT i, int b, int e, const char * s, int l) { - return reinterpret_cast<Fl_Input_*>(i)->replace(b,e,s,l); + return static_cast<Fl_Input_*>(i)->replace(b,e,s,l); } const char * fl_input_get_value(INPUT i) { - return reinterpret_cast<Fl_Input_*>(i)->value(); + return static_cast<Fl_Input_*>(i)->value(); } int fl_input_set_value(INPUT i, char * s, int len) { - return reinterpret_cast<Fl_Input_*>(i)->value(s,len); + return static_cast<Fl_Input_*>(i)->value(s,len); } int fl_input_get_maximum_size(INPUT i) { - return reinterpret_cast<Fl_Input_*>(i)->maximum_size(); + return static_cast<Fl_Input_*>(i)->maximum_size(); } void fl_input_set_maximum_size(INPUT i, int t) { - reinterpret_cast<Fl_Input_*>(i)->maximum_size(t); + static_cast<Fl_Input_*>(i)->maximum_size(t); } int fl_input_get_size(INPUT i) { - return reinterpret_cast<Fl_Input_*>(i)->size(); + return static_cast<Fl_Input_*>(i)->size(); } unsigned int fl_input_get_cursor_color(INPUT i) { - return reinterpret_cast<Fl_Input_*>(i)->cursor_color(); + return static_cast<Fl_Input_*>(i)->cursor_color(); } void fl_input_set_cursor_color(INPUT i, unsigned int t) { - reinterpret_cast<Fl_Input_*>(i)->cursor_color(t); + static_cast<Fl_Input_*>(i)->cursor_color(t); } unsigned int fl_input_get_textcolor(INPUT i) { - return reinterpret_cast<Fl_Input_*>(i)->textcolor(); + return static_cast<Fl_Input_*>(i)->textcolor(); } void fl_input_set_textcolor(INPUT i, unsigned int t) { - reinterpret_cast<Fl_Input_*>(i)->textcolor(t); + static_cast<Fl_Input_*>(i)->textcolor(t); } int fl_input_get_textfont(INPUT i) { - return reinterpret_cast<Fl_Input_*>(i)->textfont(); + return static_cast<Fl_Input_*>(i)->textfont(); } void fl_input_set_textfont(INPUT i, int t) { - reinterpret_cast<Fl_Input_*>(i)->textfont(t); + static_cast<Fl_Input_*>(i)->textfont(t); } int fl_input_get_textsize(INPUT i) { - return reinterpret_cast<Fl_Input_*>(i)->textsize(); + return static_cast<Fl_Input_*>(i)->textsize(); } void fl_input_set_textsize(INPUT i, int t) { - reinterpret_cast<Fl_Input_*>(i)->textsize(t); + static_cast<Fl_Input_*>(i)->textsize(t); } void fl_input_set_size(INPUT i, int w, int h) { - reinterpret_cast<Fl_Input_*>(i)->size(w,h); + static_cast<Fl_Input_*>(i)->size(w,h); } void fl_input_resize(INPUT i, int x, int y, int w, int h) { - reinterpret_cast<Fl_Input_*>(i)->Fl_Input_::resize(x, y, w, h); + static_cast<Fl_Input_*>(i)->Fl_Input_::resize(x, y, w, h); } @@ -243,7 +243,7 @@ void fl_input_draw(INPUT i) { } int fl_input_handle(INPUT i, int e) { - return reinterpret_cast<My_Input*>(i)->Fl_Input_::handle(e); + return static_cast<My_Input*>(i)->Fl_Input_::handle(e); } diff --git a/src/c_fl_input_choice.cpp b/src/c_fl_input_choice.cpp index 682aed0..247e8eb 100644 --- a/src/c_fl_input_choice.cpp +++ b/src/c_fl_input_choice.cpp @@ -50,102 +50,102 @@ INPUTCHOICE new_fl_input_choice(int x, int y, int w, int h, char* label) { } void free_fl_input_choice(INPUTCHOICE n) { - delete reinterpret_cast<My_Input_Choice*>(n); + delete static_cast<My_Input_Choice*>(n); } void * fl_input_choice_input(INPUTCHOICE n) { - return reinterpret_cast<Fl_Input_Choice*>(n)->input(); + return static_cast<Fl_Input_Choice*>(n)->input(); } void * fl_input_choice_menubutton(INPUTCHOICE n) { - return reinterpret_cast<Fl_Input_Choice*>(n)->menubutton(); + return static_cast<Fl_Input_Choice*>(n)->menubutton(); } void fl_input_choice_clear(INPUTCHOICE n) { - reinterpret_cast<Fl_Input_Choice*>(n)->clear(); + static_cast<Fl_Input_Choice*>(n)->clear(); } int fl_input_choice_changed(INPUTCHOICE n) { - return reinterpret_cast<Fl_Input_Choice*>(n)->changed(); + return static_cast<Fl_Input_Choice*>(n)->changed(); } void fl_input_choice_clear_changed(INPUTCHOICE n) { - reinterpret_cast<Fl_Input_Choice*>(n)->clear_changed(); + static_cast<Fl_Input_Choice*>(n)->clear_changed(); } void fl_input_choice_set_changed(INPUTCHOICE n) { - reinterpret_cast<Fl_Input_Choice*>(n)->set_changed(); + static_cast<Fl_Input_Choice*>(n)->set_changed(); } int fl_input_choice_get_down_box(INPUTCHOICE n) { - return reinterpret_cast<Fl_Input_Choice*>(n)->down_box(); + return static_cast<Fl_Input_Choice*>(n)->down_box(); } void fl_input_choice_set_down_box(INPUTCHOICE n, int t) { - reinterpret_cast<Fl_Input_Choice*>(n)->down_box(static_cast<Fl_Boxtype>(t)); + static_cast<Fl_Input_Choice*>(n)->down_box(static_cast<Fl_Boxtype>(t)); } unsigned int fl_input_choice_get_textcolor(INPUTCHOICE n) { - return reinterpret_cast<Fl_Input_Choice*>(n)->textcolor(); + return static_cast<Fl_Input_Choice*>(n)->textcolor(); } void fl_input_choice_set_textcolor(INPUTCHOICE n, unsigned int t) { - reinterpret_cast<Fl_Input_Choice*>(n)->textcolor(t); + static_cast<Fl_Input_Choice*>(n)->textcolor(t); } int fl_input_choice_get_textfont(INPUTCHOICE n) { - return reinterpret_cast<Fl_Input_Choice*>(n)->textfont(); + return static_cast<Fl_Input_Choice*>(n)->textfont(); } void fl_input_choice_set_textfont(INPUTCHOICE n, int t) { - reinterpret_cast<Fl_Input_Choice*>(n)->textfont(t); + static_cast<Fl_Input_Choice*>(n)->textfont(t); } int fl_input_choice_get_textsize(INPUTCHOICE n) { - return reinterpret_cast<Fl_Input_Choice*>(n)->textsize(); + return static_cast<Fl_Input_Choice*>(n)->textsize(); } void fl_input_choice_set_textsize(INPUTCHOICE n, int t) { - reinterpret_cast<Fl_Input_Choice*>(n)->textsize(t); + static_cast<Fl_Input_Choice*>(n)->textsize(t); } const char * fl_input_choice_get_value(INPUTCHOICE n) { - return reinterpret_cast<Fl_Input_Choice*>(n)->value(); + return static_cast<Fl_Input_Choice*>(n)->value(); } void fl_input_choice_set_value(INPUTCHOICE n, const char * t) { - reinterpret_cast<Fl_Input_Choice*>(n)->value(t); + static_cast<Fl_Input_Choice*>(n)->value(t); } void fl_input_choice_set_value2(INPUTCHOICE n, int t) { - reinterpret_cast<Fl_Input_Choice*>(n)->value(t); + static_cast<Fl_Input_Choice*>(n)->value(t); } void fl_input_choice_resize(INPUTCHOICE n, int x, int y, int w, int h) { - reinterpret_cast<Fl_Input_Choice*>(n)->resize(x, y, w, h); + static_cast<Fl_Input_Choice*>(n)->resize(x, y, w, h); } void fl_input_choice_draw(INPUTCHOICE n) { - reinterpret_cast<My_Input_Choice*>(n)->Fl_Input_Choice::draw(); + static_cast<My_Input_Choice*>(n)->Fl_Input_Choice::draw(); } int fl_input_choice_handle(INPUTCHOICE n, int e) { - return reinterpret_cast<My_Input_Choice*>(n)->Fl_Input_Choice::handle(e); + return static_cast<My_Input_Choice*>(n)->Fl_Input_Choice::handle(e); } diff --git a/src/c_fl_int_input.cpp b/src/c_fl_int_input.cpp index 0f90cf2..8f780d7 100644 --- a/src/c_fl_int_input.cpp +++ b/src/c_fl_int_input.cpp @@ -50,18 +50,18 @@ INTINPUT new_fl_int_input(int x, int y, int w, int h, char* label) { } void free_fl_int_input(INTINPUT i) { - delete reinterpret_cast<My_Int_Input*>(i); + delete static_cast<My_Int_Input*>(i); } void fl_int_input_draw(INTINPUT i) { - reinterpret_cast<My_Int_Input*>(i)->Fl_Int_Input::draw(); + static_cast<My_Int_Input*>(i)->Fl_Int_Input::draw(); } int fl_int_input_handle(INTINPUT i, int e) { - return reinterpret_cast<My_Int_Input*>(i)->Fl_Int_Input::handle(e); + return static_cast<My_Int_Input*>(i)->Fl_Int_Input::handle(e); } diff --git a/src/c_fl_jpeg_image.cpp b/src/c_fl_jpeg_image.cpp index 6523e39..63cbe8d 100644 --- a/src/c_fl_jpeg_image.cpp +++ b/src/c_fl_jpeg_image.cpp @@ -10,17 +10,17 @@ -JPEG_IMAGE new_fl_jpeg_image(const char * f) { +JPEGIMAGE new_fl_jpeg_image(const char * f) { Fl_JPEG_Image *j = new Fl_JPEG_Image(f); return j; } -JPEG_IMAGE new_fl_jpeg_image2(const char *n, void *data) { - Fl_JPEG_Image *j = new Fl_JPEG_Image(n, reinterpret_cast<uchar*>(data)); +JPEGIMAGE new_fl_jpeg_image2(const char *n, void *data) { + Fl_JPEG_Image *j = new Fl_JPEG_Image(n, static_cast<uchar*>(data)); return j; } -void free_fl_jpeg_image(JPEG_IMAGE j) { - delete reinterpret_cast<Fl_JPEG_Image*>(j); +void free_fl_jpeg_image(JPEGIMAGE j) { + delete static_cast<Fl_JPEG_Image*>(j); } diff --git a/src/c_fl_jpeg_image.h b/src/c_fl_jpeg_image.h index 4fef486..013ae37 100644 --- a/src/c_fl_jpeg_image.h +++ b/src/c_fl_jpeg_image.h @@ -8,17 +8,14 @@ #define FL_JPEG_IMAGE_GUARD +typedef void* JPEGIMAGE; -typedef void* JPEG_IMAGE; - - - - -extern "C" JPEG_IMAGE new_fl_jpeg_image(const char * f); -extern "C" JPEG_IMAGE new_fl_jpeg_image2(const char * n, void *data); -extern "C" void free_fl_jpeg_image(JPEG_IMAGE j); +extern "C" JPEGIMAGE new_fl_jpeg_image(const char * f); +extern "C" JPEGIMAGE new_fl_jpeg_image2(const char * n, void *data); +extern "C" void free_fl_jpeg_image(JPEGIMAGE j); #endif + diff --git a/src/c_fl_label.cpp b/src/c_fl_label.cpp index 1fb5579..2200c51 100644 --- a/src/c_fl_label.cpp +++ b/src/c_fl_label.cpp @@ -23,73 +23,73 @@ LABEL new_fl_label(const char * v, int f, int s, unsigned int h, int k, unsigned } void free_fl_label(LABEL l) { - delete reinterpret_cast<Fl_Label*>(l); + delete static_cast<Fl_Label*>(l); } void fl_label_set_value(LABEL l, const char * v) { - reinterpret_cast<Fl_Label*>(l)->value = v; + static_cast<Fl_Label*>(l)->value = v; } int fl_label_get_font(LABEL l) { - return reinterpret_cast<Fl_Label*>(l)->font; + return static_cast<Fl_Label*>(l)->font; } void fl_label_set_font(LABEL l, int f) { - reinterpret_cast<Fl_Label*>(l)->font = f; + static_cast<Fl_Label*>(l)->font = f; } int fl_label_get_size(LABEL l) { - return reinterpret_cast<Fl_Label*>(l)->size; + return static_cast<Fl_Label*>(l)->size; } void fl_label_set_size(LABEL l, int s) { - reinterpret_cast<Fl_Label*>(l)->size = s; + static_cast<Fl_Label*>(l)->size = s; } unsigned int fl_label_get_color(LABEL l) { - return reinterpret_cast<Fl_Label*>(l)->color; + return static_cast<Fl_Label*>(l)->color; } void fl_label_set_color(LABEL l, unsigned int h) { - reinterpret_cast<Fl_Label*>(l)->color = h; + static_cast<Fl_Label*>(l)->color = h; } int fl_label_get_type(LABEL l) { - return (int)reinterpret_cast<Fl_Label*>(l)->type; + return (int)static_cast<Fl_Label*>(l)->type; } void fl_label_set_type(LABEL l, int k) { - reinterpret_cast<Fl_Label*>(l)->type = (uchar)k; + static_cast<Fl_Label*>(l)->type = (uchar)k; } unsigned int fl_label_get_align(LABEL l) { - return reinterpret_cast<Fl_Label*>(l)->align_; + return static_cast<Fl_Label*>(l)->align_; } void fl_label_set_align(LABEL l, unsigned int p) { - reinterpret_cast<Fl_Label*>(l)->align_ = p; + static_cast<Fl_Label*>(l)->align_ = p; } void fl_label_set_image(LABEL l, void * i) { - reinterpret_cast<Fl_Label*>(l)->image = reinterpret_cast<Fl_Image*>(i); + static_cast<Fl_Label*>(l)->image = static_cast<Fl_Image*>(i); } void fl_label_set_deimage(LABEL l, void * i) { - reinterpret_cast<Fl_Label*>(l)->deimage = reinterpret_cast<Fl_Image*>(i); + static_cast<Fl_Label*>(l)->deimage = static_cast<Fl_Image*>(i); } void fl_label_draw(LABEL l, int x, int y, int w, int h, unsigned int p) { - reinterpret_cast<Fl_Label*>(l)->draw(x, y, w, h, p); + static_cast<Fl_Label*>(l)->draw(x, y, w, h, p); } void fl_label_measure(LABEL l, int &w, int &h) { - reinterpret_cast<Fl_Label*>(l)->measure(w, h); + static_cast<Fl_Label*>(l)->measure(w, h); } diff --git a/src/c_fl_light_button.cpp b/src/c_fl_light_button.cpp index f8d52a8..e11ce64 100644 --- a/src/c_fl_light_button.cpp +++ b/src/c_fl_light_button.cpp @@ -50,18 +50,18 @@ LIGHTBUTTON new_fl_light_button(int x, int y, int w, int h, char* label) { } void free_fl_light_button(LIGHTBUTTON b) { - delete reinterpret_cast<My_Light_Button*>(b); + delete static_cast<My_Light_Button*>(b); } void fl_light_button_draw(LIGHTBUTTON b) { - reinterpret_cast<My_Light_Button*>(b)->Fl_Light_Button::draw(); + static_cast<My_Light_Button*>(b)->Fl_Light_Button::draw(); } int fl_light_button_handle(LIGHTBUTTON b, int e) { - return reinterpret_cast<My_Light_Button*>(b)->Fl_Light_Button::handle(e); + return static_cast<My_Light_Button*>(b)->Fl_Light_Button::handle(e); } diff --git a/src/c_fl_line_dial.cpp b/src/c_fl_line_dial.cpp index cb0727f..c01e8d8 100644 --- a/src/c_fl_line_dial.cpp +++ b/src/c_fl_line_dial.cpp @@ -24,8 +24,8 @@ class My_Line_Dial : public Fl_Line_Dial { public: using Fl_Line_Dial::Fl_Line_Dial; - friend void fl_line_dial_draw(LINE_DIAL v); - friend int fl_line_dial_handle(LINE_DIAL v, int e); + friend void fl_line_dial_draw(LINEDIAL v); + friend int fl_line_dial_handle(LINEDIAL v, int e); void draw(); int handle(int e); @@ -44,24 +44,24 @@ int My_Line_Dial::handle(int e) { // Flattened C API -LINE_DIAL new_fl_line_dial(int x, int y, int w, int h, char* label) { +LINEDIAL new_fl_line_dial(int x, int y, int w, int h, char* label) { My_Line_Dial *v = new My_Line_Dial(x, y, w, h, label); return v; } -void free_fl_line_dial(LINE_DIAL v) { - delete reinterpret_cast<My_Line_Dial*>(v); +void free_fl_line_dial(LINEDIAL v) { + delete static_cast<My_Line_Dial*>(v); } -void fl_line_dial_draw(LINE_DIAL v) { - reinterpret_cast<My_Line_Dial*>(v)->Fl_Line_Dial::draw(); +void fl_line_dial_draw(LINEDIAL v) { + static_cast<My_Line_Dial*>(v)->Fl_Line_Dial::draw(); } -int fl_line_dial_handle(LINE_DIAL v, int e) { - return reinterpret_cast<My_Line_Dial*>(v)->Fl_Line_Dial::handle(e); +int fl_line_dial_handle(LINEDIAL v, int e) { + return static_cast<My_Line_Dial*>(v)->Fl_Line_Dial::handle(e); } diff --git a/src/c_fl_line_dial.h b/src/c_fl_line_dial.h index 73ffb89..f7b49ca 100644 --- a/src/c_fl_line_dial.h +++ b/src/c_fl_line_dial.h @@ -8,15 +8,15 @@ #define FL_LINE_DIAL_GUARD -typedef void* LINE_DIAL; +typedef void* LINEDIAL; -extern "C" LINE_DIAL new_fl_line_dial(int x, int y, int w, int h, char* label); -extern "C" void free_fl_line_dial(LINE_DIAL v); +extern "C" LINEDIAL new_fl_line_dial(int x, int y, int w, int h, char* label); +extern "C" void free_fl_line_dial(LINEDIAL v); -extern "C" void fl_line_dial_draw(LINE_DIAL v); -extern "C" int fl_line_dial_handle(LINE_DIAL v, int e); +extern "C" void fl_line_dial_draw(LINEDIAL v); +extern "C" int fl_line_dial_handle(LINEDIAL v, int e); #endif diff --git a/src/c_fl_menu_bar.cpp b/src/c_fl_menu_bar.cpp index 1da51e9..5e73675 100644 --- a/src/c_fl_menu_bar.cpp +++ b/src/c_fl_menu_bar.cpp @@ -50,18 +50,18 @@ MENUBAR new_fl_menu_bar(int x, int y, int w, int h, char* label) { } void free_fl_menu_bar(MENUBAR m) { - delete reinterpret_cast<My_Menu_Bar*>(m); + delete static_cast<My_Menu_Bar*>(m); } void fl_menu_bar_draw(MENUBAR m) { - reinterpret_cast<My_Menu_Bar*>(m)->Fl_Menu_Bar::draw(); + static_cast<My_Menu_Bar*>(m)->Fl_Menu_Bar::draw(); } int fl_menu_bar_handle(MENUBAR m, int e) { - return reinterpret_cast<My_Menu_Bar*>(m)->Fl_Menu_Bar::handle(e); + return static_cast<My_Menu_Bar*>(m)->Fl_Menu_Bar::handle(e); } diff --git a/src/c_fl_menu_button.cpp b/src/c_fl_menu_button.cpp index 8866b89..abe9712 100644 --- a/src/c_fl_menu_button.cpp +++ b/src/c_fl_menu_button.cpp @@ -66,25 +66,25 @@ MENUBUTTON new_fl_menu_button(int x, int y, int w, int h, char* label) { } void free_fl_menu_button(MENUBUTTON m) { - delete reinterpret_cast<My_Menu_Button*>(m); + delete static_cast<My_Menu_Button*>(m); } const void * fl_menu_button_popup(MENUBUTTON m) { - return reinterpret_cast<Fl_Menu_Button*>(m)->popup(); + return static_cast<Fl_Menu_Button*>(m)->popup(); } void fl_menu_button_draw(MENUBUTTON m) { - reinterpret_cast<My_Menu_Button*>(m)->Fl_Menu_Button::draw(); + static_cast<My_Menu_Button*>(m)->Fl_Menu_Button::draw(); } int fl_menu_button_handle(MENUBUTTON m, int e) { - return reinterpret_cast<My_Menu_Button*>(m)->Fl_Menu_Button::handle(e); + return static_cast<My_Menu_Button*>(m)->Fl_Menu_Button::handle(e); } diff --git a/src/c_fl_menu_window.cpp b/src/c_fl_menu_window.cpp index a01b0f7..cae1bf9 100644 --- a/src/c_fl_menu_window.cpp +++ b/src/c_fl_menu_window.cpp @@ -55,52 +55,52 @@ MENUWINDOW new_fl_menu_window2(int w, int h, char* label) { } void free_fl_menu_window(MENUWINDOW m) { - delete reinterpret_cast<My_Menu_Window*>(m); + delete static_cast<My_Menu_Window*>(m); } void fl_menu_window_show(MENUWINDOW m) { - reinterpret_cast<Fl_Menu_Window*>(m)->show(); + static_cast<Fl_Menu_Window*>(m)->show(); } void fl_menu_window_hide(MENUWINDOW m) { - reinterpret_cast<Fl_Menu_Window*>(m)->hide(); + static_cast<Fl_Menu_Window*>(m)->hide(); } void fl_menu_window_flush(MENUWINDOW m) { - reinterpret_cast<Fl_Menu_Window*>(m)->flush(); + static_cast<Fl_Menu_Window*>(m)->flush(); } void fl_menu_window_erase(MENUWINDOW m) { - reinterpret_cast<Fl_Menu_Window*>(m)->erase(); + static_cast<Fl_Menu_Window*>(m)->erase(); } void fl_menu_window_set_overlay(MENUWINDOW m) { - reinterpret_cast<Fl_Menu_Window*>(m)->set_overlay(); + static_cast<Fl_Menu_Window*>(m)->set_overlay(); } void fl_menu_window_clear_overlay(MENUWINDOW m) { - reinterpret_cast<Fl_Menu_Window*>(m)->clear_overlay(); + static_cast<Fl_Menu_Window*>(m)->clear_overlay(); } unsigned int fl_menu_window_overlay(MENUWINDOW m) { - return reinterpret_cast<Fl_Menu_Window*>(m)->overlay(); + return static_cast<Fl_Menu_Window*>(m)->overlay(); } void fl_menu_window_draw(MENUWINDOW n) { - reinterpret_cast<My_Menu_Window*>(n)->Fl_Menu_Window::draw(); + static_cast<My_Menu_Window*>(n)->Fl_Menu_Window::draw(); } int fl_menu_window_handle(MENUWINDOW n, int e) { - return reinterpret_cast<My_Menu_Window*>(n)->Fl_Menu_Window::handle(e); + return static_cast<My_Menu_Window*>(n)->Fl_Menu_Window::handle(e); } diff --git a/src/c_fl_multi_browser.cpp b/src/c_fl_multi_browser.cpp index 82fbdfb..18bf5e8 100644 --- a/src/c_fl_multi_browser.cpp +++ b/src/c_fl_multi_browser.cpp @@ -172,7 +172,7 @@ MULTIBROWSER new_fl_multi_browser(int x, int y, int w, int h, char * label) { } void free_fl_multi_browser(MULTIBROWSER b) { - delete reinterpret_cast<My_Multi_Browser*>(b); + delete static_cast<My_Multi_Browser*>(b); } @@ -182,84 +182,84 @@ void free_fl_multi_browser(MULTIBROWSER b) { int fl_multi_browser_full_height(MULTIBROWSER c) { - return reinterpret_cast<My_Multi_Browser*>(c)->Fl_Multi_Browser::full_height(); + return static_cast<My_Multi_Browser*>(c)->Fl_Multi_Browser::full_height(); } int fl_multi_browser_incr_height(MULTIBROWSER c) { - return reinterpret_cast<My_Multi_Browser*>(c)->Fl_Multi_Browser::incr_height(); + return static_cast<My_Multi_Browser*>(c)->Fl_Multi_Browser::incr_height(); } int fl_multi_browser_item_width(MULTIBROWSER b, void * item) { - return reinterpret_cast<My_Multi_Browser*>(b)->Fl_Multi_Browser::item_width(item); + return static_cast<My_Multi_Browser*>(b)->Fl_Multi_Browser::item_width(item); } int fl_multi_browser_item_height(MULTIBROWSER b, void * item) { - return reinterpret_cast<My_Multi_Browser*>(b)->Fl_Multi_Browser::item_height(item); + return static_cast<My_Multi_Browser*>(b)->Fl_Multi_Browser::item_height(item); } void * fl_multi_browser_item_first(MULTIBROWSER b) { - return reinterpret_cast<My_Multi_Browser*>(b)->Fl_Multi_Browser::item_first(); + return static_cast<My_Multi_Browser*>(b)->Fl_Multi_Browser::item_first(); } void * fl_multi_browser_item_last(MULTIBROWSER b) { - return reinterpret_cast<My_Multi_Browser*>(b)->Fl_Multi_Browser::item_last(); + return static_cast<My_Multi_Browser*>(b)->Fl_Multi_Browser::item_last(); } void * fl_multi_browser_item_next(MULTIBROWSER b, void * item) { - return reinterpret_cast<My_Multi_Browser*>(b)->Fl_Multi_Browser::item_next(item); + return static_cast<My_Multi_Browser*>(b)->Fl_Multi_Browser::item_next(item); } void * fl_multi_browser_item_prev(MULTIBROWSER b, void * item) { - return reinterpret_cast<My_Multi_Browser*>(b)->Fl_Multi_Browser::item_prev(item); + return static_cast<My_Multi_Browser*>(b)->Fl_Multi_Browser::item_prev(item); } void * fl_multi_browser_item_at(MULTIBROWSER b, int index) { - return reinterpret_cast<My_Multi_Browser*>(b)->Fl_Multi_Browser::item_at(index); + return static_cast<My_Multi_Browser*>(b)->Fl_Multi_Browser::item_at(index); } void fl_multi_browser_item_select(MULTIBROWSER b, void * item, int val) { - reinterpret_cast<My_Multi_Browser*>(b)->Fl_Multi_Browser::item_select(item, val); + static_cast<My_Multi_Browser*>(b)->Fl_Multi_Browser::item_select(item, val); } int fl_multi_browser_item_selected(MULTIBROWSER b, void * item) { - return reinterpret_cast<My_Multi_Browser*>(b)->Fl_Multi_Browser::item_selected(item); + return static_cast<My_Multi_Browser*>(b)->Fl_Multi_Browser::item_selected(item); } void fl_multi_browser_item_swap(MULTIBROWSER b, void * x, void * y) { - reinterpret_cast<My_Multi_Browser*>(b)->Fl_Multi_Browser::item_swap(x, y); + static_cast<My_Multi_Browser*>(b)->Fl_Multi_Browser::item_swap(x, y); } const char * fl_multi_browser_item_text(MULTIBROWSER b, void * item) { - return reinterpret_cast<My_Multi_Browser*>(b)->Fl_Multi_Browser::item_text(item); + return static_cast<My_Multi_Browser*>(b)->Fl_Multi_Browser::item_text(item); } void fl_multi_browser_item_draw(MULTIBROWSER b, void * item, int x, int y, int w, int h) { - reinterpret_cast<My_Multi_Browser*>(b)->Fl_Multi_Browser::item_draw(item, x, y, w, h); + static_cast<My_Multi_Browser*>(b)->Fl_Multi_Browser::item_draw(item, x, y, w, h); } int fl_multi_browser_full_width(MULTIBROWSER c) { - return reinterpret_cast<My_Multi_Browser*>(c)->Fl_Multi_Browser::full_width(); + return static_cast<My_Multi_Browser*>(c)->Fl_Multi_Browser::full_width(); } int fl_multi_browser_item_quick_height(MULTIBROWSER c, void * i) { - return reinterpret_cast<My_Multi_Browser*>(c)->Fl_Multi_Browser::item_quick_height(i); + return static_cast<My_Multi_Browser*>(c)->Fl_Multi_Browser::item_quick_height(i); } void fl_multi_browser_draw(MULTIBROWSER b) { - reinterpret_cast<My_Multi_Browser*>(b)->Fl_Multi_Browser::draw(); + static_cast<My_Multi_Browser*>(b)->Fl_Multi_Browser::draw(); } int fl_multi_browser_handle(MULTIBROWSER b, int e) { - return reinterpret_cast<My_Multi_Browser*>(b)->Fl_Multi_Browser::handle(e); + return static_cast<My_Multi_Browser*>(b)->Fl_Multi_Browser::handle(e); } diff --git a/src/c_fl_multiline_input.cpp b/src/c_fl_multiline_input.cpp index 46d0a33..ee99a13 100644 --- a/src/c_fl_multiline_input.cpp +++ b/src/c_fl_multiline_input.cpp @@ -50,18 +50,18 @@ MULTILINEINPUT new_fl_multiline_input(int x, int y, int w, int h, char* label) { } void free_fl_multiline_input(MULTILINEINPUT i) { - delete reinterpret_cast<My_Multiline_Input*>(i); + delete static_cast<My_Multiline_Input*>(i); } void fl_multiline_input_draw(MULTILINEINPUT i) { - reinterpret_cast<My_Multiline_Input*>(i)->Fl_Multiline_Input::draw(); + static_cast<My_Multiline_Input*>(i)->Fl_Multiline_Input::draw(); } int fl_multiline_input_handle(MULTILINEINPUT i, int e) { - return reinterpret_cast<My_Multiline_Input*>(i)->Fl_Multiline_Input::handle(e); + return static_cast<My_Multiline_Input*>(i)->Fl_Multiline_Input::handle(e); } diff --git a/src/c_fl_multiline_output.cpp b/src/c_fl_multiline_output.cpp index 6be13a2..2401fc7 100644 --- a/src/c_fl_multiline_output.cpp +++ b/src/c_fl_multiline_output.cpp @@ -50,18 +50,18 @@ MULTILINEOUTPUT new_fl_multiline_output(int x, int y, int w, int h, char* label) } void free_fl_multiline_output(MULTILINEOUTPUT i) { - delete reinterpret_cast<My_Multiline_Output*>(i); + delete static_cast<My_Multiline_Output*>(i); } void fl_multiline_output_draw(MULTILINEOUTPUT i) { - reinterpret_cast<My_Multiline_Output*>(i)->Fl_Multiline_Output::draw(); + static_cast<My_Multiline_Output*>(i)->Fl_Multiline_Output::draw(); } int fl_multiline_output_handle(MULTILINEOUTPUT i, int e) { - return reinterpret_cast<My_Multiline_Output*>(i)->Fl_Multiline_Output::handle(e); + return static_cast<My_Multiline_Output*>(i)->Fl_Multiline_Output::handle(e); } diff --git a/src/c_fl_nice_slider.cpp b/src/c_fl_nice_slider.cpp index e4263dd..378f31c 100644 --- a/src/c_fl_nice_slider.cpp +++ b/src/c_fl_nice_slider.cpp @@ -50,18 +50,18 @@ NICESLIDER new_fl_nice_slider(int x, int y, int w, int h, char* label) { } void free_fl_nice_slider(NICESLIDER s) { - delete reinterpret_cast<My_Nice_Slider*>(s); + delete static_cast<My_Nice_Slider*>(s); } void fl_nice_slider_draw(NICESLIDER s) { - reinterpret_cast<My_Nice_Slider*>(s)->Fl_Nice_Slider::draw(); + static_cast<My_Nice_Slider*>(s)->Fl_Nice_Slider::draw(); } int fl_nice_slider_handle(NICESLIDER s, int e) { - return reinterpret_cast<My_Nice_Slider*>(s)->Fl_Nice_Slider::handle(e); + return static_cast<My_Nice_Slider*>(s)->Fl_Nice_Slider::handle(e); } diff --git a/src/c_fl_output.cpp b/src/c_fl_output.cpp index 2251f8d..2e937dd 100644 --- a/src/c_fl_output.cpp +++ b/src/c_fl_output.cpp @@ -50,18 +50,18 @@ OUTPUTT new_fl_output(int x, int y, int w, int h, char* label) { } void free_fl_output(OUTPUTT i) { - delete reinterpret_cast<My_Output*>(i); + delete static_cast<My_Output*>(i); } void fl_output_draw(OUTPUTT i) { - reinterpret_cast<My_Output*>(i)->Fl_Output::draw(); + static_cast<My_Output*>(i)->Fl_Output::draw(); } int fl_output_handle(OUTPUTT i, int e) { - return reinterpret_cast<My_Output*>(i)->Fl_Output::handle(e); + return static_cast<My_Output*>(i)->Fl_Output::handle(e); } diff --git a/src/c_fl_overlay_window.cpp b/src/c_fl_overlay_window.cpp index c5610ef..0d434c3 100644 --- a/src/c_fl_overlay_window.cpp +++ b/src/c_fl_overlay_window.cpp @@ -65,52 +65,52 @@ OVERLAYWINDOW new_fl_overlay_window2(int w, int h, char *label) { } void free_fl_overlay_window(OVERLAYWINDOW w) { - delete reinterpret_cast<My_Overlay_Window*>(w); + delete static_cast<My_Overlay_Window*>(w); } int fl_overlay_window_can_do_overlay(OVERLAYWINDOW w) { - return reinterpret_cast<Fl_Overlay_Window*>(w)->can_do_overlay(); + return static_cast<Fl_Overlay_Window*>(w)->can_do_overlay(); } void fl_overlay_window_resize(OVERLAYWINDOW ow, int x, int y, int w, int h) { - reinterpret_cast<Fl_Overlay_Window*>(ow)->resize(x, y, w, h); + static_cast<Fl_Overlay_Window*>(ow)->resize(x, y, w, h); } void fl_overlay_window_show(OVERLAYWINDOW w) { - reinterpret_cast<Fl_Overlay_Window*>(w)->show(); + static_cast<Fl_Overlay_Window*>(w)->show(); } void fl_overlay_window_show2(OVERLAYWINDOW w, int c, void * v) { - reinterpret_cast<Fl_Overlay_Window*>(w)->show(c, static_cast<char**>(v)); + static_cast<Fl_Overlay_Window*>(w)->show(c, static_cast<char**>(v)); } void fl_overlay_window_hide(OVERLAYWINDOW w) { - reinterpret_cast<Fl_Overlay_Window*>(w)->hide(); + static_cast<Fl_Overlay_Window*>(w)->hide(); } void fl_overlay_window_flush(OVERLAYWINDOW w) { - reinterpret_cast<Fl_Overlay_Window*>(w)->flush(); + static_cast<Fl_Overlay_Window*>(w)->flush(); } void fl_overlay_window_redraw_overlay(OVERLAYWINDOW w) { - reinterpret_cast<Fl_Overlay_Window*>(w)->redraw_overlay(); + static_cast<Fl_Overlay_Window*>(w)->redraw_overlay(); } void fl_overlay_window_draw(OVERLAYWINDOW w) { - reinterpret_cast<My_Overlay_Window*>(w)->Fl_Overlay_Window::draw(); + static_cast<My_Overlay_Window*>(w)->Fl_Overlay_Window::draw(); } int fl_overlay_window_handle(OVERLAYWINDOW w, int e) { - return reinterpret_cast<My_Overlay_Window*>(w)->Fl_Overlay_Window::handle(e); + return static_cast<My_Overlay_Window*>(w)->Fl_Overlay_Window::handle(e); } diff --git a/src/c_fl_pack.cpp b/src/c_fl_pack.cpp index 2e83b3f..e7cace9 100644 --- a/src/c_fl_pack.cpp +++ b/src/c_fl_pack.cpp @@ -50,29 +50,29 @@ PACK new_fl_pack(int x, int y, int w, int h, char* label) { } void free_fl_pack(PACK p) { - delete reinterpret_cast<My_Pack*>(p); + delete static_cast<My_Pack*>(p); } int fl_pack_get_spacing(PACK p) { - return reinterpret_cast<Fl_Pack*>(p)->spacing(); + return static_cast<Fl_Pack*>(p)->spacing(); } void fl_pack_set_spacing(PACK p, int t) { - reinterpret_cast<Fl_Pack*>(p)->spacing(t); + static_cast<Fl_Pack*>(p)->spacing(t); } void fl_pack_draw(PACK n) { - reinterpret_cast<My_Pack*>(n)->Fl_Pack::draw(); + static_cast<My_Pack*>(n)->Fl_Pack::draw(); } int fl_pack_handle(PACK n, int e) { - return reinterpret_cast<My_Pack*>(n)->Fl_Pack::handle(e); + return static_cast<My_Pack*>(n)->Fl_Pack::handle(e); } diff --git a/src/c_fl_paged_device.cpp b/src/c_fl_paged_device.cpp index 2d3e788..f8f7d60 100644 --- a/src/c_fl_paged_device.cpp +++ b/src/c_fl_paged_device.cpp @@ -42,7 +42,7 @@ void fl_paged_device_get_page_format(int i, const char ** n, int * w, int * h) { class My_Paged_Device : public Fl_Paged_Device { public: using Fl_Paged_Device::Fl_Paged_Device; - friend PAGED_DEVICE new_fl_paged_device(void); + friend PAGEDDEVICE new_fl_paged_device(void); }; @@ -50,104 +50,105 @@ public: // Flattened C API -PAGED_DEVICE new_fl_paged_device(void) { +PAGEDDEVICE new_fl_paged_device(void) { My_Paged_Device *p = new My_Paged_Device(); return p; } -void free_fl_paged_device(PAGED_DEVICE p) { - delete reinterpret_cast<My_Paged_Device*>(p); +void free_fl_paged_device(PAGEDDEVICE p) { + delete static_cast<My_Paged_Device*>(p); } -int fl_paged_device_start_job(PAGED_DEVICE p, int c) { +int fl_paged_device_start_job(PAGEDDEVICE p, int c) { // virtual so disable dispatch - return reinterpret_cast<Fl_Paged_Device*>(p)->Fl_Paged_Device::start_job(c, 0, 0); + return static_cast<Fl_Paged_Device*>(p)->Fl_Paged_Device::start_job(c, 0, 0); } -int fl_paged_device_start_job2(PAGED_DEVICE p, int c, int * f, int * t) { +int fl_paged_device_start_job2(PAGEDDEVICE p, int c, int * f, int * t) { // virtual so disable dispatch - return reinterpret_cast<Fl_Paged_Device*>(p)->Fl_Paged_Device::start_job(c, f, t); + return static_cast<Fl_Paged_Device*>(p)->Fl_Paged_Device::start_job(c, f, t); } -void fl_paged_device_end_job(PAGED_DEVICE p) { +void fl_paged_device_end_job(PAGEDDEVICE p) { // virtual so disable dispatch - reinterpret_cast<Fl_Paged_Device*>(p)->Fl_Paged_Device::end_job(); + static_cast<Fl_Paged_Device*>(p)->Fl_Paged_Device::end_job(); } -int fl_paged_device_start_page(PAGED_DEVICE p) { +int fl_paged_device_start_page(PAGEDDEVICE p) { // virtual so disable dispatch - return reinterpret_cast<Fl_Paged_Device*>(p)->Fl_Paged_Device::start_page(); + return static_cast<Fl_Paged_Device*>(p)->Fl_Paged_Device::start_page(); } -int fl_paged_device_end_page(PAGED_DEVICE p) { +int fl_paged_device_end_page(PAGEDDEVICE p) { // virtual so disable dispatch - return reinterpret_cast<Fl_Paged_Device*>(p)->Fl_Paged_Device::end_page(); + return static_cast<Fl_Paged_Device*>(p)->Fl_Paged_Device::end_page(); } -void fl_paged_device_margins(PAGED_DEVICE p, int * l, int * t, int * r, int * b) { +void fl_paged_device_margins(PAGEDDEVICE p, int * l, int * t, int * r, int * b) { // virtual so disable dispatch - reinterpret_cast<Fl_Paged_Device*>(p)->Fl_Paged_Device::margins(l,t,r,b); + static_cast<Fl_Paged_Device*>(p)->Fl_Paged_Device::margins(l,t,r,b); } -int fl_paged_device_printable_rect(PAGED_DEVICE p, int * w, int * h) { +int fl_paged_device_printable_rect(PAGEDDEVICE p, int * w, int * h) { // virtual so disable dispatch - return reinterpret_cast<Fl_Paged_Device*>(p)->Fl_Paged_Device::printable_rect(w,h); + return static_cast<Fl_Paged_Device*>(p)->Fl_Paged_Device::printable_rect(w,h); } -void fl_paged_device_get_origin(PAGED_DEVICE p, int * x, int * y) { +void fl_paged_device_get_origin(PAGEDDEVICE p, int * x, int * y) { // virtual so disable dispatch - reinterpret_cast<Fl_Paged_Device*>(p)->Fl_Paged_Device::origin(x,y); + static_cast<Fl_Paged_Device*>(p)->Fl_Paged_Device::origin(x,y); } -void fl_paged_device_set_origin(PAGED_DEVICE p, int x, int y) { +void fl_paged_device_set_origin(PAGEDDEVICE p, int x, int y) { // virtual so disable dispatch - reinterpret_cast<Fl_Paged_Device*>(p)->Fl_Paged_Device::origin(x,y); + static_cast<Fl_Paged_Device*>(p)->Fl_Paged_Device::origin(x,y); } -void fl_paged_device_rotate(PAGED_DEVICE p, float r) { +void fl_paged_device_rotate(PAGEDDEVICE p, float r) { // virtual so disable dispatch - reinterpret_cast<Fl_Paged_Device*>(p)->Fl_Paged_Device::rotate(r); + static_cast<Fl_Paged_Device*>(p)->Fl_Paged_Device::rotate(r); } -void fl_paged_device_scale(PAGED_DEVICE p, float x, float y) { +void fl_paged_device_scale(PAGEDDEVICE p, float x, float y) { // virtual so disable dispatch - reinterpret_cast<Fl_Paged_Device*>(p)->Fl_Paged_Device::scale(x,y); + static_cast<Fl_Paged_Device*>(p)->Fl_Paged_Device::scale(x,y); } -void fl_paged_device_translate(PAGED_DEVICE p, int x, int y) { +void fl_paged_device_translate(PAGEDDEVICE p, int x, int y) { // virtual so disable dispatch - reinterpret_cast<Fl_Paged_Device*>(p)->Fl_Paged_Device::translate(x,y); + static_cast<Fl_Paged_Device*>(p)->Fl_Paged_Device::translate(x,y); } -void fl_paged_device_untranslate(PAGED_DEVICE p) { +void fl_paged_device_untranslate(PAGEDDEVICE p) { // virtual so disable dispatch - reinterpret_cast<Fl_Paged_Device*>(p)->Fl_Paged_Device::untranslate(); + static_cast<Fl_Paged_Device*>(p)->Fl_Paged_Device::untranslate(); } -void fl_paged_device_print_widget(PAGED_DEVICE p, void * i, int dx, int dy) { +void fl_paged_device_print_widget(PAGEDDEVICE p, void * i, int dx, int dy) { // virtual so disable dispatch - reinterpret_cast<Fl_Paged_Device*>(p)->Fl_Paged_Device::print_widget(reinterpret_cast<Fl_Widget*>(i),dx,dy); + static_cast<Fl_Paged_Device*>(p)->Fl_Paged_Device::print_widget + (static_cast<Fl_Widget*>(i),dx,dy); } -void fl_paged_device_print_window(PAGED_DEVICE p, void * i, int dx, int dy) { - reinterpret_cast<Fl_Paged_Device*>(p)->print_window(reinterpret_cast<Fl_Window*>(i),dx,dy); +void fl_paged_device_print_window(PAGEDDEVICE p, void * i, int dx, int dy) { + static_cast<Fl_Paged_Device*>(p)->print_window(static_cast<Fl_Window*>(i),dx,dy); } -void fl_paged_device_print_window_part(PAGED_DEVICE p, void * i, int x, int y, +void fl_paged_device_print_window_part(PAGEDDEVICE p, void * i, int x, int y, int w, int h, int dx, int dy) { // virtual so disable dispatch - reinterpret_cast<Fl_Paged_Device*>(p)->Fl_Paged_Device::print_window_part - (reinterpret_cast<Fl_Window*>(i),x,y,w,h,dx,dy); + static_cast<Fl_Paged_Device*>(p)->Fl_Paged_Device::print_window_part + (static_cast<Fl_Window*>(i),x,y,w,h,dx,dy); } diff --git a/src/c_fl_paged_device.h b/src/c_fl_paged_device.h index aef50c1..90befcf 100644 --- a/src/c_fl_paged_device.h +++ b/src/c_fl_paged_device.h @@ -19,33 +19,33 @@ extern "C" const int fl_no_page_formats; extern "C" void fl_paged_device_get_page_format(int i, const char ** n, int * w, int * h); -typedef void* PAGED_DEVICE; +typedef void* PAGEDDEVICE; -extern "C" PAGED_DEVICE new_fl_paged_device(void); -extern "C" void free_fl_paged_device(PAGED_DEVICE p); +extern "C" PAGEDDEVICE new_fl_paged_device(void); +extern "C" void free_fl_paged_device(PAGEDDEVICE p); -extern "C" int fl_paged_device_start_job(PAGED_DEVICE p, int c); -extern "C" int fl_paged_device_start_job2(PAGED_DEVICE p, int c, int * f, int * t); -extern "C" void fl_paged_device_end_job(PAGED_DEVICE p); -extern "C" int fl_paged_device_start_page(PAGED_DEVICE p); -extern "C" int fl_paged_device_end_page(PAGED_DEVICE p); +extern "C" int fl_paged_device_start_job(PAGEDDEVICE p, int c); +extern "C" int fl_paged_device_start_job2(PAGEDDEVICE p, int c, int * f, int * t); +extern "C" void fl_paged_device_end_job(PAGEDDEVICE p); +extern "C" int fl_paged_device_start_page(PAGEDDEVICE p); +extern "C" int fl_paged_device_end_page(PAGEDDEVICE p); -extern "C" void fl_paged_device_margins(PAGED_DEVICE p, int * l, int * t, int * r, int * b); -extern "C" int fl_paged_device_printable_rect(PAGED_DEVICE p, int * w, int * h); -extern "C" void fl_paged_device_get_origin(PAGED_DEVICE p, int * x, int * y); -extern "C" void fl_paged_device_set_origin(PAGED_DEVICE p, int x, int y); -extern "C" void fl_paged_device_rotate(PAGED_DEVICE p, float r); -extern "C" void fl_paged_device_scale(PAGED_DEVICE p, float x, float y); -extern "C" void fl_paged_device_translate(PAGED_DEVICE p, int x, int y); -extern "C" void fl_paged_device_untranslate(PAGED_DEVICE p); +extern "C" void fl_paged_device_margins(PAGEDDEVICE p, int * l, int * t, int * r, int * b); +extern "C" int fl_paged_device_printable_rect(PAGEDDEVICE p, int * w, int * h); +extern "C" void fl_paged_device_get_origin(PAGEDDEVICE p, int * x, int * y); +extern "C" void fl_paged_device_set_origin(PAGEDDEVICE p, int x, int y); +extern "C" void fl_paged_device_rotate(PAGEDDEVICE p, float r); +extern "C" void fl_paged_device_scale(PAGEDDEVICE p, float x, float y); +extern "C" void fl_paged_device_translate(PAGEDDEVICE p, int x, int y); +extern "C" void fl_paged_device_untranslate(PAGEDDEVICE p); -extern "C" void fl_paged_device_print_widget(PAGED_DEVICE p, void * i, int dx, int dy); -extern "C" void fl_paged_device_print_window(PAGED_DEVICE p, void * i, int dx, int dy); -extern "C" void fl_paged_device_print_window_part(PAGED_DEVICE p, void * i, int x, int y, +extern "C" void fl_paged_device_print_widget(PAGEDDEVICE p, void * i, int dx, int dy); +extern "C" void fl_paged_device_print_window(PAGEDDEVICE p, void * i, int dx, int dy); +extern "C" void fl_paged_device_print_window_part(PAGEDDEVICE p, void * i, int x, int y, int w, int h, int dx, int dy); diff --git a/src/c_fl_pixmap.cpp b/src/c_fl_pixmap.cpp index b880bac..6ebcb56 100644 --- a/src/c_fl_pixmap.cpp +++ b/src/c_fl_pixmap.cpp @@ -11,16 +11,16 @@ void free_fl_pixmap(PIXMAP b) { - delete reinterpret_cast<Fl_Pixmap*>(b); + delete static_cast<Fl_Pixmap*>(b); } PIXMAP fl_pixmap_copy(PIXMAP b, int w, int h) { // virtual so disable dispatch - return reinterpret_cast<Fl_Pixmap*>(b)->Fl_Pixmap::copy(w, h); + return static_cast<Fl_Pixmap*>(b)->Fl_Pixmap::copy(w, h); } PIXMAP fl_pixmap_copy2(PIXMAP b) { - return reinterpret_cast<Fl_Pixmap*>(b)->copy(); + return static_cast<Fl_Pixmap*>(b)->copy(); } @@ -28,12 +28,12 @@ PIXMAP fl_pixmap_copy2(PIXMAP b) { void fl_pixmap_color_average(PIXMAP p, int c, float b) { // virtual so disable dispatch - reinterpret_cast<Fl_Pixmap*>(p)->Fl_Pixmap::color_average(c, b); + static_cast<Fl_Pixmap*>(p)->Fl_Pixmap::color_average(c, b); } void fl_pixmap_desaturate(PIXMAP p) { // virtual so disable dispatch - reinterpret_cast<Fl_Pixmap*>(p)->Fl_Pixmap::desaturate(); + static_cast<Fl_Pixmap*>(p)->Fl_Pixmap::desaturate(); } @@ -41,18 +41,18 @@ void fl_pixmap_desaturate(PIXMAP p) { void fl_pixmap_uncache(PIXMAP p) { // virtual so disable dispatch - reinterpret_cast<Fl_Pixmap*>(p)->Fl_Pixmap::uncache(); + static_cast<Fl_Pixmap*>(p)->Fl_Pixmap::uncache(); } void fl_pixmap_draw2(PIXMAP b, int x, int y) { - reinterpret_cast<Fl_Pixmap*>(b)->draw(x, y); + static_cast<Fl_Pixmap*>(b)->draw(x, y); } void fl_pixmap_draw(PIXMAP b, int x, int y, int w, int h, int cx, int cy) { // virtual so disable dispatch - reinterpret_cast<Fl_Pixmap*>(b)->Fl_Pixmap::draw(x, y, w, h, cx, cy); + static_cast<Fl_Pixmap*>(b)->Fl_Pixmap::draw(x, y, w, h, cx, cy); } diff --git a/src/c_fl_pixmap.h b/src/c_fl_pixmap.h index aa3be59..ceba284 100644 --- a/src/c_fl_pixmap.h +++ b/src/c_fl_pixmap.h @@ -8,13 +8,9 @@ #define FL_PIXMAP_GUARD - - typedef void* PIXMAP; - - extern "C" void free_fl_pixmap(PIXMAP b); extern "C" PIXMAP fl_pixmap_copy(PIXMAP b, int w, int h); extern "C" PIXMAP fl_pixmap_copy2(PIXMAP b); @@ -33,3 +29,4 @@ extern "C" void fl_pixmap_draw(PIXMAP b, int x, int y, int w, int h, int cx, int #endif + diff --git a/src/c_fl_png_image.cpp b/src/c_fl_png_image.cpp index e4b0c33..a4a6d71 100644 --- a/src/c_fl_png_image.cpp +++ b/src/c_fl_png_image.cpp @@ -10,17 +10,17 @@ -PNG_IMAGE new_fl_png_image(const char * f) { +PNGIMAGE new_fl_png_image(const char * f) { Fl_PNG_Image *p = new Fl_PNG_Image(f); return p; } -PNG_IMAGE new_fl_png_image2(const char *name, void *data, int size) { - Fl_PNG_Image *p = new Fl_PNG_Image(name, reinterpret_cast<uchar*>(data), size); +PNGIMAGE new_fl_png_image2(const char *name, void *data, int size) { + Fl_PNG_Image *p = new Fl_PNG_Image(name, static_cast<uchar*>(data), size); return p; } -void free_fl_png_image(PNG_IMAGE p) { - delete reinterpret_cast<Fl_PNG_Image*>(p); +void free_fl_png_image(PNGIMAGE p) { + delete static_cast<Fl_PNG_Image*>(p); } diff --git a/src/c_fl_png_image.h b/src/c_fl_png_image.h index 78dd203..83344e0 100644 --- a/src/c_fl_png_image.h +++ b/src/c_fl_png_image.h @@ -8,17 +8,14 @@ #define FL_PNG_IMAGE_GUARD +typedef void* PNGIMAGE; -typedef void* PNG_IMAGE; - - - - -extern "C" PNG_IMAGE new_fl_png_image(const char * f); -extern "C" PNG_IMAGE new_fl_png_image2(const char *name, void *data, int size); -extern "C" void free_fl_png_image(PNG_IMAGE p); +extern "C" PNGIMAGE new_fl_png_image(const char * f); +extern "C" PNGIMAGE new_fl_png_image2(const char *name, void *data, int size); +extern "C" void free_fl_png_image(PNGIMAGE p); #endif + diff --git a/src/c_fl_pnm_image.cpp b/src/c_fl_pnm_image.cpp index d88a92e..1550998 100644 --- a/src/c_fl_pnm_image.cpp +++ b/src/c_fl_pnm_image.cpp @@ -10,12 +10,12 @@ -PNM_IMAGE new_fl_pnm_image(const char * f) { +PNMIMAGE new_fl_pnm_image(const char * f) { Fl_PNM_Image *p = new Fl_PNM_Image(f); return p; } -void free_fl_pnm_image(PNM_IMAGE p) { - delete reinterpret_cast<Fl_PNM_Image*>(p); +void free_fl_pnm_image(PNMIMAGE p) { + delete static_cast<Fl_PNM_Image*>(p); } diff --git a/src/c_fl_pnm_image.h b/src/c_fl_pnm_image.h index 0757916..6feeff9 100644 --- a/src/c_fl_pnm_image.h +++ b/src/c_fl_pnm_image.h @@ -8,16 +8,13 @@ #define FL_PNM_IMAGE_GUARD +typedef void* PNMIMAGE; -typedef void* PNM_IMAGE; - - - - -extern "C" PNM_IMAGE new_fl_pnm_image(const char * f); -extern "C" void free_fl_pnm_image(PNM_IMAGE p); +extern "C" PNMIMAGE new_fl_pnm_image(const char * f); +extern "C" void free_fl_pnm_image(PNMIMAGE p); #endif + diff --git a/src/c_fl_postscript_file_device.cpp b/src/c_fl_postscript_file_device.cpp index 22495dd..480d273 100644 --- a/src/c_fl_postscript_file_device.cpp +++ b/src/c_fl_postscript_file_device.cpp @@ -28,7 +28,7 @@ POSTSCRIPTFILEDEVICE new_fl_postscript_file_device(void) { } void free_fl_postscript_file_device(POSTSCRIPTFILEDEVICE p) { - delete reinterpret_cast<Fl_PostScript_File_Device*>(p); + delete static_cast<Fl_PostScript_File_Device*>(p); } @@ -46,80 +46,80 @@ void fl_postscript_file_device_set_file_chooser_title(const char * v) { void * fl_postscript_file_device_get_driver(POSTSCRIPTFILEDEVICE p) { - return (reinterpret_cast<Fl_PostScript_File_Device*>(p)->*(&My_PostScript_File_Device::driver))(); + return (static_cast<Fl_PostScript_File_Device*>(p)->*(&My_PostScript_File_Device::driver))(); } int fl_postscript_file_device_start_job(POSTSCRIPTFILEDEVICE p, int c) { - return reinterpret_cast<Fl_PostScript_File_Device*>(p)->start_job(c, 0, 0); + return static_cast<Fl_PostScript_File_Device*>(p)->start_job(c, 0, 0); } int fl_postscript_file_device_start_job2(POSTSCRIPTFILEDEVICE p, int c, int * f, int * t) { - return reinterpret_cast<Fl_PostScript_File_Device*>(p)->start_job(c, f, t); + return static_cast<Fl_PostScript_File_Device*>(p)->start_job(c, f, t); } int fl_postscript_file_device_start_job3(POSTSCRIPTFILEDEVICE p, void * o, int c, int f, int l) { - return reinterpret_cast<Fl_PostScript_File_Device*>(p)->start_job - (reinterpret_cast<FILE*>(o), + return static_cast<Fl_PostScript_File_Device*>(p)->start_job + (static_cast<FILE*>(o), c, static_cast<Fl_Paged_Device::Page_Format>(f), static_cast<Fl_Paged_Device::Page_Layout>(l)); } int fl_postscript_file_device_start_job4(POSTSCRIPTFILEDEVICE p, int c, int f, int l) { - return reinterpret_cast<Fl_PostScript_File_Device*>(p)->start_job + return static_cast<Fl_PostScript_File_Device*>(p)->start_job (c, static_cast<Fl_Paged_Device::Page_Format>(f), static_cast<Fl_Paged_Device::Page_Layout>(l)); } void fl_postscript_file_device_end_job(POSTSCRIPTFILEDEVICE p) { - reinterpret_cast<Fl_PostScript_File_Device*>(p)->end_job(); + static_cast<Fl_PostScript_File_Device*>(p)->end_job(); } int fl_postscript_file_device_start_page(POSTSCRIPTFILEDEVICE p) { - return reinterpret_cast<Fl_PostScript_File_Device*>(p)->start_page(); + return static_cast<Fl_PostScript_File_Device*>(p)->start_page(); } int fl_postscript_file_device_end_page(POSTSCRIPTFILEDEVICE p) { - return reinterpret_cast<Fl_PostScript_File_Device*>(p)->end_page(); + return static_cast<Fl_PostScript_File_Device*>(p)->end_page(); } void fl_postscript_file_device_margins(POSTSCRIPTFILEDEVICE p, int * l, int * t, int * r, int * b) { - reinterpret_cast<Fl_PostScript_File_Device*>(p)->margins(l,t,r,b); + static_cast<Fl_PostScript_File_Device*>(p)->margins(l,t,r,b); } int fl_postscript_file_device_printable_rect(POSTSCRIPTFILEDEVICE p, int * w, int * h) { - return reinterpret_cast<Fl_PostScript_File_Device*>(p)->printable_rect(w,h); + return static_cast<Fl_PostScript_File_Device*>(p)->printable_rect(w,h); } void fl_postscript_file_device_get_origin(POSTSCRIPTFILEDEVICE p, int * x, int * y) { - reinterpret_cast<Fl_PostScript_File_Device*>(p)->origin(x,y); + static_cast<Fl_PostScript_File_Device*>(p)->origin(x,y); } void fl_postscript_file_device_set_origin(POSTSCRIPTFILEDEVICE p, int x, int y) { - reinterpret_cast<Fl_PostScript_File_Device*>(p)->origin(x,y); + static_cast<Fl_PostScript_File_Device*>(p)->origin(x,y); } void fl_postscript_file_device_rotate(POSTSCRIPTFILEDEVICE p, float r) { - reinterpret_cast<Fl_PostScript_File_Device*>(p)->rotate(r); + static_cast<Fl_PostScript_File_Device*>(p)->rotate(r); } void fl_postscript_file_device_scale(POSTSCRIPTFILEDEVICE p, float x, float y) { - reinterpret_cast<Fl_PostScript_File_Device*>(p)->scale(x,y); + static_cast<Fl_PostScript_File_Device*>(p)->scale(x,y); } void fl_postscript_file_device_translate(POSTSCRIPTFILEDEVICE p, int x, int y) { - reinterpret_cast<Fl_PostScript_File_Device*>(p)->translate(x,y); + static_cast<Fl_PostScript_File_Device*>(p)->translate(x,y); } void fl_postscript_file_device_untranslate(POSTSCRIPTFILEDEVICE p) { - reinterpret_cast<Fl_PostScript_File_Device*>(p)->untranslate(); + static_cast<Fl_PostScript_File_Device*>(p)->untranslate(); } diff --git a/src/c_fl_preferences.cpp b/src/c_fl_preferences.cpp index 6f2e1ad..d2b0d2c 100644 --- a/src/c_fl_preferences.cpp +++ b/src/c_fl_preferences.cpp @@ -47,20 +47,20 @@ PREFS new_fl_pref_database_scope(int s, char * v, char * a) { } void upref_fl_pref_database(PREFS e) { - reinterpret_cast<My_Preferences*>(e)->reference_count += 1; + static_cast<My_Preferences*>(e)->reference_count += 1; } void free_fl_pref_database(PREFS e) { - if (reinterpret_cast<My_Preferences*>(e)->reference_count <= 0) { - delete reinterpret_cast<My_Preferences*>(e); + if (static_cast<My_Preferences*>(e)->reference_count <= 0) { + delete static_cast<My_Preferences*>(e); } else { - reinterpret_cast<My_Preferences*>(e)->reference_count -= 1; + static_cast<My_Preferences*>(e)->reference_count -= 1; } } PREFS new_fl_pref_group_copy(PREFS e) { - Fl_Preferences *g = new Fl_Preferences(reinterpret_cast<Fl_Preferences*>(e)); + Fl_Preferences *g = new Fl_Preferences(static_cast<Fl_Preferences*>(e)); return g; } @@ -70,129 +70,129 @@ PREFS new_fl_pref_group_memory(char * n) { } PREFS new_fl_pref_group_name(PREFS e, char * n) { - Fl_Preferences *g = new Fl_Preferences(reinterpret_cast<Fl_Preferences*>(e), n); + Fl_Preferences *g = new Fl_Preferences(static_cast<Fl_Preferences*>(e), n); return g; } PREFS new_fl_pref_group_index(PREFS e, int i) { - Fl_Preferences *g = new Fl_Preferences(reinterpret_cast<Fl_Preferences*>(e), i); + Fl_Preferences *g = new Fl_Preferences(static_cast<Fl_Preferences*>(e), i); return g; } void free_fl_pref_group(PREFS e) { - delete reinterpret_cast<Fl_Preferences*>(e); + delete static_cast<Fl_Preferences*>(e); } void fl_preferences_flush(PREFS e) { - reinterpret_cast<Fl_Preferences*>(e)->flush(); + static_cast<Fl_Preferences*>(e)->flush(); } int fl_preferences_getuserdatapath(PREFS e, char * p, int len) { - return (int)reinterpret_cast<Fl_Preferences*>(e)->getUserdataPath(p, len); + return (int)static_cast<Fl_Preferences*>(e)->getUserdataPath(p, len); } int fl_preferences_deleteentry(PREFS e, const char * k) { - return (int)reinterpret_cast<Fl_Preferences*>(e)->deleteEntry(k); + return (int)static_cast<Fl_Preferences*>(e)->deleteEntry(k); } int fl_preferences_deleteallentries(PREFS e) { - return (int)reinterpret_cast<Fl_Preferences*>(e)->deleteAllEntries(); + return (int)static_cast<Fl_Preferences*>(e)->deleteAllEntries(); } int fl_preferences_deletegroup(PREFS e, const char * g) { - return (int)reinterpret_cast<Fl_Preferences*>(e)->deleteGroup(g); + return (int)static_cast<Fl_Preferences*>(e)->deleteGroup(g); } int fl_preferences_deleteallgroups(PREFS e) { - return (int)reinterpret_cast<Fl_Preferences*>(e)->deleteAllGroups(); + return (int)static_cast<Fl_Preferences*>(e)->deleteAllGroups(); } int fl_preferences_clear(PREFS e) { - return (int)reinterpret_cast<Fl_Preferences*>(e)->clear(); + return (int)static_cast<Fl_Preferences*>(e)->clear(); } int fl_preferences_entries(PREFS e) { - return reinterpret_cast<Fl_Preferences*>(e)->entries(); + return static_cast<Fl_Preferences*>(e)->entries(); } const char * fl_preferences_entry(PREFS e, int i) { - return reinterpret_cast<Fl_Preferences*>(e)->entry(i); + return static_cast<Fl_Preferences*>(e)->entry(i); } int fl_preferences_entryexists(PREFS e, const char * k) { - return (int)reinterpret_cast<Fl_Preferences*>(e)->entryExists(k); + return (int)static_cast<Fl_Preferences*>(e)->entryExists(k); } int fl_preferences_size(PREFS e, const char * k) { - return reinterpret_cast<Fl_Preferences*>(e)->size(k); + return static_cast<Fl_Preferences*>(e)->size(k); } int fl_preferences_groups(PREFS e) { - return reinterpret_cast<Fl_Preferences*>(e)->groups(); + return static_cast<Fl_Preferences*>(e)->groups(); } const char * fl_preferences_group(PREFS e, int i) { - return reinterpret_cast<Fl_Preferences*>(e)->group(i); + return static_cast<Fl_Preferences*>(e)->group(i); } int fl_preferences_groupexists(PREFS e, const char * g) { - return (int)reinterpret_cast<Fl_Preferences*>(e)->groupExists(g); + return (int)static_cast<Fl_Preferences*>(e)->groupExists(g); } const char * fl_preferences_name(PREFS e) { - return reinterpret_cast<Fl_Preferences*>(e)->name(); + return static_cast<Fl_Preferences*>(e)->name(); } const char * fl_preferences_path(PREFS e) { - return reinterpret_cast<Fl_Preferences*>(e)->path(); + return static_cast<Fl_Preferences*>(e)->path(); } int fl_preferences_get_int(PREFS e, const char * k, int& v, int d) { - return (int)reinterpret_cast<Fl_Preferences*>(e)->get(k,v,d); + return (int)static_cast<Fl_Preferences*>(e)->get(k,v,d); } int fl_preferences_get_float(PREFS e, const char * k, float& v, float d) { - return (int)reinterpret_cast<Fl_Preferences*>(e)->get(k,v,d); + return (int)static_cast<Fl_Preferences*>(e)->get(k,v,d); } int fl_preferences_get_double(PREFS e, const char * k, double& v, double d) { - return (int)reinterpret_cast<Fl_Preferences*>(e)->get(k,v,d); + return (int)static_cast<Fl_Preferences*>(e)->get(k,v,d); } // must deallocate result afterwards int fl_preferences_get_str(PREFS e, const char * k, char *& v, const char * d) { - return (int)reinterpret_cast<Fl_Preferences*>(e)->get(k,v,d); + return (int)static_cast<Fl_Preferences*>(e)->get(k,v,d); } int fl_preferences_get_str_limit (PREFS e, const char * k, char * v, const char * d, int m) { - return (int)reinterpret_cast<Fl_Preferences*>(e)->get(k, v, d, m); + return (int)static_cast<Fl_Preferences*>(e)->get(k, v, d, m); } // must deallocate result afterwards int fl_preferences_get_void (PREFS e, const char * k, void *& v, const void * d, int ds) { - return (int)reinterpret_cast<Fl_Preferences*>(e)->get(k, v, d, ds); + return (int)static_cast<Fl_Preferences*>(e)->get(k, v, d, ds); } int fl_preferences_get_void_limit (PREFS e, const char * k, void * v, const void * d, int ds, int ms) { - return (int)reinterpret_cast<Fl_Preferences*>(e)->get(k, v, d, ds, ms); + return (int)static_cast<Fl_Preferences*>(e)->get(k, v, d, ds, ms); } void free_fl_preferences_void_data(void * v) { @@ -203,31 +203,31 @@ void free_fl_preferences_void_data(void * v) { int fl_preferences_set_int(PREFS e, const char * k, int v) { - return (int)reinterpret_cast<Fl_Preferences*>(e)->set(k,v); + return (int)static_cast<Fl_Preferences*>(e)->set(k,v); } int fl_preferences_set_float(PREFS e, const char * k, float v) { - return (int)reinterpret_cast<Fl_Preferences*>(e)->set(k,v); + return (int)static_cast<Fl_Preferences*>(e)->set(k,v); } int fl_preferences_set_float_prec(PREFS e, const char * k, float v, int p) { - return (int)reinterpret_cast<Fl_Preferences*>(e)->set(k,v,p); + return (int)static_cast<Fl_Preferences*>(e)->set(k,v,p); } int fl_preferences_set_double(PREFS e, const char * k, double v) { - return (int)reinterpret_cast<Fl_Preferences*>(e)->set(k,v); + return (int)static_cast<Fl_Preferences*>(e)->set(k,v); } int fl_preferences_set_double_prec(PREFS e, const char * k, double v, int p) { - return (int)reinterpret_cast<Fl_Preferences*>(e)->set(k,v,p); + return (int)static_cast<Fl_Preferences*>(e)->set(k,v,p); } int fl_preferences_set_str(PREFS e, const char * k, const char * v) { - return (int)reinterpret_cast<Fl_Preferences*>(e)->set(k,v); + return (int)static_cast<Fl_Preferences*>(e)->set(k,v); } int fl_preferences_set_void(PREFS e, const char * k, const void * d, int ds) { - return (int)reinterpret_cast<Fl_Preferences*>(e)->set(k, d, ds); + return (int)static_cast<Fl_Preferences*>(e)->set(k, d, ds); } diff --git a/src/c_fl_preferences.h b/src/c_fl_preferences.h index efc6254..9f77dfb 100644 --- a/src/c_fl_preferences.h +++ b/src/c_fl_preferences.h @@ -8,26 +8,18 @@ #define FL_PREFERENCES_GUARD - - typedef void* PREFS; - - extern const int root_fl_prefs_system; extern const int root_fl_prefs_user; extern const int const_fl_path_max; - - extern "C" const char * fl_preferences_new_uuid(); - - extern "C" PREFS new_fl_pref_database_path(char * p, char * v, char * a); extern "C" PREFS new_fl_pref_database_scope(int s, char * v, char * a); extern "C" void upref_fl_pref_database(PREFS e); @@ -40,8 +32,6 @@ extern "C" PREFS new_fl_pref_group_index(PREFS e, int i); extern "C" void free_fl_pref_group(PREFS e); - - extern "C" void fl_preferences_flush(PREFS e); extern "C" int fl_preferences_getuserdatapath(PREFS e, char * p, int len); @@ -93,3 +83,4 @@ extern "C" int fl_preferences_set_void(PREFS e, const char * k, const void * d, #endif + diff --git a/src/c_fl_printer.cpp b/src/c_fl_printer.cpp index 9967678..94f31d5 100644 --- a/src/c_fl_printer.cpp +++ b/src/c_fl_printer.cpp @@ -20,7 +20,7 @@ PRINTER new_fl_printer(void) { } void free_fl_printer(PRINTER p) { - delete reinterpret_cast<Fl_Printer*>(p); + delete static_cast<Fl_Printer*>(p); } @@ -182,78 +182,78 @@ void fl_printer_set_property_cancel(const char * v) { int fl_printer_start_job(PRINTER p, int c) { - return reinterpret_cast<Fl_Printer*>(p)->start_job(c, 0, 0); + return static_cast<Fl_Printer*>(p)->start_job(c, 0, 0); } int fl_printer_start_job2(PRINTER p, int c, int * f, int * t) { - return reinterpret_cast<Fl_Printer*>(p)->start_job(c, f, t); + return static_cast<Fl_Printer*>(p)->start_job(c, f, t); } void fl_printer_end_job(PRINTER p) { - reinterpret_cast<Fl_Printer*>(p)->end_job(); + static_cast<Fl_Printer*>(p)->end_job(); } int fl_printer_start_page(PRINTER p) { - return reinterpret_cast<Fl_Printer*>(p)->start_page(); + return static_cast<Fl_Printer*>(p)->start_page(); } int fl_printer_end_page(PRINTER p) { - return reinterpret_cast<Fl_Printer*>(p)->end_page(); + return static_cast<Fl_Printer*>(p)->end_page(); } void fl_printer_margins(PRINTER p, int * l, int * t, int * r, int * b) { - reinterpret_cast<Fl_Printer*>(p)->margins(l,t,r,b); + static_cast<Fl_Printer*>(p)->margins(l,t,r,b); } int fl_printer_printable_rect(PRINTER p, int * w, int * h) { - return reinterpret_cast<Fl_Printer*>(p)->printable_rect(w,h); + return static_cast<Fl_Printer*>(p)->printable_rect(w,h); } void fl_printer_get_origin(PRINTER p, int * x, int * y) { - reinterpret_cast<Fl_Printer*>(p)->origin(x,y); + static_cast<Fl_Printer*>(p)->origin(x,y); } void fl_printer_set_origin(PRINTER p, int x, int y) { - reinterpret_cast<Fl_Printer*>(p)->origin(x,y); + static_cast<Fl_Printer*>(p)->origin(x,y); } void fl_printer_rotate(PRINTER p, float r) { - reinterpret_cast<Fl_Printer*>(p)->rotate(r); + static_cast<Fl_Printer*>(p)->rotate(r); } void fl_printer_scale(PRINTER p, float x, float y) { - reinterpret_cast<Fl_Printer*>(p)->scale(x,y); + static_cast<Fl_Printer*>(p)->scale(x,y); } void fl_printer_translate(PRINTER p, int x, int y) { - reinterpret_cast<Fl_Printer*>(p)->translate(x,y); + static_cast<Fl_Printer*>(p)->translate(x,y); } void fl_printer_untranslate(PRINTER p) { - reinterpret_cast<Fl_Printer*>(p)->untranslate(); + static_cast<Fl_Printer*>(p)->untranslate(); } void fl_printer_print_widget(PRINTER p, void * i, int dx, int dy) { - reinterpret_cast<Fl_Printer*>(p)->print_widget(reinterpret_cast<Fl_Widget*>(i),dx,dy); + static_cast<Fl_Printer*>(p)->print_widget(static_cast<Fl_Widget*>(i),dx,dy); } void fl_printer_print_window_part(PRINTER p, void * i, int x, int y, int w, int h, int dx, int dy) { - reinterpret_cast<Fl_Printer*>(p)->print_window_part(reinterpret_cast<Fl_Window*>(i),x,y,w,h,dx,dy); + static_cast<Fl_Printer*>(p)->print_window_part(static_cast<Fl_Window*>(i),x,y,w,h,dx,dy); } void fl_printer_set_current(PRINTER p) { - reinterpret_cast<Fl_Printer*>(p)->set_current(); + static_cast<Fl_Printer*>(p)->set_current(); } diff --git a/src/c_fl_progress.cpp b/src/c_fl_progress.cpp index 9c18300..21a7a2d 100644 --- a/src/c_fl_progress.cpp +++ b/src/c_fl_progress.cpp @@ -50,45 +50,45 @@ PROGRESS new_fl_progress(int x, int y, int w, int h, char* label) { } void free_fl_progress(PROGRESS p) { - delete reinterpret_cast<My_Progress*>(p); + delete static_cast<My_Progress*>(p); } float fl_progress_get_minimum(PROGRESS p) { - return reinterpret_cast<Fl_Progress*>(p)->minimum(); + return static_cast<Fl_Progress*>(p)->minimum(); } void fl_progress_set_minimum(PROGRESS p, float t) { - reinterpret_cast<Fl_Progress*>(p)->minimum(t); + static_cast<Fl_Progress*>(p)->minimum(t); } float fl_progress_get_maximum(PROGRESS p) { - return reinterpret_cast<Fl_Progress*>(p)->maximum(); + return static_cast<Fl_Progress*>(p)->maximum(); } void fl_progress_set_maximum(PROGRESS p, float t) { - reinterpret_cast<Fl_Progress*>(p)->maximum(t); + static_cast<Fl_Progress*>(p)->maximum(t); } float fl_progress_get_value(PROGRESS p) { - return reinterpret_cast<Fl_Progress*>(p)->value(); + return static_cast<Fl_Progress*>(p)->value(); } void fl_progress_set_value(PROGRESS p, float t) { - reinterpret_cast<Fl_Progress*>(p)->value(t); + static_cast<Fl_Progress*>(p)->value(t); } void fl_progress_draw(PROGRESS p) { - reinterpret_cast<My_Progress*>(p)->Fl_Progress::draw(); + static_cast<My_Progress*>(p)->Fl_Progress::draw(); } int fl_progress_handle(PROGRESS p, int e) { - return reinterpret_cast<My_Progress*>(p)->Fl_Progress::handle(e); + return static_cast<My_Progress*>(p)->Fl_Progress::handle(e); } diff --git a/src/c_fl_radio_button.cpp b/src/c_fl_radio_button.cpp index 1813f0d..486c354 100644 --- a/src/c_fl_radio_button.cpp +++ b/src/c_fl_radio_button.cpp @@ -50,18 +50,18 @@ RADIOBUTTON new_fl_radio_button(int x, int y, int w, int h, char* label) { } void free_fl_radio_button(RADIOBUTTON b) { - delete reinterpret_cast<My_Radio_Button*>(b); + delete static_cast<My_Radio_Button*>(b); } void fl_radio_button_draw(RADIOBUTTON b) { - reinterpret_cast<My_Radio_Button*>(b)->Fl_Radio_Button::draw(); + static_cast<My_Radio_Button*>(b)->Fl_Radio_Button::draw(); } int fl_radio_button_handle(RADIOBUTTON b, int e) { - return reinterpret_cast<My_Radio_Button*>(b)->Fl_Radio_Button::handle(e); + return static_cast<My_Radio_Button*>(b)->Fl_Radio_Button::handle(e); } diff --git a/src/c_fl_radio_light_button.cpp b/src/c_fl_radio_light_button.cpp index c0a1d90..f6da99e 100644 --- a/src/c_fl_radio_light_button.cpp +++ b/src/c_fl_radio_light_button.cpp @@ -50,18 +50,18 @@ RADIOLIGHTBUTTON new_fl_radio_light_button(int x, int y, int w, int h, char* lab } void free_fl_radio_light_button(RADIOLIGHTBUTTON b) { - delete reinterpret_cast<My_Radio_Light_Button*>(b); + delete static_cast<My_Radio_Light_Button*>(b); } void fl_radio_light_button_draw(RADIOLIGHTBUTTON b) { - reinterpret_cast<My_Radio_Light_Button*>(b)->Fl_Radio_Light_Button::draw(); + static_cast<My_Radio_Light_Button*>(b)->Fl_Radio_Light_Button::draw(); } int fl_radio_light_button_handle(RADIOLIGHTBUTTON b, int e) { - return reinterpret_cast<My_Radio_Light_Button*>(b)->Fl_Radio_Light_Button::handle(e); + return static_cast<My_Radio_Light_Button*>(b)->Fl_Radio_Light_Button::handle(e); } diff --git a/src/c_fl_radio_round_button.cpp b/src/c_fl_radio_round_button.cpp index 5ddaa1f..b09e1f3 100644 --- a/src/c_fl_radio_round_button.cpp +++ b/src/c_fl_radio_round_button.cpp @@ -50,7 +50,7 @@ RADIOROUNDBUTTON new_fl_radio_round_button(int x, int y, int w, int h, char* lab } void free_fl_radio_round_button(RADIOROUNDBUTTON b) { - delete reinterpret_cast<My_Radio_Round_Button*>(b); + delete static_cast<My_Radio_Round_Button*>(b); } @@ -58,11 +58,11 @@ void free_fl_radio_round_button(RADIOROUNDBUTTON b) { void fl_radio_round_button_draw(RADIOROUNDBUTTON b) { - reinterpret_cast<My_Radio_Round_Button*>(b)->Fl_Radio_Round_Button::draw(); + static_cast<My_Radio_Round_Button*>(b)->Fl_Radio_Round_Button::draw(); } int fl_radio_round_button_handle(RADIOROUNDBUTTON b, int e) { - return reinterpret_cast<My_Radio_Round_Button*>(b)->Fl_Radio_Round_Button::handle(e); + return static_cast<My_Radio_Round_Button*>(b)->Fl_Radio_Round_Button::handle(e); } diff --git a/src/c_fl_repeat_button.cpp b/src/c_fl_repeat_button.cpp index 7f05235..c3eb582 100644 --- a/src/c_fl_repeat_button.cpp +++ b/src/c_fl_repeat_button.cpp @@ -50,25 +50,25 @@ REPEATBUTTON new_fl_repeat_button(int x, int y, int w, int h, char* label) { } void free_fl_repeat_button(REPEATBUTTON b) { - delete reinterpret_cast<My_Repeat_Button*>(b); + delete static_cast<My_Repeat_Button*>(b); } void fl_repeat_button_deactivate(REPEATBUTTON b) { - reinterpret_cast<Fl_Repeat_Button*>(b)->deactivate(); + static_cast<Fl_Repeat_Button*>(b)->deactivate(); } void fl_repeat_button_draw(REPEATBUTTON b) { - reinterpret_cast<My_Repeat_Button*>(b)->Fl_Repeat_Button::draw(); + static_cast<My_Repeat_Button*>(b)->Fl_Repeat_Button::draw(); } int fl_repeat_button_handle(REPEATBUTTON b, int e) { - return reinterpret_cast<My_Repeat_Button*>(b)->Fl_Repeat_Button::handle(e); + return static_cast<My_Repeat_Button*>(b)->Fl_Repeat_Button::handle(e); } diff --git a/src/c_fl_return_button.cpp b/src/c_fl_return_button.cpp index 022685c..2c315d1 100644 --- a/src/c_fl_return_button.cpp +++ b/src/c_fl_return_button.cpp @@ -50,18 +50,18 @@ RETURNBUTTON new_fl_return_button(int x, int y, int w, int h, char* label) { } void free_fl_return_button(RETURNBUTTON b) { - delete reinterpret_cast<My_Return_Button*>(b); + delete static_cast<My_Return_Button*>(b); } void fl_return_button_draw(RETURNBUTTON b) { - reinterpret_cast<My_Return_Button*>(b)->Fl_Return_Button::draw(); + static_cast<My_Return_Button*>(b)->Fl_Return_Button::draw(); } int fl_return_button_handle(RETURNBUTTON b, int e) { - return reinterpret_cast<My_Return_Button*>(b)->Fl_Return_Button::handle(e); + return static_cast<My_Return_Button*>(b)->Fl_Return_Button::handle(e); } diff --git a/src/c_fl_rgb_image.cpp b/src/c_fl_rgb_image.cpp index cfd87a6..65afbf9 100644 --- a/src/c_fl_rgb_image.cpp +++ b/src/c_fl_rgb_image.cpp @@ -11,18 +11,18 @@ -RGB_IMAGE new_fl_rgb_image(void *data, int w, int h, int d, int ld) { - Fl_RGB_Image *rgb = new Fl_RGB_Image(reinterpret_cast<uchar*>(data), w, h, d, ld); +RGBIMAGE new_fl_rgb_image(void *data, int w, int h, int d, int ld) { + Fl_RGB_Image *rgb = new Fl_RGB_Image(static_cast<uchar*>(data), w, h, d, ld); return rgb; } -RGB_IMAGE new_fl_rgb_image2(void *pix, unsigned int c) { - Fl_RGB_Image *rgb = new Fl_RGB_Image(reinterpret_cast<Fl_Pixmap*>(pix), c); +RGBIMAGE new_fl_rgb_image2(void *pix, unsigned int c) { + Fl_RGB_Image *rgb = new Fl_RGB_Image(static_cast<Fl_Pixmap*>(pix), c); return rgb; } -void free_fl_rgb_image(RGB_IMAGE i) { - delete reinterpret_cast<Fl_RGB_Image*>(i); +void free_fl_rgb_image(RGBIMAGE i) { + delete static_cast<Fl_RGB_Image*>(i); } size_t fl_rgb_image_get_max_size() { @@ -33,46 +33,46 @@ void fl_rgb_image_set_max_size(size_t v) { Fl_RGB_Image::max_size(v); } -RGB_IMAGE fl_rgb_image_copy(RGB_IMAGE i, int w, int h) { +RGBIMAGE fl_rgb_image_copy(RGBIMAGE i, int w, int h) { // virtual so disable dispatch - return reinterpret_cast<Fl_RGB_Image*>(i)->Fl_RGB_Image::copy(w, h); + return static_cast<Fl_RGB_Image*>(i)->Fl_RGB_Image::copy(w, h); } -RGB_IMAGE fl_rgb_image_copy2(RGB_IMAGE i) { - return reinterpret_cast<Fl_RGB_Image*>(i)->copy(); +RGBIMAGE fl_rgb_image_copy2(RGBIMAGE i) { + return static_cast<Fl_RGB_Image*>(i)->copy(); } -void fl_rgb_image_color_average(RGB_IMAGE i, int c, float b) { +void fl_rgb_image_color_average(RGBIMAGE i, int c, float b) { // virtual so disable dispatch - reinterpret_cast<Fl_RGB_Image*>(i)->Fl_RGB_Image::color_average(c, b); + static_cast<Fl_RGB_Image*>(i)->Fl_RGB_Image::color_average(c, b); } -void fl_rgb_image_desaturate(RGB_IMAGE i) { +void fl_rgb_image_desaturate(RGBIMAGE i) { // virtual so disable dispatch - reinterpret_cast<Fl_RGB_Image*>(i)->Fl_RGB_Image::desaturate(); + static_cast<Fl_RGB_Image*>(i)->Fl_RGB_Image::desaturate(); } -void fl_rgb_image_uncache(RGB_IMAGE i) { +void fl_rgb_image_uncache(RGBIMAGE i) { // virtual so disable dispatch - reinterpret_cast<Fl_RGB_Image*>(i)->Fl_RGB_Image::uncache(); + static_cast<Fl_RGB_Image*>(i)->Fl_RGB_Image::uncache(); } -void fl_rgb_image_draw2(RGB_IMAGE i, int x, int y) { - reinterpret_cast<Fl_RGB_Image*>(i)->draw(x, y); +void fl_rgb_image_draw2(RGBIMAGE i, int x, int y) { + static_cast<Fl_RGB_Image*>(i)->draw(x, y); } -void fl_rgb_image_draw(RGB_IMAGE i, int x, int y, int w, int h, int cx, int cy) { +void fl_rgb_image_draw(RGBIMAGE i, int x, int y, int w, int h, int cx, int cy) { // virtual so disable dispatch - reinterpret_cast<Fl_RGB_Image*>(i)->Fl_RGB_Image::draw(x, y, w, h, cx, cy); + static_cast<Fl_RGB_Image*>(i)->Fl_RGB_Image::draw(x, y, w, h, cx, cy); } diff --git a/src/c_fl_rgb_image.h b/src/c_fl_rgb_image.h index a76d239..a09b58e 100644 --- a/src/c_fl_rgb_image.h +++ b/src/c_fl_rgb_image.h @@ -8,34 +8,29 @@ #define FL_RGB_IMAGE_GUARD +typedef void* RGBIMAGE; -typedef void* RGB_IMAGE; - - - - -extern "C" RGB_IMAGE new_fl_rgb_image(void *data, int w, int h, int d, int ld); -extern "C" RGB_IMAGE new_fl_rgb_image2(void *pix, unsigned int c); -extern "C" void free_fl_rgb_image(RGB_IMAGE i); +extern "C" RGBIMAGE new_fl_rgb_image(void *data, int w, int h, int d, int ld); +extern "C" RGBIMAGE new_fl_rgb_image2(void *pix, unsigned int c); +extern "C" void free_fl_rgb_image(RGBIMAGE i); extern "C" size_t fl_rgb_image_get_max_size(); extern "C" void fl_rgb_image_set_max_size(size_t v); -extern "C" RGB_IMAGE fl_rgb_image_copy(RGB_IMAGE i, int w, int h); -extern "C" RGB_IMAGE fl_rgb_image_copy2(RGB_IMAGE i); +extern "C" RGBIMAGE fl_rgb_image_copy(RGBIMAGE i, int w, int h); +extern "C" RGBIMAGE fl_rgb_image_copy2(RGBIMAGE i); +extern "C" void fl_rgb_image_color_average(RGBIMAGE i, int c, float b); +extern "C" void fl_rgb_image_desaturate(RGBIMAGE i); -extern "C" void fl_rgb_image_color_average(RGB_IMAGE i, int c, float b); -extern "C" void fl_rgb_image_desaturate(RGB_IMAGE i); +extern "C" void fl_rgb_image_uncache(RGBIMAGE i); -extern "C" void fl_rgb_image_uncache(RGB_IMAGE i); - - -extern "C" void fl_rgb_image_draw2(RGB_IMAGE i, int x, int y); -extern "C" void fl_rgb_image_draw(RGB_IMAGE i, int x, int y, int w, int h, int cx, int cy); +extern "C" void fl_rgb_image_draw2(RGBIMAGE i, int x, int y); +extern "C" void fl_rgb_image_draw(RGBIMAGE i, int x, int y, int w, int h, int cx, int cy); #endif + diff --git a/src/c_fl_roller.cpp b/src/c_fl_roller.cpp index f5c7dd6..9ad40da 100644 --- a/src/c_fl_roller.cpp +++ b/src/c_fl_roller.cpp @@ -50,18 +50,18 @@ ROLLER new_fl_roller(int x, int y, int w, int h, char* label) { } void free_fl_roller(ROLLER r) { - delete reinterpret_cast<My_Roller*>(r); + delete static_cast<My_Roller*>(r); } void fl_roller_draw(ROLLER r) { - reinterpret_cast<My_Roller*>(r)->Fl_Roller::draw(); + static_cast<My_Roller*>(r)->Fl_Roller::draw(); } int fl_roller_handle(ROLLER r, int e) { - return reinterpret_cast<My_Roller*>(r)->Fl_Roller::handle(e); + return static_cast<My_Roller*>(r)->Fl_Roller::handle(e); } diff --git a/src/c_fl_round_button.cpp b/src/c_fl_round_button.cpp index b7c2d12..e6a9c43 100644 --- a/src/c_fl_round_button.cpp +++ b/src/c_fl_round_button.cpp @@ -50,18 +50,18 @@ ROUNDBUTTON new_fl_round_button(int x, int y, int w, int h, char* label) { } void free_fl_round_button(ROUNDBUTTON b) { - delete reinterpret_cast<My_Round_Button*>(b); + delete static_cast<My_Round_Button*>(b); } void fl_round_button_draw(ROUNDBUTTON b) { - reinterpret_cast<My_Round_Button*>(b)->Fl_Round_Button::draw(); + static_cast<My_Round_Button*>(b)->Fl_Round_Button::draw(); } int fl_round_button_handle(ROUNDBUTTON b, int e) { - return reinterpret_cast<My_Round_Button*>(b)->Fl_Round_Button::handle(e); + return static_cast<My_Round_Button*>(b)->Fl_Round_Button::handle(e); } diff --git a/src/c_fl_round_clock.cpp b/src/c_fl_round_clock.cpp index d2ab087..0036c00 100644 --- a/src/c_fl_round_clock.cpp +++ b/src/c_fl_round_clock.cpp @@ -50,18 +50,18 @@ ROUNDCLOCK new_fl_round_clock(int x, int y, int w, int h, char* label) { } void free_fl_round_clock(ROUNDCLOCK c) { - delete reinterpret_cast<My_Round_Clock*>(c); + delete static_cast<My_Round_Clock*>(c); } void fl_round_clock_draw(ROUNDCLOCK c) { - reinterpret_cast<My_Round_Clock*>(c)->Fl_Round_Clock::draw(); + static_cast<My_Round_Clock*>(c)->Fl_Round_Clock::draw(); } int fl_round_clock_handle(ROUNDCLOCK c, int e) { - return reinterpret_cast<My_Round_Clock*>(c)->Fl_Round_Clock::handle(e); + return static_cast<My_Round_Clock*>(c)->Fl_Round_Clock::handle(e); } diff --git a/src/c_fl_screen.h b/src/c_fl_screen.h index 37f7924..9b4d4ec 100644 --- a/src/c_fl_screen.h +++ b/src/c_fl_screen.h @@ -8,8 +8,6 @@ #define FL_SCREEN_GUARD - - extern "C" int fl_screen_x(); extern "C" int fl_screen_y(); extern "C" int fl_screen_w(); @@ -37,3 +35,4 @@ extern "C" void fl_screen_xywh4(int &x, int &y, int &w, int &h, int px, int py, #endif + diff --git a/src/c_fl_scroll.cpp b/src/c_fl_scroll.cpp index b3d2c14..59bb8c2 100644 --- a/src/c_fl_scroll.cpp +++ b/src/c_fl_scroll.cpp @@ -50,7 +50,7 @@ SCROLL new_fl_scroll(int x, int y, int w, int h, char* label) { } void free_fl_scroll(SCROLL s) { - delete reinterpret_cast<My_Scroll*>(s); + delete static_cast<My_Scroll*>(s); } @@ -68,41 +68,41 @@ void * fl_scroll_scrollbar(SCROLL s) { void fl_scroll_to(SCROLL s, int x, int y) { - reinterpret_cast<Fl_Scroll*>(s)->scroll_to(x, y); + static_cast<Fl_Scroll*>(s)->scroll_to(x, y); } void fl_scroll_set_type(SCROLL s, int t) { - reinterpret_cast<Fl_Scroll*>(s)->type(t); + static_cast<Fl_Scroll*>(s)->type(t); } int fl_scroll_get_size(SCROLL s) { - return reinterpret_cast<Fl_Scroll*>(s)->scrollbar_size(); + return static_cast<Fl_Scroll*>(s)->scrollbar_size(); } void fl_scroll_set_size(SCROLL s, int t) { - reinterpret_cast<Fl_Scroll*>(s)->scrollbar_size(t); + static_cast<Fl_Scroll*>(s)->scrollbar_size(t); } int fl_scroll_xposition(SCROLL s) { - return reinterpret_cast<Fl_Scroll*>(s)->xposition(); + return static_cast<Fl_Scroll*>(s)->xposition(); } int fl_scroll_yposition(SCROLL s) { - return reinterpret_cast<Fl_Scroll*>(s)->yposition(); + return static_cast<Fl_Scroll*>(s)->yposition(); } void fl_scroll_draw(SCROLL s) { - reinterpret_cast<My_Scroll*>(s)->Fl_Scroll::draw(); + static_cast<My_Scroll*>(s)->Fl_Scroll::draw(); } int fl_scroll_handle(SCROLL s, int e) { - return reinterpret_cast<My_Scroll*>(s)->Fl_Scroll::handle(e); + return static_cast<My_Scroll*>(s)->Fl_Scroll::handle(e); } diff --git a/src/c_fl_scrollbar.cpp b/src/c_fl_scrollbar.cpp index ae20a25..4208744 100644 --- a/src/c_fl_scrollbar.cpp +++ b/src/c_fl_scrollbar.cpp @@ -65,41 +65,41 @@ SCROLLBAR new_fl_scrollbar(int x, int y, int w, int h, char* label) { } void free_fl_scrollbar(SCROLLBAR s) { - delete reinterpret_cast<My_Scrollbar*>(s); + delete static_cast<My_Scrollbar*>(s); } int fl_scrollbar_get_linesize(SCROLLBAR s) { - return reinterpret_cast<Fl_Scrollbar*>(s)->linesize(); + return static_cast<Fl_Scrollbar*>(s)->linesize(); } void fl_scrollbar_set_linesize(SCROLLBAR s, int t) { - reinterpret_cast<Fl_Scrollbar*>(s)->linesize(t); + static_cast<Fl_Scrollbar*>(s)->linesize(t); } int fl_scrollbar_get_value(SCROLLBAR s) { - return reinterpret_cast<Fl_Scrollbar*>(s)->value(); + return static_cast<Fl_Scrollbar*>(s)->value(); } void fl_scrollbar_set_value(SCROLLBAR s, int t) { - reinterpret_cast<Fl_Scrollbar*>(s)->value(t); + static_cast<Fl_Scrollbar*>(s)->value(t); } void fl_scrollbar_set_value2(SCROLLBAR s, int p, int w, int f, int t) { - reinterpret_cast<Fl_Scrollbar*>(s)->value(p,w,f,t); + static_cast<Fl_Scrollbar*>(s)->value(p,w,f,t); } void fl_scrollbar_draw(SCROLLBAR s) { - reinterpret_cast<My_Scrollbar*>(s)->Fl_Scrollbar::draw(); + static_cast<My_Scrollbar*>(s)->Fl_Scrollbar::draw(); } int fl_scrollbar_handle(SCROLLBAR s, int e) { - return reinterpret_cast<My_Scrollbar*>(s)->Fl_Scrollbar::handle(e); + return static_cast<My_Scrollbar*>(s)->Fl_Scrollbar::handle(e); } diff --git a/src/c_fl_secret_input.cpp b/src/c_fl_secret_input.cpp index 9bf1753..b3205cb 100644 --- a/src/c_fl_secret_input.cpp +++ b/src/c_fl_secret_input.cpp @@ -50,18 +50,18 @@ SECRETINPUT new_fl_secret_input(int x, int y, int w, int h, char* label) { } void free_fl_secret_input(SECRETINPUT i) { - delete reinterpret_cast<My_Secret_Input*>(i); + delete static_cast<My_Secret_Input*>(i); } void fl_secret_input_draw(SECRETINPUT i) { - reinterpret_cast<My_Secret_Input*>(i)->Fl_Secret_Input::draw(); + static_cast<My_Secret_Input*>(i)->Fl_Secret_Input::draw(); } int fl_secret_input_handle(SECRETINPUT i, int e) { - return reinterpret_cast<My_Secret_Input*>(i)->Fl_Secret_Input::handle(e); + return static_cast<My_Secret_Input*>(i)->Fl_Secret_Input::handle(e); } diff --git a/src/c_fl_select_browser.cpp b/src/c_fl_select_browser.cpp index 78e7412..5993703 100644 --- a/src/c_fl_select_browser.cpp +++ b/src/c_fl_select_browser.cpp @@ -172,7 +172,7 @@ SELECTBROWSER new_fl_select_browser(int x, int y, int w, int h, char * label) { } void free_fl_select_browser(SELECTBROWSER b) { - delete reinterpret_cast<My_Select_Browser*>(b); + delete static_cast<My_Select_Browser*>(b); } @@ -181,84 +181,84 @@ void free_fl_select_browser(SELECTBROWSER b) { // These have to be reimplemented due to relying on custom class extensions int fl_select_browser_full_height(SELECTBROWSER c) { - return reinterpret_cast<My_Select_Browser*>(c)->Fl_Select_Browser::full_height(); + return static_cast<My_Select_Browser*>(c)->Fl_Select_Browser::full_height(); } int fl_select_browser_incr_height(SELECTBROWSER c) { - return reinterpret_cast<My_Select_Browser*>(c)->Fl_Select_Browser::incr_height(); + return static_cast<My_Select_Browser*>(c)->Fl_Select_Browser::incr_height(); } int fl_select_browser_item_width(SELECTBROWSER b, void * item) { - return reinterpret_cast<My_Select_Browser*>(b)->Fl_Select_Browser::item_width(item); + return static_cast<My_Select_Browser*>(b)->Fl_Select_Browser::item_width(item); } int fl_select_browser_item_height(SELECTBROWSER b, void * item) { - return reinterpret_cast<My_Select_Browser*>(b)->Fl_Select_Browser::item_height(item); + return static_cast<My_Select_Browser*>(b)->Fl_Select_Browser::item_height(item); } void * fl_select_browser_item_first(SELECTBROWSER b) { - return reinterpret_cast<My_Select_Browser*>(b)->Fl_Select_Browser::item_first(); + return static_cast<My_Select_Browser*>(b)->Fl_Select_Browser::item_first(); } void * fl_select_browser_item_last(SELECTBROWSER b) { - return reinterpret_cast<My_Select_Browser*>(b)->Fl_Select_Browser::item_last(); + return static_cast<My_Select_Browser*>(b)->Fl_Select_Browser::item_last(); } void * fl_select_browser_item_next(SELECTBROWSER b, void * item) { - return reinterpret_cast<My_Select_Browser*>(b)->Fl_Select_Browser::item_next(item); + return static_cast<My_Select_Browser*>(b)->Fl_Select_Browser::item_next(item); } void * fl_select_browser_item_prev(SELECTBROWSER b, void * item) { - return reinterpret_cast<My_Select_Browser*>(b)->Fl_Select_Browser::item_prev(item); + return static_cast<My_Select_Browser*>(b)->Fl_Select_Browser::item_prev(item); } void * fl_select_browser_item_at(SELECTBROWSER b, int index) { - return reinterpret_cast<My_Select_Browser*>(b)->Fl_Select_Browser::item_at(index); + return static_cast<My_Select_Browser*>(b)->Fl_Select_Browser::item_at(index); } void fl_select_browser_item_select(SELECTBROWSER b, void * item, int val) { - reinterpret_cast<My_Select_Browser*>(b)->Fl_Select_Browser::item_select(item, val); + static_cast<My_Select_Browser*>(b)->Fl_Select_Browser::item_select(item, val); } int fl_select_browser_item_selected(SELECTBROWSER b, void * item) { - return reinterpret_cast<My_Select_Browser*>(b)->Fl_Select_Browser::item_selected(item); + return static_cast<My_Select_Browser*>(b)->Fl_Select_Browser::item_selected(item); } void fl_select_browser_item_swap(SELECTBROWSER b, void * x, void * y) { - reinterpret_cast<My_Select_Browser*>(b)->Fl_Select_Browser::item_swap(x, y); + static_cast<My_Select_Browser*>(b)->Fl_Select_Browser::item_swap(x, y); } const char * fl_select_browser_item_text(SELECTBROWSER b, void * item) { - return reinterpret_cast<My_Select_Browser*>(b)->Fl_Select_Browser::item_text(item); + return static_cast<My_Select_Browser*>(b)->Fl_Select_Browser::item_text(item); } void fl_select_browser_item_draw(SELECTBROWSER b, void * item, int x, int y, int w, int h) { - reinterpret_cast<My_Select_Browser*>(b)->Fl_Select_Browser::item_draw(item, x, y, w, h); + static_cast<My_Select_Browser*>(b)->Fl_Select_Browser::item_draw(item, x, y, w, h); } int fl_select_browser_full_width(SELECTBROWSER c) { - return reinterpret_cast<My_Select_Browser*>(c)->Fl_Select_Browser::full_width(); + return static_cast<My_Select_Browser*>(c)->Fl_Select_Browser::full_width(); } int fl_select_browser_item_quick_height(SELECTBROWSER c, void * i) { - return reinterpret_cast<My_Select_Browser*>(c)->Fl_Select_Browser::item_quick_height(i); + return static_cast<My_Select_Browser*>(c)->Fl_Select_Browser::item_quick_height(i); } void fl_select_browser_draw(SELECTBROWSER b) { - reinterpret_cast<My_Select_Browser*>(b)->Fl_Select_Browser::draw(); + static_cast<My_Select_Browser*>(b)->Fl_Select_Browser::draw(); } int fl_select_browser_handle(SELECTBROWSER b, int e) { - return reinterpret_cast<My_Select_Browser*>(b)->Fl_Select_Browser::handle(e); + return static_cast<My_Select_Browser*>(b)->Fl_Select_Browser::handle(e); } diff --git a/src/c_fl_shared_image.cpp b/src/c_fl_shared_image.cpp index d3338f6..bb17632 100644 --- a/src/c_fl_shared_image.cpp +++ b/src/c_fl_shared_image.cpp @@ -11,42 +11,42 @@ -SHARED_IMAGE fl_shared_image_get(const char * f, int w, int h) { +SHAREDIMAGE fl_shared_image_get(const char * f, int w, int h) { return Fl_Shared_Image::get(f, w, h); } -SHARED_IMAGE fl_shared_image_get2(void * r) { - return Fl_Shared_Image::get(reinterpret_cast<Fl_RGB_Image*>(r), 0); +SHAREDIMAGE fl_shared_image_get2(void * r) { + return Fl_Shared_Image::get(static_cast<Fl_RGB_Image*>(r), 0); } -SHARED_IMAGE fl_shared_image_find(const char * n, int w, int h) { +SHAREDIMAGE fl_shared_image_find(const char * n, int w, int h) { return Fl_Shared_Image::find(n, w, h); } -void fl_shared_image_release(SHARED_IMAGE i) { - reinterpret_cast<Fl_Shared_Image*>(i)->release(); +void fl_shared_image_release(SHAREDIMAGE i) { + static_cast<Fl_Shared_Image*>(i)->release(); } -SHARED_IMAGE fl_shared_image_copy(SHARED_IMAGE i, int w, int h) { +SHAREDIMAGE fl_shared_image_copy(SHAREDIMAGE i, int w, int h) { // virtual so disable dispatch - return reinterpret_cast<Fl_Shared_Image*>(i)->Fl_Shared_Image::copy(w, h); + return static_cast<Fl_Shared_Image*>(i)->Fl_Shared_Image::copy(w, h); } -SHARED_IMAGE fl_shared_image_copy2(SHARED_IMAGE i) { - return reinterpret_cast<Fl_Shared_Image*>(i)->copy(); +SHAREDIMAGE fl_shared_image_copy2(SHAREDIMAGE i) { + return static_cast<Fl_Shared_Image*>(i)->copy(); } -void fl_shared_image_color_average(SHARED_IMAGE i, int c, float b) { +void fl_shared_image_color_average(SHAREDIMAGE i, int c, float b) { // virtual so disable dispatch - reinterpret_cast<Fl_Shared_Image*>(i)->Fl_Shared_Image::color_average(c, b); + static_cast<Fl_Shared_Image*>(i)->Fl_Shared_Image::color_average(c, b); } -void fl_shared_image_desaturate(SHARED_IMAGE i) { +void fl_shared_image_desaturate(SHAREDIMAGE i) { // virtual so disable dispatch - reinterpret_cast<Fl_Shared_Image*>(i)->Fl_Shared_Image::desaturate(); + static_cast<Fl_Shared_Image*>(i)->Fl_Shared_Image::desaturate(); } @@ -56,25 +56,25 @@ int fl_shared_image_num_images() { return Fl_Shared_Image::num_images(); } -const char * fl_shared_image_name(SHARED_IMAGE i) { - return reinterpret_cast<Fl_Shared_Image*>(i)->name(); +const char * fl_shared_image_name(SHAREDIMAGE i) { + return static_cast<Fl_Shared_Image*>(i)->name(); } -int fl_shared_image_original(SHARED_IMAGE i) { - return reinterpret_cast<Fl_Shared_Image*>(i)->original(); +int fl_shared_image_original(SHAREDIMAGE i) { + return static_cast<Fl_Shared_Image*>(i)->original(); } -int fl_shared_image_refcount(SHARED_IMAGE i) { - return reinterpret_cast<Fl_Shared_Image*>(i)->refcount(); +int fl_shared_image_refcount(SHAREDIMAGE i) { + return static_cast<Fl_Shared_Image*>(i)->refcount(); } -void fl_shared_image_reload(SHARED_IMAGE i) { - reinterpret_cast<Fl_Shared_Image*>(i)->reload(); +void fl_shared_image_reload(SHAREDIMAGE i) { + static_cast<Fl_Shared_Image*>(i)->reload(); } -void fl_shared_image_uncache(SHARED_IMAGE i) { +void fl_shared_image_uncache(SHAREDIMAGE i) { // virtual so disable dispatch - reinterpret_cast<Fl_Shared_Image*>(i)->uncache(); + static_cast<Fl_Shared_Image*>(i)->uncache(); } @@ -84,17 +84,17 @@ void fl_shared_image_scaling_algorithm(int v) { Fl_Shared_Image::scaling_algorithm(static_cast<Fl_RGB_Scaling>(v)); } -void fl_shared_image_scale(SHARED_IMAGE i, int w, int h, int p, int e) { - reinterpret_cast<Fl_Shared_Image*>(i)->scale(w, h, p, e); +void fl_shared_image_scale(SHAREDIMAGE i, int w, int h, int p, int e) { + static_cast<Fl_Shared_Image*>(i)->scale(w, h, p, e); } -void fl_shared_image_draw(SHARED_IMAGE i, int x, int y, int w, int h, int cx, int cy) { +void fl_shared_image_draw(SHAREDIMAGE i, int x, int y, int w, int h, int cx, int cy) { // virtual so disable dispatch - reinterpret_cast<Fl_Shared_Image*>(i)->Fl_Shared_Image::draw(x, y, w, h, cx, cy); + static_cast<Fl_Shared_Image*>(i)->Fl_Shared_Image::draw(x, y, w, h, cx, cy); } -void fl_shared_image_draw2(SHARED_IMAGE i, int x, int y) { - reinterpret_cast<Fl_Shared_Image*>(i)->draw(x, y); +void fl_shared_image_draw2(SHAREDIMAGE i, int x, int y) { + static_cast<Fl_Shared_Image*>(i)->draw(x, y); } diff --git a/src/c_fl_shared_image.h b/src/c_fl_shared_image.h index bd5b555..dbe0352 100644 --- a/src/c_fl_shared_image.h +++ b/src/c_fl_shared_image.h @@ -8,40 +8,35 @@ #define FL_SHARED_IMAGE_GUARD +typedef void* SHAREDIMAGE; -typedef void* SHARED_IMAGE; +extern "C" SHAREDIMAGE fl_shared_image_get(const char * f, int w, int h); +extern "C" SHAREDIMAGE fl_shared_image_get2(void * r); +extern "C" SHAREDIMAGE fl_shared_image_find(const char * n, int w, int h); +extern "C" void fl_shared_image_release(SHAREDIMAGE i); +extern "C" SHAREDIMAGE fl_shared_image_copy(SHAREDIMAGE i, int w, int h); +extern "C" SHAREDIMAGE fl_shared_image_copy2(SHAREDIMAGE i); - - -extern "C" SHARED_IMAGE fl_shared_image_get(const char * f, int w, int h); -extern "C" SHARED_IMAGE fl_shared_image_get2(void * r); -extern "C" SHARED_IMAGE fl_shared_image_find(const char * n, int w, int h); -extern "C" void fl_shared_image_release(SHARED_IMAGE i); -extern "C" SHARED_IMAGE fl_shared_image_copy(SHARED_IMAGE i, int w, int h); -extern "C" SHARED_IMAGE fl_shared_image_copy2(SHARED_IMAGE i); - - - - -extern "C" void fl_shared_image_color_average(SHARED_IMAGE i, int c, float b); -extern "C" void fl_shared_image_desaturate(SHARED_IMAGE i); +extern "C" void fl_shared_image_color_average(SHAREDIMAGE i, int c, float b); +extern "C" void fl_shared_image_desaturate(SHAREDIMAGE i); extern "C" int fl_shared_image_num_images(); -extern "C" const char * fl_shared_image_name(SHARED_IMAGE i); -extern "C" int fl_shared_image_original(SHARED_IMAGE i); -extern "C" int fl_shared_image_refcount(SHARED_IMAGE i); -extern "C" void fl_shared_image_reload(SHARED_IMAGE i); -extern "C" void fl_shared_image_uncache(SHARED_IMAGE i); +extern "C" const char * fl_shared_image_name(SHAREDIMAGE i); +extern "C" int fl_shared_image_original(SHAREDIMAGE i); +extern "C" int fl_shared_image_refcount(SHAREDIMAGE i); +extern "C" void fl_shared_image_reload(SHAREDIMAGE i); +extern "C" void fl_shared_image_uncache(SHAREDIMAGE i); extern "C" void fl_shared_image_scaling_algorithm(int v); -extern "C" void fl_shared_image_scale(SHARED_IMAGE i, int w, int h, int p, int e); -extern "C" void fl_shared_image_draw(SHARED_IMAGE i, int x, int y, int w, int h, int cx, int cy); -extern "C" void fl_shared_image_draw2(SHARED_IMAGE i, int x, int y); +extern "C" void fl_shared_image_scale(SHAREDIMAGE i, int w, int h, int p, int e); +extern "C" void fl_shared_image_draw(SHAREDIMAGE i, int x, int y, int w, int h, int cx, int cy); +extern "C" void fl_shared_image_draw2(SHAREDIMAGE i, int x, int y); #endif + diff --git a/src/c_fl_simple_counter.cpp b/src/c_fl_simple_counter.cpp index 891a371..8be586d 100644 --- a/src/c_fl_simple_counter.cpp +++ b/src/c_fl_simple_counter.cpp @@ -24,8 +24,8 @@ class My_Simple_Counter : public Fl_Simple_Counter { public: using Fl_Simple_Counter::Fl_Simple_Counter; - friend void fl_simple_counter_draw(SIMPLE_COUNTER c); - friend int fl_simple_counter_handle(SIMPLE_COUNTER c, int e); + friend void fl_simple_counter_draw(SIMPLECOUNTER c); + friend int fl_simple_counter_handle(SIMPLECOUNTER c, int e); void draw(); int handle(int e); @@ -44,24 +44,24 @@ int My_Simple_Counter::handle(int e) { // Flattened C API -SIMPLE_COUNTER new_fl_simple_counter(int x, int y, int w, int h, char* label) { +SIMPLECOUNTER new_fl_simple_counter(int x, int y, int w, int h, char* label) { My_Simple_Counter *c = new My_Simple_Counter(x, y, w, h, label); return c; } -void free_fl_simple_counter(SIMPLE_COUNTER c) { - delete reinterpret_cast<My_Simple_Counter*>(c); +void free_fl_simple_counter(SIMPLECOUNTER c) { + delete static_cast<My_Simple_Counter*>(c); } -void fl_simple_counter_draw(SIMPLE_COUNTER c) { - reinterpret_cast<My_Simple_Counter*>(c)->Fl_Simple_Counter::draw(); +void fl_simple_counter_draw(SIMPLECOUNTER c) { + static_cast<My_Simple_Counter*>(c)->Fl_Simple_Counter::draw(); } -int fl_simple_counter_handle(SIMPLE_COUNTER c, int e) { - return reinterpret_cast<My_Simple_Counter*>(c)->Fl_Simple_Counter::handle(e); +int fl_simple_counter_handle(SIMPLECOUNTER c, int e) { + return static_cast<My_Simple_Counter*>(c)->Fl_Simple_Counter::handle(e); } diff --git a/src/c_fl_simple_counter.h b/src/c_fl_simple_counter.h index 6c45a89..397b488 100644 --- a/src/c_fl_simple_counter.h +++ b/src/c_fl_simple_counter.h @@ -8,15 +8,15 @@ #define FL_SIMPLE_COUNTER_GUARD -typedef void* SIMPLE_COUNTER; +typedef void* SIMPLECOUNTER; -extern "C" SIMPLE_COUNTER new_fl_simple_counter(int x, int y, int w, int h, char* label); -extern "C" void free_fl_simple_counter(SIMPLE_COUNTER c); +extern "C" SIMPLECOUNTER new_fl_simple_counter(int x, int y, int w, int h, char* label); +extern "C" void free_fl_simple_counter(SIMPLECOUNTER c); -extern "C" void fl_simple_counter_draw(SIMPLE_COUNTER c); -extern "C" int fl_simple_counter_handle(SIMPLE_COUNTER c, int e); +extern "C" void fl_simple_counter_draw(SIMPLECOUNTER c); +extern "C" int fl_simple_counter_handle(SIMPLECOUNTER c, int e); #endif diff --git a/src/c_fl_single_window.cpp b/src/c_fl_single_window.cpp index 974a3c1..efafdc4 100644 --- a/src/c_fl_single_window.cpp +++ b/src/c_fl_single_window.cpp @@ -55,40 +55,40 @@ SINGLEWINDOW new_fl_single_window2(int x, int y, char* label) { } void free_fl_single_window(SINGLEWINDOW w) { - delete reinterpret_cast<My_Single_Window*>(w); + delete static_cast<My_Single_Window*>(w); } void fl_single_window_show(SINGLEWINDOW w) { - reinterpret_cast<Fl_Single_Window*>(w)->show(); + static_cast<Fl_Single_Window*>(w)->show(); } void fl_single_window_show2(SINGLEWINDOW w, int c, void * v) { - reinterpret_cast<Fl_Single_Window*>(w)->show(c, static_cast<char**>(v)); + static_cast<Fl_Single_Window*>(w)->show(c, static_cast<char**>(v)); } void fl_single_window_flush(SINGLEWINDOW w) { - reinterpret_cast<Fl_Single_Window*>(w)->flush(); + static_cast<Fl_Single_Window*>(w)->flush(); } void fl_single_window_make_current(SINGLEWINDOW w) { - reinterpret_cast<Fl_Single_Window*>(w)->Fl_Window::make_current(); + static_cast<Fl_Single_Window*>(w)->Fl_Window::make_current(); } void fl_single_window_draw(SINGLEWINDOW n) { - reinterpret_cast<My_Single_Window*>(n)->Fl_Single_Window::draw(); + static_cast<My_Single_Window*>(n)->Fl_Single_Window::draw(); } int fl_single_window_handle(SINGLEWINDOW n, int e) { - return reinterpret_cast<My_Single_Window*>(n)->Fl_Single_Window::handle(e); + return static_cast<My_Single_Window*>(n)->Fl_Single_Window::handle(e); } diff --git a/src/c_fl_slider.cpp b/src/c_fl_slider.cpp index fcdd32d..77bd171 100644 --- a/src/c_fl_slider.cpp +++ b/src/c_fl_slider.cpp @@ -67,55 +67,55 @@ SLIDER new_fl_slider2(unsigned char k, int x, int y, int w, int h, char * label) } void free_fl_slider(SLIDER s) { - delete reinterpret_cast<My_Slider*>(s); + delete static_cast<My_Slider*>(s); } void fl_slider_set_bounds(SLIDER s, double a, double b) { - reinterpret_cast<Fl_Slider*>(s)->bounds(a,b); + static_cast<Fl_Slider*>(s)->bounds(a,b); } int fl_slider_get_slider(SLIDER s) { - return reinterpret_cast<Fl_Slider*>(s)->slider(); + return static_cast<Fl_Slider*>(s)->slider(); } void fl_slider_set_slider(SLIDER s, int t) { - reinterpret_cast<Fl_Slider*>(s)->slider(static_cast<Fl_Boxtype>(t)); + static_cast<Fl_Slider*>(s)->slider(static_cast<Fl_Boxtype>(t)); } float fl_slider_get_slider_size(SLIDER s) { - return reinterpret_cast<Fl_Slider*>(s)->slider_size(); + return static_cast<Fl_Slider*>(s)->slider_size(); } void fl_slider_set_slider_size(SLIDER s, double t) { - reinterpret_cast<Fl_Slider*>(s)->slider_size(t); + static_cast<Fl_Slider*>(s)->slider_size(t); } int fl_slider_scrollvalue(SLIDER s, int p, int z, int f, int t) { - return reinterpret_cast<Fl_Slider*>(s)->scrollvalue(p,z,f,t); + return static_cast<Fl_Slider*>(s)->scrollvalue(p,z,f,t); } void fl_slider_draw(SLIDER s) { - reinterpret_cast<My_Slider*>(s)->Fl_Slider::draw(); + static_cast<My_Slider*>(s)->Fl_Slider::draw(); } void fl_slider_draw2(SLIDER s, int x, int y, int w, int h) { void (Fl_Slider::*mydraw)(int,int,int,int) = &Friend_Slider::draw; - (reinterpret_cast<Fl_Slider*>(s)->*mydraw)(x, y, w, h); + (static_cast<Fl_Slider*>(s)->*mydraw)(x, y, w, h); } int fl_slider_handle(SLIDER s, int e) { - return reinterpret_cast<My_Slider*>(s)->Fl_Slider::handle(e); + return static_cast<My_Slider*>(s)->Fl_Slider::handle(e); } int fl_slider_handle2(SLIDER s, int e, int x, int y, int w, int h) { int (Fl_Slider::*myhandle)(int,int,int,int,int) = &Friend_Slider::handle; - return (reinterpret_cast<Fl_Slider*>(s)->*myhandle)(e, x, y, w, h); + return (static_cast<Fl_Slider*>(s)->*myhandle)(e, x, y, w, h); } diff --git a/src/c_fl_spinner.cpp b/src/c_fl_spinner.cpp index 71d86f8..a278c84 100644 --- a/src/c_fl_spinner.cpp +++ b/src/c_fl_spinner.cpp @@ -50,126 +50,126 @@ SPINNER new_fl_spinner(int x, int y, int w, int h, char* label) { } void free_fl_spinner(SPINNER n) { - delete reinterpret_cast<My_Spinner*>(n); + delete static_cast<My_Spinner*>(n); } unsigned int fl_spinner_get_color(SPINNER n) { - return reinterpret_cast<Fl_Spinner*>(n)->color(); + return static_cast<Fl_Spinner*>(n)->color(); } void fl_spinner_set_color(SPINNER n, unsigned int t) { - reinterpret_cast<Fl_Spinner*>(n)->color(t); + static_cast<Fl_Spinner*>(n)->color(t); } unsigned int fl_spinner_get_selection_color(SPINNER n) { - return reinterpret_cast<Fl_Spinner*>(n)->selection_color(); + return static_cast<Fl_Spinner*>(n)->selection_color(); } void fl_spinner_set_selection_color(SPINNER n, unsigned int t) { - reinterpret_cast<Fl_Spinner*>(n)->selection_color(t); + static_cast<Fl_Spinner*>(n)->selection_color(t); } unsigned int fl_spinner_get_textcolor(SPINNER n) { - return reinterpret_cast<Fl_Spinner*>(n)->textcolor(); + return static_cast<Fl_Spinner*>(n)->textcolor(); } void fl_spinner_set_textcolor(SPINNER n, unsigned int t) { - reinterpret_cast<Fl_Spinner*>(n)->textcolor(t); + static_cast<Fl_Spinner*>(n)->textcolor(t); } int fl_spinner_get_textfont(SPINNER n) { - return reinterpret_cast<Fl_Spinner*>(n)->textfont(); + return static_cast<Fl_Spinner*>(n)->textfont(); } void fl_spinner_set_textfont(SPINNER n, int t) { - reinterpret_cast<Fl_Spinner*>(n)->textfont(t); + static_cast<Fl_Spinner*>(n)->textfont(t); } int fl_spinner_get_textsize(SPINNER n) { - return reinterpret_cast<Fl_Spinner*>(n)->textsize(); + return static_cast<Fl_Spinner*>(n)->textsize(); } void fl_spinner_set_textsize(SPINNER n, int t) { - reinterpret_cast<Fl_Spinner*>(n)->textsize(t); + static_cast<Fl_Spinner*>(n)->textsize(t); } double fl_spinner_get_minimum(SPINNER n) { - return reinterpret_cast<Fl_Spinner*>(n)->minimum(); + return static_cast<Fl_Spinner*>(n)->minimum(); } void fl_spinner_set_minimum(SPINNER n, double t) { - reinterpret_cast<Fl_Spinner*>(n)->minimum(t); + static_cast<Fl_Spinner*>(n)->minimum(t); } double fl_spinner_get_maximum(SPINNER n) { - return reinterpret_cast<Fl_Spinner*>(n)->maximum(); + return static_cast<Fl_Spinner*>(n)->maximum(); } void fl_spinner_set_maximum(SPINNER n, double t) { - reinterpret_cast<Fl_Spinner*>(n)->maximum(t); + static_cast<Fl_Spinner*>(n)->maximum(t); } void fl_spinner_range(SPINNER n, double a, double b) { - reinterpret_cast<Fl_Spinner*>(n)->range(a,b); + static_cast<Fl_Spinner*>(n)->range(a,b); } double fl_spinner_get_step(SPINNER n) { - return reinterpret_cast<Fl_Spinner*>(n)->step(); + return static_cast<Fl_Spinner*>(n)->step(); } void fl_spinner_set_step(SPINNER n, double t) { - reinterpret_cast<Fl_Spinner*>(n)->step(t); + static_cast<Fl_Spinner*>(n)->step(t); } double fl_spinner_get_value(SPINNER n) { - return reinterpret_cast<Fl_Spinner*>(n)->value(); + return static_cast<Fl_Spinner*>(n)->value(); } void fl_spinner_set_value(SPINNER n, double t) { - reinterpret_cast<Fl_Spinner*>(n)->value(t); + static_cast<Fl_Spinner*>(n)->value(t); } const char * fl_spinner_get_format(SPINNER n) { - return reinterpret_cast<Fl_Spinner*>(n)->format(); + return static_cast<Fl_Spinner*>(n)->format(); } void fl_spinner_set_format(SPINNER n, const char * f) { - reinterpret_cast<Fl_Spinner*>(n)->format(f); + static_cast<Fl_Spinner*>(n)->format(f); } int fl_spinner_get_type(SPINNER n) { - return reinterpret_cast<Fl_Spinner*>(n)->type(); + return static_cast<Fl_Spinner*>(n)->type(); } void fl_spinner_set_type(SPINNER n, int t) { - reinterpret_cast<Fl_Spinner*>(n)->type(t); + static_cast<Fl_Spinner*>(n)->type(t); } void fl_spinner_resize(SPINNER n, int x, int y, int w, int h) { - reinterpret_cast<Fl_Spinner*>(n)->resize(x, y, w, h); + static_cast<Fl_Spinner*>(n)->resize(x, y, w, h); } void fl_spinner_draw(SPINNER n) { - reinterpret_cast<My_Spinner*>(n)->Fl_Spinner::draw(); + static_cast<My_Spinner*>(n)->Fl_Spinner::draw(); } int fl_spinner_handle(SPINNER n, int e) { - return reinterpret_cast<My_Spinner*>(n)->Fl_Spinner::handle(e); + return static_cast<My_Spinner*>(n)->Fl_Spinner::handle(e); } diff --git a/src/c_fl_static.cpp b/src/c_fl_static.cpp index 9639364..ad4cfe9 100644 --- a/src/c_fl_static.cpp +++ b/src/c_fl_static.cpp @@ -184,11 +184,13 @@ void fl_static_copy(const char * t, int l, int k) { } void fl_static_paste(void * r, int s) { - Fl::paste(reinterpret_cast<Fl_Widget&>(r),s); + Fl_Widget &ref = *static_cast<Fl_Widget*>(r); + Fl::paste(ref, s); } void fl_static_selection(void * o, char * t, int l) { - Fl::selection(reinterpret_cast<Fl_Widget&>(o),t,l); + Fl_Widget &ref = *static_cast<Fl_Widget*>(o); + Fl::selection(ref, t, l); } @@ -229,7 +231,7 @@ void fl_static_set_visible_focus(int f) { void fl_static_default_atclose(void * w) { - Fl::default_atclose(reinterpret_cast<Fl_Window*>(w), 0); + Fl::default_atclose(static_cast<Fl_Window*>(w), 0); } void * fl_static_get_first_window() { @@ -237,11 +239,11 @@ void * fl_static_get_first_window() { } void fl_static_set_first_window(void * w) { - Fl::first_window(reinterpret_cast<Fl_Window*>(w)); + Fl::first_window(static_cast<Fl_Window*>(w)); } void * fl_static_next_window(void * w) { - return Fl::next_window(reinterpret_cast<Fl_Window*>(w)); + return Fl::next_window(static_cast<Fl_Window*>(w)); } void * fl_static_modal() { diff --git a/src/c_fl_static.h b/src/c_fl_static.h index f357494..692750b 100644 --- a/src/c_fl_static.h +++ b/src/c_fl_static.h @@ -8,8 +8,6 @@ #define FL_STATIC_GUARD - - extern "C" void fl_static_add_awake_handler(void * h, void * f); extern "C" void fl_static_get_awake_handler(void * &h, void * &f); @@ -39,8 +37,10 @@ extern "C" int fl_static_has_idle(void * h, void * f); extern "C" void fl_static_remove_idle(void * h, void * f); -extern "C" void fl_static_get_color(unsigned int c, unsigned char &r, unsigned char &g, unsigned char &b); -extern "C" void fl_static_set_color(unsigned int c, unsigned char r, unsigned char g, unsigned char b); +extern "C" void fl_static_get_color(unsigned int c, + unsigned char &r, unsigned char &g, unsigned char &b); +extern "C" void fl_static_set_color(unsigned int c, + unsigned char r, unsigned char g, unsigned char b); extern "C" void fl_static_free_color(unsigned int c, int b); extern "C" void fl_static_foreground(unsigned int r, unsigned int g, unsigned int b); extern "C" void fl_static_background(unsigned int r, unsigned int g, unsigned int b); @@ -106,3 +106,4 @@ extern "C" void fl_static_set_scrollbar_size(int s); #endif + diff --git a/src/c_fl_surface_device.cpp b/src/c_fl_surface_device.cpp index 50088cf..9836a04 100644 --- a/src/c_fl_surface_device.cpp +++ b/src/c_fl_surface_device.cpp @@ -24,12 +24,12 @@ public: // Flattened C API SURFACEDEVICE new_fl_surface_device(void * g) { - My_Surface_Device *s = new My_Surface_Device(reinterpret_cast<Fl_Graphics_Driver*>(g)); + My_Surface_Device *s = new My_Surface_Device(static_cast<Fl_Graphics_Driver*>(g)); return s; } void free_fl_surface_device(SURFACEDEVICE s) { - delete reinterpret_cast<My_Surface_Device*>(s); + delete static_cast<My_Surface_Device*>(s); } @@ -37,7 +37,7 @@ void free_fl_surface_device(SURFACEDEVICE s) { void fl_surface_device_set_current(SURFACEDEVICE s) { // virtual so disable dispatch - reinterpret_cast<Fl_Surface_Device*>(s)->Fl_Surface_Device::set_current(); + static_cast<Fl_Surface_Device*>(s)->Fl_Surface_Device::set_current(); } SURFACEDEVICE fl_surface_device_get_surface(void) { @@ -48,11 +48,11 @@ SURFACEDEVICE fl_surface_device_get_surface(void) { void * fl_surface_device_get_driver(SURFACEDEVICE s) { - return reinterpret_cast<Fl_Surface_Device*>(s)->driver(); + return static_cast<Fl_Surface_Device*>(s)->driver(); } void fl_surface_device_set_driver(SURFACEDEVICE s, void * g) { - reinterpret_cast<Fl_Surface_Device*>(s)->driver(reinterpret_cast<Fl_Graphics_Driver*>(g)); + static_cast<Fl_Surface_Device*>(s)->driver(static_cast<Fl_Graphics_Driver*>(g)); } diff --git a/src/c_fl_tabs.cpp b/src/c_fl_tabs.cpp index a3e8581..df7327f 100644 --- a/src/c_fl_tabs.cpp +++ b/src/c_fl_tabs.cpp @@ -60,52 +60,52 @@ TABS new_fl_tabs(int x, int y, int w, int h, char* label) { } void free_fl_tabs(TABS t) { - delete reinterpret_cast<My_Tabs*>(t); + delete static_cast<My_Tabs*>(t); } void fl_tabs_client_area(TABS t, int * x, int * y, int * w, int * h, int i) { - reinterpret_cast<Fl_Tabs*>(t)->client_area(*x,*y,*w,*h,i); + static_cast<Fl_Tabs*>(t)->client_area(*x,*y,*w,*h,i); } void * fl_tabs_get_push(TABS t) { - return reinterpret_cast<Fl_Tabs*>(t)->push(); + return static_cast<Fl_Tabs*>(t)->push(); } void fl_tabs_set_push(TABS t, void * w) { - reinterpret_cast<Fl_Tabs*>(t)->push(reinterpret_cast<Fl_Widget*>(w)); + static_cast<Fl_Tabs*>(t)->push(static_cast<Fl_Widget*>(w)); } void * fl_tabs_get_value(TABS t) { - return reinterpret_cast<Fl_Tabs*>(t)->value(); + return static_cast<Fl_Tabs*>(t)->value(); } void fl_tabs_set_value(TABS t, void * w) { - reinterpret_cast<Fl_Tabs*>(t)->value(reinterpret_cast<Fl_Widget*>(w)); + static_cast<Fl_Tabs*>(t)->value(static_cast<Fl_Widget*>(w)); } void * fl_tabs_which(TABS t, int x, int y) { - return reinterpret_cast<Fl_Tabs*>(t)->which(x,y); + return static_cast<Fl_Tabs*>(t)->which(x,y); } void fl_tabs_draw(TABS t) { - reinterpret_cast<My_Tabs*>(t)->Fl_Tabs::draw(); + static_cast<My_Tabs*>(t)->Fl_Tabs::draw(); } void fl_tabs_redraw_tabs(TABS t) { - (reinterpret_cast<Fl_Tabs*>(t)->*(&Friend_Tabs::redraw_tabs))(); + (static_cast<Fl_Tabs*>(t)->*(&Friend_Tabs::redraw_tabs))(); } int fl_tabs_handle(TABS t, int e) { - return reinterpret_cast<My_Tabs*>(t)->Fl_Tabs::handle(e); + return static_cast<My_Tabs*>(t)->Fl_Tabs::handle(e); } diff --git a/src/c_fl_text_buffer.cpp b/src/c_fl_text_buffer.cpp index 7efb0a3..3bb5b3b 100644 --- a/src/c_fl_text_buffer.cpp +++ b/src/c_fl_text_buffer.cpp @@ -25,14 +25,14 @@ TEXTBUFFER new_fl_text_buffer(int rs, int pgs) { } void upref_fl_text_buffer(TEXTBUFFER tb) { - reinterpret_cast<My_Text_Buffer*>(tb)->reference_count += 1; + static_cast<My_Text_Buffer*>(tb)->reference_count += 1; } void free_fl_text_buffer(TEXTBUFFER tb) { - if (reinterpret_cast<My_Text_Buffer*>(tb)->reference_count <= 0) { - delete reinterpret_cast<My_Text_Buffer*>(tb); + if (static_cast<My_Text_Buffer*>(tb)->reference_count <= 0) { + delete static_cast<My_Text_Buffer*>(tb); } else { - reinterpret_cast<My_Text_Buffer*>(tb)->reference_count -= 1; + static_cast<My_Text_Buffer*>(tb)->reference_count -= 1; } } @@ -40,255 +40,257 @@ void free_fl_text_buffer(TEXTBUFFER tb) { void fl_text_buffer_add_modify_callback(TEXTBUFFER tb, void * cb, void * ud) { - reinterpret_cast<Fl_Text_Buffer*>(tb)->add_modify_callback(reinterpret_cast<Fl_Text_Modify_Cb>(cb), ud); + static_cast<Fl_Text_Buffer*>(tb)->add_modify_callback + (reinterpret_cast<Fl_Text_Modify_Cb>(cb), ud); } void fl_text_buffer_add_predelete_callback(TEXTBUFFER tb, void * cb, void * ud) { - reinterpret_cast<Fl_Text_Buffer*>(tb)->add_predelete_callback(reinterpret_cast<Fl_Text_Predelete_Cb>(cb), ud); + static_cast<Fl_Text_Buffer*>(tb)->add_predelete_callback + (reinterpret_cast<Fl_Text_Predelete_Cb>(cb), ud); } void fl_text_buffer_call_modify_callbacks(TEXTBUFFER tb) { - reinterpret_cast<Fl_Text_Buffer*>(tb)->call_modify_callbacks(); + static_cast<Fl_Text_Buffer*>(tb)->call_modify_callbacks(); } void fl_text_buffer_call_predelete_callbacks(TEXTBUFFER tb) { - reinterpret_cast<Fl_Text_Buffer*>(tb)->call_predelete_callbacks(); + static_cast<Fl_Text_Buffer*>(tb)->call_predelete_callbacks(); } int fl_text_buffer_loadfile(TEXTBUFFER tb, char * n, int b) { - return reinterpret_cast<Fl_Text_Buffer*>(tb)->loadfile(n,b); + return static_cast<Fl_Text_Buffer*>(tb)->loadfile(n,b); } int fl_text_buffer_appendfile(TEXTBUFFER tb, char * n, int b) { - return reinterpret_cast<Fl_Text_Buffer*>(tb)->appendfile(n,b); + return static_cast<Fl_Text_Buffer*>(tb)->appendfile(n,b); } int fl_text_buffer_insertfile(TEXTBUFFER tb, char * n, int p, int b) { - return reinterpret_cast<Fl_Text_Buffer*>(tb)->insertfile(n,p,b); + return static_cast<Fl_Text_Buffer*>(tb)->insertfile(n,p,b); } int fl_text_buffer_outputfile(TEXTBUFFER tb, char * n, int f, int t, int b) { - return reinterpret_cast<Fl_Text_Buffer*>(tb)->outputfile(n,f,t,b); + return static_cast<Fl_Text_Buffer*>(tb)->outputfile(n,f,t,b); } int fl_text_buffer_savefile(TEXTBUFFER tb, char * n, int b) { - return reinterpret_cast<Fl_Text_Buffer*>(tb)->savefile(n,b); + return static_cast<Fl_Text_Buffer*>(tb)->savefile(n,b); } void fl_text_buffer_insert(TEXTBUFFER tb, int p, const char * item) { - reinterpret_cast<Fl_Text_Buffer*>(tb)->insert(p, item); + static_cast<Fl_Text_Buffer*>(tb)->insert(p, item); } void fl_text_buffer_append(TEXTBUFFER tb, const char * item) { - reinterpret_cast<Fl_Text_Buffer*>(tb)->append(item); + static_cast<Fl_Text_Buffer*>(tb)->append(item); } void fl_text_buffer_replace(TEXTBUFFER tb, int s, int f, const char * text) { - reinterpret_cast<Fl_Text_Buffer*>(tb)->replace(s, f, text); + static_cast<Fl_Text_Buffer*>(tb)->replace(s, f, text); } void fl_text_buffer_remove(TEXTBUFFER tb, int s, int f) { - reinterpret_cast<Fl_Text_Buffer*>(tb)->remove(s, f); + static_cast<Fl_Text_Buffer*>(tb)->remove(s, f); } char * fl_text_buffer_get_text(TEXTBUFFER tb) { - return reinterpret_cast<Fl_Text_Buffer*>(tb)->text(); + return static_cast<Fl_Text_Buffer*>(tb)->text(); } void fl_text_buffer_set_text(TEXTBUFFER tb, char * t) { - reinterpret_cast<Fl_Text_Buffer*>(tb)->text(t); + static_cast<Fl_Text_Buffer*>(tb)->text(t); } char fl_text_buffer_byte_at(TEXTBUFFER tb, int p) { - return reinterpret_cast<Fl_Text_Buffer*>(tb)->byte_at(p); + return static_cast<Fl_Text_Buffer*>(tb)->byte_at(p); } unsigned int fl_text_buffer_char_at(TEXTBUFFER tb, int p) { - return reinterpret_cast<Fl_Text_Buffer*>(tb)->char_at(p); + return static_cast<Fl_Text_Buffer*>(tb)->char_at(p); } char * fl_text_buffer_text_range(TEXTBUFFER tb, int s, int f) { - return reinterpret_cast<Fl_Text_Buffer*>(tb)->text_range(s, f); + return static_cast<Fl_Text_Buffer*>(tb)->text_range(s, f); } int fl_text_buffer_next_char(TEXTBUFFER tb, int p) { - return reinterpret_cast<Fl_Text_Buffer*>(tb)->next_char(p); + return static_cast<Fl_Text_Buffer*>(tb)->next_char(p); } int fl_text_buffer_prev_char(TEXTBUFFER tb, int p) { - return reinterpret_cast<Fl_Text_Buffer*>(tb)->prev_char(p); + return static_cast<Fl_Text_Buffer*>(tb)->prev_char(p); } int fl_text_buffer_count_displayed_characters(TEXTBUFFER tb, int s, int f) { - return reinterpret_cast<Fl_Text_Buffer*>(tb)->count_displayed_characters(s,f); + return static_cast<Fl_Text_Buffer*>(tb)->count_displayed_characters(s,f); } int fl_text_buffer_count_lines(TEXTBUFFER tb, int s, int f) { - return reinterpret_cast<Fl_Text_Buffer*>(tb)->count_lines(s,f); + return static_cast<Fl_Text_Buffer*>(tb)->count_lines(s,f); } int fl_text_buffer_length(TEXTBUFFER tb) { - return reinterpret_cast<Fl_Text_Buffer*>(tb)->length(); + return static_cast<Fl_Text_Buffer*>(tb)->length(); } int fl_text_buffer_get_tab_distance(TEXTBUFFER tb) { - return reinterpret_cast<Fl_Text_Buffer*>(tb)->tab_distance(); + return static_cast<Fl_Text_Buffer*>(tb)->tab_distance(); } void fl_text_buffer_set_tab_distance(TEXTBUFFER tb, int t) { - reinterpret_cast<Fl_Text_Buffer*>(tb)->tab_distance(t); + static_cast<Fl_Text_Buffer*>(tb)->tab_distance(t); } int fl_text_buffer_selection_position(TEXTBUFFER tb, int * s, int * e) { - return reinterpret_cast<Fl_Text_Buffer*>(tb)->selection_position(s, e); + return static_cast<Fl_Text_Buffer*>(tb)->selection_position(s, e); } int fl_text_buffer_secondary_selection_position(TEXTBUFFER tb, int * s, int * e) { - return reinterpret_cast<Fl_Text_Buffer*>(tb)->secondary_selection_position(s,e); + return static_cast<Fl_Text_Buffer*>(tb)->secondary_selection_position(s,e); } void fl_text_buffer_select(TEXTBUFFER tb, int s, int e) { - reinterpret_cast<Fl_Text_Buffer*>(tb)->select(s, e); + static_cast<Fl_Text_Buffer*>(tb)->select(s, e); } void fl_text_buffer_secondary_select(TEXTBUFFER tb, int s, int e) { - reinterpret_cast<Fl_Text_Buffer*>(tb)->secondary_select(s,e); + static_cast<Fl_Text_Buffer*>(tb)->secondary_select(s,e); } int fl_text_buffer_selected(TEXTBUFFER tb) { - return reinterpret_cast<Fl_Text_Buffer*>(tb)->selected(); + return static_cast<Fl_Text_Buffer*>(tb)->selected(); } int fl_text_buffer_secondary_selected(TEXTBUFFER tb) { - return reinterpret_cast<Fl_Text_Buffer*>(tb)->secondary_selected(); + return static_cast<Fl_Text_Buffer*>(tb)->secondary_selected(); } char * fl_text_buffer_selection_text(TEXTBUFFER tb) { - return reinterpret_cast<Fl_Text_Buffer*>(tb)->selection_text(); + return static_cast<Fl_Text_Buffer*>(tb)->selection_text(); } char * fl_text_buffer_secondary_selection_text(TEXTBUFFER tb) { - return reinterpret_cast<Fl_Text_Buffer*>(tb)->secondary_selection_text(); + return static_cast<Fl_Text_Buffer*>(tb)->secondary_selection_text(); } void fl_text_buffer_replace_selection(TEXTBUFFER tb, char * t) { - reinterpret_cast<Fl_Text_Buffer*>(tb)->replace_selection(t); + static_cast<Fl_Text_Buffer*>(tb)->replace_selection(t); } void fl_text_buffer_replace_secondary_selection(TEXTBUFFER tb, char * t) { - reinterpret_cast<Fl_Text_Buffer*>(tb)->replace_secondary_selection(t); + static_cast<Fl_Text_Buffer*>(tb)->replace_secondary_selection(t); } void fl_text_buffer_remove_selection(TEXTBUFFER tb) { - reinterpret_cast<Fl_Text_Buffer*>(tb)->remove_selection(); + static_cast<Fl_Text_Buffer*>(tb)->remove_selection(); } void fl_text_buffer_remove_secondary_selection(TEXTBUFFER tb) { - reinterpret_cast<Fl_Text_Buffer*>(tb)->remove_secondary_selection(); + static_cast<Fl_Text_Buffer*>(tb)->remove_secondary_selection(); } void fl_text_buffer_unselect(TEXTBUFFER tb) { - reinterpret_cast<Fl_Text_Buffer*>(tb)->unselect(); + static_cast<Fl_Text_Buffer*>(tb)->unselect(); } void fl_text_buffer_secondary_unselect(TEXTBUFFER tb) { - reinterpret_cast<Fl_Text_Buffer*>(tb)->secondary_unselect(); + static_cast<Fl_Text_Buffer*>(tb)->secondary_unselect(); } void fl_text_buffer_highlight(TEXTBUFFER tb, int f, int t) { - reinterpret_cast<Fl_Text_Buffer*>(tb)->highlight(f,t); + static_cast<Fl_Text_Buffer*>(tb)->highlight(f,t); } char * fl_text_buffer_highlight_text(TEXTBUFFER tb) { - return reinterpret_cast<Fl_Text_Buffer*>(tb)->highlight_text(); + return static_cast<Fl_Text_Buffer*>(tb)->highlight_text(); } void fl_text_buffer_unhighlight(TEXTBUFFER tb) { - reinterpret_cast<Fl_Text_Buffer*>(tb)->unhighlight(); + static_cast<Fl_Text_Buffer*>(tb)->unhighlight(); } int fl_text_buffer_findchar_forward(TEXTBUFFER tb, int start, unsigned int item, int * found) { - return reinterpret_cast<Fl_Text_Buffer*>(tb)->findchar_forward(start, item, found); + return static_cast<Fl_Text_Buffer*>(tb)->findchar_forward(start, item, found); } int fl_text_buffer_findchar_backward(TEXTBUFFER tb, int start, unsigned int item, int * found) { - return reinterpret_cast<Fl_Text_Buffer*>(tb)->findchar_backward(start, item, found); + return static_cast<Fl_Text_Buffer*>(tb)->findchar_backward(start, item, found); } int fl_text_buffer_search_forward(TEXTBUFFER tb, int start, const char * item, int * found, int mcase) { - return reinterpret_cast<Fl_Text_Buffer*>(tb)->search_forward(start, item, found, mcase); + return static_cast<Fl_Text_Buffer*>(tb)->search_forward(start, item, found, mcase); } int fl_text_buffer_search_backward(TEXTBUFFER tb, int start, const char * item, int * found, int mcase) { - return reinterpret_cast<Fl_Text_Buffer*>(tb)->search_backward(start, item, found, mcase); + return static_cast<Fl_Text_Buffer*>(tb)->search_backward(start, item, found, mcase); } int fl_text_buffer_word_start(TEXTBUFFER tb, int p) { - return reinterpret_cast<Fl_Text_Buffer*>(tb)->word_start(p); + return static_cast<Fl_Text_Buffer*>(tb)->word_start(p); } int fl_text_buffer_word_end(TEXTBUFFER tb, int p) { - return reinterpret_cast<Fl_Text_Buffer*>(tb)->word_end(p); + return static_cast<Fl_Text_Buffer*>(tb)->word_end(p); } int fl_text_buffer_line_start(TEXTBUFFER tb, int p) { - return reinterpret_cast<Fl_Text_Buffer*>(tb)->line_start(p); + return static_cast<Fl_Text_Buffer*>(tb)->line_start(p); } int fl_text_buffer_line_end(TEXTBUFFER tb, int p) { - return reinterpret_cast<Fl_Text_Buffer*>(tb)->line_end(p); + return static_cast<Fl_Text_Buffer*>(tb)->line_end(p); } char * fl_text_buffer_line_text(TEXTBUFFER tb, int p) { - return reinterpret_cast<Fl_Text_Buffer*>(tb)->line_text(p); + return static_cast<Fl_Text_Buffer*>(tb)->line_text(p); } int fl_text_buffer_skip_lines(TEXTBUFFER tb, int s, int l) { - return reinterpret_cast<Fl_Text_Buffer*>(tb)->skip_lines(s, l); + return static_cast<Fl_Text_Buffer*>(tb)->skip_lines(s, l); } int fl_text_buffer_rewind_lines(TEXTBUFFER tb, int s, int l) { - return reinterpret_cast<Fl_Text_Buffer*>(tb)->rewind_lines(s, l); + return static_cast<Fl_Text_Buffer*>(tb)->rewind_lines(s, l); } int fl_text_buffer_skip_displayed_characters(TEXTBUFFER tb, int s, int n) { - return reinterpret_cast<Fl_Text_Buffer*>(tb)->skip_displayed_characters(s,n); + return static_cast<Fl_Text_Buffer*>(tb)->skip_displayed_characters(s,n); } void fl_text_buffer_canundo(TEXTBUFFER tb, char f) { - return reinterpret_cast<Fl_Text_Buffer*>(tb)->canUndo(f); + return static_cast<Fl_Text_Buffer*>(tb)->canUndo(f); } void fl_text_buffer_copy(TEXTBUFFER tb, TEXTBUFFER tb2, int s, int f, int i) { - reinterpret_cast<Fl_Text_Buffer*>(tb)->copy(reinterpret_cast<Fl_Text_Buffer*>(tb2),s,f,i); + static_cast<Fl_Text_Buffer*>(tb)->copy(static_cast<Fl_Text_Buffer*>(tb2),s,f,i); } int fl_text_buffer_utf8_align(TEXTBUFFER tb, int p) { - return reinterpret_cast<Fl_Text_Buffer*>(tb)->utf8_align(p); + return static_cast<Fl_Text_Buffer*>(tb)->utf8_align(p); } diff --git a/src/c_fl_text_buffer.h b/src/c_fl_text_buffer.h index 1e55bc1..ce4c262 100644 --- a/src/c_fl_text_buffer.h +++ b/src/c_fl_text_buffer.h @@ -8,20 +8,14 @@ #define FL_TEXT_BUFFER_GUARD - - typedef void* TEXTBUFFER; - - extern "C" TEXTBUFFER new_fl_text_buffer(int rs, int pgs); extern "C" void upref_fl_text_buffer(TEXTBUFFER tb); extern "C" void free_fl_text_buffer(TEXTBUFFER tb); - - extern "C" void fl_text_buffer_add_modify_callback(TEXTBUFFER tb, void * cb, void * ud); extern "C" void fl_text_buffer_add_predelete_callback(TEXTBUFFER tb, void * cb, void * ud); extern "C" void fl_text_buffer_call_modify_callbacks(TEXTBUFFER tb); @@ -76,10 +70,14 @@ extern "C" char * fl_text_buffer_highlight_text(TEXTBUFFER tb); extern "C" void fl_text_buffer_unhighlight(TEXTBUFFER tb); -extern "C" int fl_text_buffer_findchar_forward(TEXTBUFFER tb, int start, unsigned int item, int * found); -extern "C" int fl_text_buffer_findchar_backward(TEXTBUFFER tb, int start, unsigned int item, int * found); -extern "C" int fl_text_buffer_search_forward(TEXTBUFFER tb, int start, const char * item, int * found, int mcase); -extern "C" int fl_text_buffer_search_backward(TEXTBUFFER tb, int start, const char * item, int * found, int mcase); +extern "C" int fl_text_buffer_findchar_forward(TEXTBUFFER tb, int start, + unsigned int item, int * found); +extern "C" int fl_text_buffer_findchar_backward(TEXTBUFFER tb, int start, + unsigned int item, int * found); +extern "C" int fl_text_buffer_search_forward(TEXTBUFFER tb, int start, + const char * item, int * found, int mcase); +extern "C" int fl_text_buffer_search_backward(TEXTBUFFER tb, int start, + const char * item, int * found, int mcase); extern "C" int fl_text_buffer_word_start(TEXTBUFFER tb, int p); @@ -99,3 +97,4 @@ extern "C" int fl_text_buffer_utf8_align(TEXTBUFFER tb, int p); #endif + diff --git a/src/c_fl_text_display.cpp b/src/c_fl_text_display.cpp index 7323049..654d6ce 100644 --- a/src/c_fl_text_display.cpp +++ b/src/c_fl_text_display.cpp @@ -52,7 +52,7 @@ TEXTDISPLAY new_fl_text_display(int x, int y, int w, int h, char* label) { } void free_fl_text_display(TEXTDISPLAY td) { - delete reinterpret_cast<My_Text_Display*>(td); + delete static_cast<My_Text_Display*>(td); } @@ -61,29 +61,29 @@ void free_fl_text_display(TEXTDISPLAY td) { // this actually never gets called, since an access to the text_buffer // object is stored on the Ada side of things TEXTBUFFER fl_text_display_get_buffer(TEXTDISPLAY td) { - return reinterpret_cast<Fl_Text_Display*>(td)->buffer(); + return static_cast<Fl_Text_Display*>(td)->buffer(); } void fl_text_display_set_buffer(TEXTDISPLAY td, TEXTBUFFER tb) { - reinterpret_cast<Fl_Text_Display*>(td)->buffer(reinterpret_cast<Fl_Text_Buffer*>(tb)); + static_cast<Fl_Text_Display*>(td)->buffer(static_cast<Fl_Text_Buffer*>(tb)); } void fl_text_display_highlight_data(TEXTDISPLAY td, TEXTBUFFER tb, void * st, int len) { - reinterpret_cast<Fl_Text_Display*>(td)->highlight_data - (reinterpret_cast<Fl_Text_Buffer*>(tb), - reinterpret_cast<Fl_Text_Display::Style_Table_Entry*>(st), + static_cast<Fl_Text_Display*>(td)->highlight_data + (static_cast<Fl_Text_Buffer*>(tb), + static_cast<Fl_Text_Display::Style_Table_Entry*>(st), len, 0, 0, 0); } void fl_text_display_highlight_data2(TEXTDISPLAY td, TEXTBUFFER tb, void * st, int len, char us, void * cb, void * a) { - reinterpret_cast<Fl_Text_Display*>(td)->highlight_data - (reinterpret_cast<Fl_Text_Buffer*>(tb), - reinterpret_cast<Fl_Text_Display::Style_Table_Entry*>(st), + static_cast<Fl_Text_Display*>(td)->highlight_data + (static_cast<Fl_Text_Buffer*>(tb), + static_cast<Fl_Text_Display::Style_Table_Entry*>(st), len, us, reinterpret_cast<Fl_Text_Display::Unfinished_Style_Cb>(cb), a); } @@ -91,249 +91,249 @@ void fl_text_display_highlight_data2(TEXTDISPLAY td, TEXTBUFFER tb, void * st, i double fl_text_display_col_to_x(TEXTDISPLAY td, double c) { - return reinterpret_cast<Fl_Text_Display*>(td)->col_to_x(c); + return static_cast<Fl_Text_Display*>(td)->col_to_x(c); } double fl_text_display_x_to_col(TEXTDISPLAY td, double x) { - return reinterpret_cast<Fl_Text_Display*>(td)->x_to_col(x); + return static_cast<Fl_Text_Display*>(td)->x_to_col(x); } int fl_text_display_in_selection(TEXTDISPLAY td, int x, int y) { - return reinterpret_cast<Fl_Text_Display*>(td)->in_selection(x, y); + return static_cast<Fl_Text_Display*>(td)->in_selection(x, y); } int fl_text_display_position_to_xy(TEXTDISPLAY td, int p, int * x, int * y) { - return reinterpret_cast<Fl_Text_Display*>(td)->position_to_xy(p, x, y); + return static_cast<Fl_Text_Display*>(td)->position_to_xy(p, x, y); } unsigned int fl_text_display_get_cursor_color(TEXTDISPLAY td) { - return reinterpret_cast<Fl_Text_Display*>(td)->cursor_color(); + return static_cast<Fl_Text_Display*>(td)->cursor_color(); } void fl_text_display_set_cursor_color(TEXTDISPLAY td, unsigned int c) { - reinterpret_cast<Fl_Text_Display*>(td)->cursor_color(c); + static_cast<Fl_Text_Display*>(td)->cursor_color(c); } void fl_text_display_set_cursor_style(TEXTDISPLAY td, int s) { - reinterpret_cast<Fl_Text_Display*>(td)->cursor_style(s); + static_cast<Fl_Text_Display*>(td)->cursor_style(s); } void fl_text_display_hide_cursor(TEXTDISPLAY td) { - reinterpret_cast<Fl_Text_Display*>(td)->hide_cursor(); + static_cast<Fl_Text_Display*>(td)->hide_cursor(); } void fl_text_display_show_cursor(TEXTDISPLAY td) { - reinterpret_cast<Fl_Text_Display*>(td)->show_cursor(); + static_cast<Fl_Text_Display*>(td)->show_cursor(); } unsigned int fl_text_display_get_text_color(TEXTDISPLAY td) { - return reinterpret_cast<Fl_Text_Display*>(td)->textcolor(); + return static_cast<Fl_Text_Display*>(td)->textcolor(); } void fl_text_display_set_text_color(TEXTDISPLAY td, unsigned int c) { - reinterpret_cast<Fl_Text_Display*>(td)->textcolor(static_cast<Fl_Color>(c)); + static_cast<Fl_Text_Display*>(td)->textcolor(static_cast<Fl_Color>(c)); } int fl_text_display_get_text_font(TEXTDISPLAY td) { - return reinterpret_cast<Fl_Text_Display*>(td)->textfont(); + return static_cast<Fl_Text_Display*>(td)->textfont(); } void fl_text_display_set_text_font(TEXTDISPLAY td, int f) { - reinterpret_cast<Fl_Text_Display*>(td)->textfont(static_cast<Fl_Font>(f)); + static_cast<Fl_Text_Display*>(td)->textfont(static_cast<Fl_Font>(f)); } int fl_text_display_get_text_size(TEXTDISPLAY td) { - return reinterpret_cast<Fl_Text_Display*>(td)->textsize(); + return static_cast<Fl_Text_Display*>(td)->textsize(); } void fl_text_display_set_text_size(TEXTDISPLAY td, int s) { - reinterpret_cast<Fl_Text_Display*>(td)->textsize(static_cast<Fl_Fontsize>(s)); + static_cast<Fl_Text_Display*>(td)->textsize(static_cast<Fl_Fontsize>(s)); } void fl_text_display_insert(TEXTDISPLAY td, char * i) { - reinterpret_cast<Fl_Text_Display*>(td)->insert(i); + static_cast<Fl_Text_Display*>(td)->insert(i); } void fl_text_display_overstrike(TEXTDISPLAY td, char * t) { - reinterpret_cast<Fl_Text_Display*>(td)->overstrike(t); + static_cast<Fl_Text_Display*>(td)->overstrike(t); } int fl_text_display_get_insert_pos(TEXTDISPLAY td) { - return reinterpret_cast<Fl_Text_Display*>(td)->insert_position(); + return static_cast<Fl_Text_Display*>(td)->insert_position(); } void fl_text_display_set_insert_pos(TEXTDISPLAY td, int p) { - reinterpret_cast<Fl_Text_Display*>(td)->insert_position(p); + static_cast<Fl_Text_Display*>(td)->insert_position(p); } void fl_text_display_show_insert_pos(TEXTDISPLAY td) { - reinterpret_cast<Fl_Text_Display*>(td)->show_insert_position(); + static_cast<Fl_Text_Display*>(td)->show_insert_position(); } int fl_text_display_word_start(TEXTDISPLAY td, int p) { - return reinterpret_cast<Fl_Text_Display*>(td)->word_start(p); + return static_cast<Fl_Text_Display*>(td)->word_start(p); } int fl_text_display_word_end(TEXTDISPLAY td, int p) { - return reinterpret_cast<Fl_Text_Display*>(td)->word_end(p); + return static_cast<Fl_Text_Display*>(td)->word_end(p); } void fl_text_display_next_word(TEXTDISPLAY td) { - reinterpret_cast<Fl_Text_Display*>(td)->next_word(); + static_cast<Fl_Text_Display*>(td)->next_word(); } void fl_text_display_previous_word(TEXTDISPLAY td) { - reinterpret_cast<Fl_Text_Display*>(td)->previous_word(); + static_cast<Fl_Text_Display*>(td)->previous_word(); } void fl_text_display_wrap_mode(TEXTDISPLAY td, int w, int m) { - reinterpret_cast<Fl_Text_Display*>(td)->wrap_mode(w, m); + static_cast<Fl_Text_Display*>(td)->wrap_mode(w, m); } int fl_text_display_line_start(TEXTDISPLAY td, int s) { - return reinterpret_cast<Fl_Text_Display*>(td)->line_start(s); + return static_cast<Fl_Text_Display*>(td)->line_start(s); } int fl_text_display_line_end(TEXTDISPLAY td, int s, int p) { - return reinterpret_cast<Fl_Text_Display*>(td)->line_end(s, p); + return static_cast<Fl_Text_Display*>(td)->line_end(s, p); } int fl_text_display_count_lines(TEXTDISPLAY td, int s, int f, int p) { - return reinterpret_cast<Fl_Text_Display*>(td)->count_lines(s, f, p); + return static_cast<Fl_Text_Display*>(td)->count_lines(s, f, p); } int fl_text_display_skip_lines(TEXTDISPLAY td, int s, int l, int p) { - return reinterpret_cast<Fl_Text_Display*>(td)->skip_lines(s, l, p); + return static_cast<Fl_Text_Display*>(td)->skip_lines(s, l, p); } int fl_text_display_rewind_lines(TEXTDISPLAY td, int s, int l) { - return reinterpret_cast<Fl_Text_Display*>(td)->rewind_lines(s, l); + return static_cast<Fl_Text_Display*>(td)->rewind_lines(s, l); } unsigned int fl_text_display_get_linenumber_align(TEXTDISPLAY td) { - return reinterpret_cast<Fl_Text_Display*>(td)->linenumber_align(); + return static_cast<Fl_Text_Display*>(td)->linenumber_align(); } void fl_text_display_set_linenumber_align(TEXTDISPLAY td, unsigned int a) { - reinterpret_cast<Fl_Text_Display*>(td)->linenumber_align(a); + static_cast<Fl_Text_Display*>(td)->linenumber_align(a); } unsigned int fl_text_display_get_linenumber_bgcolor(TEXTDISPLAY td) { - return reinterpret_cast<Fl_Text_Display*>(td)->linenumber_bgcolor(); + return static_cast<Fl_Text_Display*>(td)->linenumber_bgcolor(); } void fl_text_display_set_linenumber_bgcolor(TEXTDISPLAY td, unsigned int c) { - reinterpret_cast<Fl_Text_Display*>(td)->linenumber_bgcolor(c); + static_cast<Fl_Text_Display*>(td)->linenumber_bgcolor(c); } unsigned int fl_text_display_get_linenumber_fgcolor(TEXTDISPLAY td) { - return reinterpret_cast<Fl_Text_Display*>(td)->linenumber_fgcolor(); + return static_cast<Fl_Text_Display*>(td)->linenumber_fgcolor(); } void fl_text_display_set_linenumber_fgcolor(TEXTDISPLAY td, unsigned int c) { - reinterpret_cast<Fl_Text_Display*>(td)->linenumber_fgcolor(c); + static_cast<Fl_Text_Display*>(td)->linenumber_fgcolor(c); } int fl_text_display_get_linenumber_font(TEXTDISPLAY td) { - return reinterpret_cast<Fl_Text_Display*>(td)->linenumber_font(); + return static_cast<Fl_Text_Display*>(td)->linenumber_font(); } void fl_text_display_set_linenumber_font(TEXTDISPLAY td, int f) { - reinterpret_cast<Fl_Text_Display*>(td)->linenumber_font(f); + static_cast<Fl_Text_Display*>(td)->linenumber_font(f); } int fl_text_display_get_linenumber_size(TEXTDISPLAY td) { - return reinterpret_cast<Fl_Text_Display*>(td)->linenumber_size(); + return static_cast<Fl_Text_Display*>(td)->linenumber_size(); } void fl_text_display_set_linenumber_size(TEXTDISPLAY td, int s) { - reinterpret_cast<Fl_Text_Display*>(td)->linenumber_size(s); + static_cast<Fl_Text_Display*>(td)->linenumber_size(s); } int fl_text_display_get_linenumber_width(TEXTDISPLAY td) { - return reinterpret_cast<Fl_Text_Display*>(td)->linenumber_width(); + return static_cast<Fl_Text_Display*>(td)->linenumber_width(); } void fl_text_display_set_linenumber_width(TEXTDISPLAY td, int w) { - reinterpret_cast<Fl_Text_Display*>(td)->linenumber_width(w); + static_cast<Fl_Text_Display*>(td)->linenumber_width(w); } int fl_text_display_move_down(TEXTDISPLAY td) { - return reinterpret_cast<Fl_Text_Display*>(td)->move_down(); + return static_cast<Fl_Text_Display*>(td)->move_down(); } int fl_text_display_move_left(TEXTDISPLAY td) { - return reinterpret_cast<Fl_Text_Display*>(td)->move_left(); + return static_cast<Fl_Text_Display*>(td)->move_left(); } int fl_text_display_move_right(TEXTDISPLAY td) { - return reinterpret_cast<Fl_Text_Display*>(td)->move_right(); + return static_cast<Fl_Text_Display*>(td)->move_right(); } int fl_text_display_move_up(TEXTDISPLAY td) { - return reinterpret_cast<Fl_Text_Display*>(td)->move_up(); + return static_cast<Fl_Text_Display*>(td)->move_up(); } void fl_text_display_scroll(TEXTDISPLAY td, int l) { - reinterpret_cast<Fl_Text_Display*>(td)->scroll(l, 1); + static_cast<Fl_Text_Display*>(td)->scroll(l, 1); } unsigned int fl_text_display_get_scrollbar_align(TEXTDISPLAY td) { - return reinterpret_cast<Fl_Text_Display*>(td)->scrollbar_align(); + return static_cast<Fl_Text_Display*>(td)->scrollbar_align(); } void fl_text_display_set_scrollbar_align(TEXTDISPLAY td, unsigned int a) { - reinterpret_cast<Fl_Text_Display*>(td)->scrollbar_align(a); + static_cast<Fl_Text_Display*>(td)->scrollbar_align(a); } int fl_text_display_get_scrollbar_width(TEXTDISPLAY td) { - return reinterpret_cast<Fl_Text_Display*>(td)->scrollbar_width(); + return static_cast<Fl_Text_Display*>(td)->scrollbar_width(); } void fl_text_display_set_scrollbar_width(TEXTDISPLAY td, int w) { - reinterpret_cast<Fl_Text_Display*>(td)->scrollbar_width(w); + static_cast<Fl_Text_Display*>(td)->scrollbar_width(w); } void fl_text_display_redisplay_range(TEXTDISPLAY td, int s, int f) { - reinterpret_cast<Fl_Text_Display*>(td)->redisplay_range(s,f); + static_cast<Fl_Text_Display*>(td)->redisplay_range(s,f); } void fl_text_display_draw(TEXTDISPLAY td) { - reinterpret_cast<My_Text_Display*>(td)->Fl_Text_Display::draw(); + static_cast<My_Text_Display*>(td)->Fl_Text_Display::draw(); } int fl_text_display_handle(TEXTDISPLAY td, int e) { - return reinterpret_cast<My_Text_Display*>(td)->Fl_Text_Display::handle(e); + return static_cast<My_Text_Display*>(td)->Fl_Text_Display::handle(e); } diff --git a/src/c_fl_text_editor.cpp b/src/c_fl_text_editor.cpp index b7e3f3e..d148676 100644 --- a/src/c_fl_text_editor.cpp +++ b/src/c_fl_text_editor.cpp @@ -50,230 +50,232 @@ TEXTEDITOR new_fl_text_editor(int x, int y, int w, int h, char* label) { } void free_fl_text_editor(TEXTEDITOR te) { - delete reinterpret_cast<My_Text_Editor*>(te); + delete static_cast<My_Text_Editor*>(te); } void fl_text_editor_default(TEXTEDITOR te, int k) { - Fl_Text_Editor::kf_default(k, reinterpret_cast<Fl_Text_Editor*>(te)); + Fl_Text_Editor::kf_default(k, static_cast<Fl_Text_Editor*>(te)); } void fl_text_editor_undo(TEXTEDITOR te) { - Fl_Text_Editor::kf_undo(0, reinterpret_cast<Fl_Text_Editor*>(te)); + Fl_Text_Editor::kf_undo(0, static_cast<Fl_Text_Editor*>(te)); } void fl_text_editor_cut(TEXTEDITOR te) { - Fl_Text_Editor::kf_cut(0, reinterpret_cast<Fl_Text_Editor*>(te)); + Fl_Text_Editor::kf_cut(0, static_cast<Fl_Text_Editor*>(te)); } void fl_text_editor_copy(TEXTEDITOR te) { - Fl_Text_Editor::kf_copy(0, reinterpret_cast<Fl_Text_Editor*>(te)); + Fl_Text_Editor::kf_copy(0, static_cast<Fl_Text_Editor*>(te)); } void fl_text_editor_paste(TEXTEDITOR te) { - Fl_Text_Editor::kf_paste(0, reinterpret_cast<Fl_Text_Editor*>(te)); + Fl_Text_Editor::kf_paste(0, static_cast<Fl_Text_Editor*>(te)); } void fl_text_editor_delete(TEXTEDITOR te) { - Fl_Text_Editor::kf_delete(0, reinterpret_cast<Fl_Text_Editor*>(te)); + Fl_Text_Editor::kf_delete(0, static_cast<Fl_Text_Editor*>(te)); } void fl_text_editor_select_all(TEXTEDITOR te) { - Fl_Text_Editor::kf_select_all(0, reinterpret_cast<Fl_Text_Editor*>(te)); + Fl_Text_Editor::kf_select_all(0, static_cast<Fl_Text_Editor*>(te)); } void fl_text_editor_backspace(TEXTEDITOR te) { - Fl_Text_Editor::kf_backspace(0, reinterpret_cast<Fl_Text_Editor*>(te)); + Fl_Text_Editor::kf_backspace(0, static_cast<Fl_Text_Editor*>(te)); } void fl_text_editor_insert(TEXTEDITOR te) { - Fl_Text_Editor::kf_insert(0, reinterpret_cast<Fl_Text_Editor*>(te)); + Fl_Text_Editor::kf_insert(0, static_cast<Fl_Text_Editor*>(te)); } void fl_text_editor_enter(TEXTEDITOR te) { - Fl_Text_Editor::kf_enter(0, reinterpret_cast<Fl_Text_Editor*>(te)); + Fl_Text_Editor::kf_enter(0, static_cast<Fl_Text_Editor*>(te)); } void fl_text_editor_ignore(TEXTEDITOR te) { - Fl_Text_Editor::kf_ignore(0, reinterpret_cast<Fl_Text_Editor*>(te)); + Fl_Text_Editor::kf_ignore(0, static_cast<Fl_Text_Editor*>(te)); } void fl_text_editor_home(TEXTEDITOR te) { - Fl_Text_Editor::kf_home(0, reinterpret_cast<Fl_Text_Editor*>(te)); + Fl_Text_Editor::kf_home(0, static_cast<Fl_Text_Editor*>(te)); } void fl_text_editor_end(TEXTEDITOR te) { - Fl_Text_Editor::kf_end(0, reinterpret_cast<Fl_Text_Editor*>(te)); + Fl_Text_Editor::kf_end(0, static_cast<Fl_Text_Editor*>(te)); } void fl_text_editor_page_down(TEXTEDITOR te) { - Fl_Text_Editor::kf_page_down(0, reinterpret_cast<Fl_Text_Editor*>(te)); + Fl_Text_Editor::kf_page_down(0, static_cast<Fl_Text_Editor*>(te)); } void fl_text_editor_page_up(TEXTEDITOR te) { - Fl_Text_Editor::kf_page_up(0, reinterpret_cast<Fl_Text_Editor*>(te)); + Fl_Text_Editor::kf_page_up(0, static_cast<Fl_Text_Editor*>(te)); } void fl_text_editor_down(TEXTEDITOR te) { - Fl_Text_Editor::kf_down(0, reinterpret_cast<Fl_Text_Editor*>(te)); + Fl_Text_Editor::kf_down(0, static_cast<Fl_Text_Editor*>(te)); } void fl_text_editor_left(TEXTEDITOR te) { - Fl_Text_Editor::kf_left(0, reinterpret_cast<Fl_Text_Editor*>(te)); + Fl_Text_Editor::kf_left(0, static_cast<Fl_Text_Editor*>(te)); } void fl_text_editor_right(TEXTEDITOR te) { - Fl_Text_Editor::kf_right(0, reinterpret_cast<Fl_Text_Editor*>(te)); + Fl_Text_Editor::kf_right(0, static_cast<Fl_Text_Editor*>(te)); } void fl_text_editor_up(TEXTEDITOR te) { - Fl_Text_Editor::kf_up(0, reinterpret_cast<Fl_Text_Editor*>(te)); + Fl_Text_Editor::kf_up(0, static_cast<Fl_Text_Editor*>(te)); } void fl_text_editor_shift_home(TEXTEDITOR te) { - Fl_Text_Editor::kf_shift_move(FL_Home, reinterpret_cast<Fl_Text_Editor*>(te)); + Fl_Text_Editor::kf_shift_move(FL_Home, static_cast<Fl_Text_Editor*>(te)); } void fl_text_editor_shift_end(TEXTEDITOR te) { - Fl_Text_Editor::kf_shift_move(FL_End, reinterpret_cast<Fl_Text_Editor*>(te)); + Fl_Text_Editor::kf_shift_move(FL_End, static_cast<Fl_Text_Editor*>(te)); } void fl_text_editor_shift_page_down(TEXTEDITOR te) { - Fl_Text_Editor::kf_shift_move(FL_Page_Down, reinterpret_cast<Fl_Text_Editor*>(te)); + Fl_Text_Editor::kf_shift_move(FL_Page_Down, static_cast<Fl_Text_Editor*>(te)); } void fl_text_editor_shift_page_up(TEXTEDITOR te) { - Fl_Text_Editor::kf_shift_move(FL_Page_Up, reinterpret_cast<Fl_Text_Editor*>(te)); + Fl_Text_Editor::kf_shift_move(FL_Page_Up, static_cast<Fl_Text_Editor*>(te)); } void fl_text_editor_shift_down(TEXTEDITOR te) { - Fl_Text_Editor::kf_shift_move(FL_Down, reinterpret_cast<Fl_Text_Editor*>(te)); + Fl_Text_Editor::kf_shift_move(FL_Down, static_cast<Fl_Text_Editor*>(te)); } void fl_text_editor_shift_left(TEXTEDITOR te) { - Fl_Text_Editor::kf_shift_move(FL_Left, reinterpret_cast<Fl_Text_Editor*>(te)); + Fl_Text_Editor::kf_shift_move(FL_Left, static_cast<Fl_Text_Editor*>(te)); } void fl_text_editor_shift_right(TEXTEDITOR te) { - Fl_Text_Editor::kf_shift_move(FL_Right, reinterpret_cast<Fl_Text_Editor*>(te)); + Fl_Text_Editor::kf_shift_move(FL_Right, static_cast<Fl_Text_Editor*>(te)); } void fl_text_editor_shift_up(TEXTEDITOR te) { - Fl_Text_Editor::kf_shift_move(FL_Up, reinterpret_cast<Fl_Text_Editor*>(te)); + Fl_Text_Editor::kf_shift_move(FL_Up, static_cast<Fl_Text_Editor*>(te)); } void fl_text_editor_ctrl_home(TEXTEDITOR te) { - Fl_Text_Editor::kf_ctrl_move(FL_Home, reinterpret_cast<Fl_Text_Editor*>(te)); + Fl_Text_Editor::kf_ctrl_move(FL_Home, static_cast<Fl_Text_Editor*>(te)); } void fl_text_editor_ctrl_end(TEXTEDITOR te) { - Fl_Text_Editor::kf_ctrl_move(FL_End, reinterpret_cast<Fl_Text_Editor*>(te)); + Fl_Text_Editor::kf_ctrl_move(FL_End, static_cast<Fl_Text_Editor*>(te)); } void fl_text_editor_ctrl_page_down(TEXTEDITOR te) { - Fl_Text_Editor::kf_ctrl_move(FL_Page_Down, reinterpret_cast<Fl_Text_Editor*>(te)); + Fl_Text_Editor::kf_ctrl_move(FL_Page_Down, static_cast<Fl_Text_Editor*>(te)); } void fl_text_editor_ctrl_page_up(TEXTEDITOR te) { - Fl_Text_Editor::kf_ctrl_move(FL_Page_Up, reinterpret_cast<Fl_Text_Editor*>(te)); + Fl_Text_Editor::kf_ctrl_move(FL_Page_Up, static_cast<Fl_Text_Editor*>(te)); } void fl_text_editor_ctrl_down(TEXTEDITOR te) { - Fl_Text_Editor::kf_ctrl_move(FL_Down, reinterpret_cast<Fl_Text_Editor*>(te)); + Fl_Text_Editor::kf_ctrl_move(FL_Down, static_cast<Fl_Text_Editor*>(te)); } void fl_text_editor_ctrl_left(TEXTEDITOR te) { - Fl_Text_Editor::kf_ctrl_move(FL_Left, reinterpret_cast<Fl_Text_Editor*>(te)); + Fl_Text_Editor::kf_ctrl_move(FL_Left, static_cast<Fl_Text_Editor*>(te)); } void fl_text_editor_ctrl_right(TEXTEDITOR te) { - Fl_Text_Editor::kf_ctrl_move(FL_Right, reinterpret_cast<Fl_Text_Editor*>(te)); + Fl_Text_Editor::kf_ctrl_move(FL_Right, static_cast<Fl_Text_Editor*>(te)); } void fl_text_editor_ctrl_up(TEXTEDITOR te) { - Fl_Text_Editor::kf_ctrl_move(FL_Up, reinterpret_cast<Fl_Text_Editor*>(te)); + Fl_Text_Editor::kf_ctrl_move(FL_Up, static_cast<Fl_Text_Editor*>(te)); } void fl_text_editor_ctrl_shift_home(TEXTEDITOR te) { - Fl_Text_Editor::kf_c_s_move(FL_Home, reinterpret_cast<Fl_Text_Editor*>(te)); + Fl_Text_Editor::kf_c_s_move(FL_Home, static_cast<Fl_Text_Editor*>(te)); } void fl_text_editor_ctrl_shift_end(TEXTEDITOR te) { - Fl_Text_Editor::kf_c_s_move(FL_End, reinterpret_cast<Fl_Text_Editor*>(te)); + Fl_Text_Editor::kf_c_s_move(FL_End, static_cast<Fl_Text_Editor*>(te)); } void fl_text_editor_ctrl_shift_page_down(TEXTEDITOR te) { - Fl_Text_Editor::kf_c_s_move(FL_Page_Down, reinterpret_cast<Fl_Text_Editor*>(te)); + Fl_Text_Editor::kf_c_s_move(FL_Page_Down, static_cast<Fl_Text_Editor*>(te)); } void fl_text_editor_ctrl_shift_page_up(TEXTEDITOR te) { - Fl_Text_Editor::kf_c_s_move(FL_Page_Up, reinterpret_cast<Fl_Text_Editor*>(te)); + Fl_Text_Editor::kf_c_s_move(FL_Page_Up, static_cast<Fl_Text_Editor*>(te)); } void fl_text_editor_ctrl_shift_down(TEXTEDITOR te) { - Fl_Text_Editor::kf_c_s_move(FL_Down, reinterpret_cast<Fl_Text_Editor*>(te)); + Fl_Text_Editor::kf_c_s_move(FL_Down, static_cast<Fl_Text_Editor*>(te)); } void fl_text_editor_ctrl_shift_left(TEXTEDITOR te) { - Fl_Text_Editor::kf_c_s_move(FL_Left, reinterpret_cast<Fl_Text_Editor*>(te)); + Fl_Text_Editor::kf_c_s_move(FL_Left, static_cast<Fl_Text_Editor*>(te)); } void fl_text_editor_ctrl_shift_right(TEXTEDITOR te) { - Fl_Text_Editor::kf_c_s_move(FL_Right, reinterpret_cast<Fl_Text_Editor*>(te)); + Fl_Text_Editor::kf_c_s_move(FL_Right, static_cast<Fl_Text_Editor*>(te)); } void fl_text_editor_ctrl_shift_up(TEXTEDITOR te) { - Fl_Text_Editor::kf_c_s_move(FL_Up, reinterpret_cast<Fl_Text_Editor*>(te)); + Fl_Text_Editor::kf_c_s_move(FL_Up, static_cast<Fl_Text_Editor*>(te)); } void fl_text_editor_add_key_binding(TEXTEDITOR te, int k, int s, void * f) { - reinterpret_cast<Fl_Text_Editor*>(te)->add_key_binding(k, s, reinterpret_cast<Fl_Text_Editor::Key_Func>(f)); + static_cast<Fl_Text_Editor*>(te)->add_key_binding + (k, s, reinterpret_cast<Fl_Text_Editor::Key_Func>(f)); } void fl_text_editor_remove_key_binding(TEXTEDITOR te, int k, int s) { - reinterpret_cast<Fl_Text_Editor*>(te)->remove_key_binding(k, s); + static_cast<Fl_Text_Editor*>(te)->remove_key_binding(k, s); } void fl_text_editor_remove_all_key_bindings(TEXTEDITOR te) { - reinterpret_cast<Fl_Text_Editor*>(te)->remove_all_key_bindings(); + static_cast<Fl_Text_Editor*>(te)->remove_all_key_bindings(); } void fl_text_editor_set_default_key_function(TEXTEDITOR te, void * f) { - reinterpret_cast<Fl_Text_Editor*>(te)->default_key_function(reinterpret_cast<Fl_Text_Editor::Key_Func>(f)); + static_cast<Fl_Text_Editor*>(te)->default_key_function + (reinterpret_cast<Fl_Text_Editor::Key_Func>(f)); } int fl_text_editor_get_insert_mode(TEXTEDITOR te) { - return reinterpret_cast<Fl_Text_Editor*>(te)->insert_mode(); + return static_cast<Fl_Text_Editor*>(te)->insert_mode(); } void fl_text_editor_set_insert_mode(TEXTEDITOR te, int i) { - reinterpret_cast<Fl_Text_Editor*>(te)->insert_mode(i); + static_cast<Fl_Text_Editor*>(te)->insert_mode(i); } @@ -281,7 +283,7 @@ void fl_text_editor_set_insert_mode(TEXTEDITOR te, int i) { int fl_text_editor_get_tab_nav(TEXTEDITOR te) { #if FLTK_ABI_VERSION >= 10304 - return reinterpret_cast<Fl_Text_Editor*>(te)->tab_nav(); + return static_cast<Fl_Text_Editor*>(te)->tab_nav(); #else (void)(te); return 0; @@ -290,7 +292,7 @@ int fl_text_editor_get_tab_nav(TEXTEDITOR te) { void fl_text_editor_set_tab_nav(TEXTEDITOR te, int t) { #if FLTK_ABI_VERSION >= 10304 - reinterpret_cast<Fl_Text_Editor*>(te)->tab_nav(t); + static_cast<Fl_Text_Editor*>(te)->tab_nav(t); #else (void)(te); (void)(t); @@ -301,11 +303,11 @@ void fl_text_editor_set_tab_nav(TEXTEDITOR te, int t) { void fl_text_editor_draw(TEXTEDITOR te) { - reinterpret_cast<My_Text_Editor*>(te)->Fl_Text_Editor::draw(); + static_cast<My_Text_Editor*>(te)->Fl_Text_Editor::draw(); } int fl_text_editor_handle(TEXTEDITOR te, int e) { - return reinterpret_cast<My_Text_Editor*>(te)->Fl_Text_Editor::handle(e); + return static_cast<My_Text_Editor*>(te)->Fl_Text_Editor::handle(e); } diff --git a/src/c_fl_tile.cpp b/src/c_fl_tile.cpp index 2708d55..81f820a 100644 --- a/src/c_fl_tile.cpp +++ b/src/c_fl_tile.cpp @@ -50,29 +50,29 @@ TILE new_fl_tile(int x, int y, int w, int h, char* label) { } void free_fl_tile(TILE t) { - delete reinterpret_cast<My_Tile*>(t); + delete static_cast<My_Tile*>(t); } void fl_tile_position(TILE t, int ox, int oy, int nx, int ny) { - reinterpret_cast<Fl_Tile*>(t)->position(ox,oy,nx,ny); + static_cast<Fl_Tile*>(t)->position(ox,oy,nx,ny); } void fl_tile_resize(TILE t, int x, int y, int w, int h) { - reinterpret_cast<Fl_Tile*>(t)->resize(x, y, w, h); + static_cast<Fl_Tile*>(t)->resize(x, y, w, h); } void fl_tile_draw(TILE n) { - reinterpret_cast<My_Tile*>(n)->Fl_Tile::draw(); + static_cast<My_Tile*>(n)->Fl_Tile::draw(); } int fl_tile_handle(TILE n, int e) { - return reinterpret_cast<My_Tile*>(n)->Fl_Tile::handle(e); + return static_cast<My_Tile*>(n)->Fl_Tile::handle(e); } diff --git a/src/c_fl_tiled_image.cpp b/src/c_fl_tiled_image.cpp index 7cae644..0fbea0f 100644 --- a/src/c_fl_tiled_image.cpp +++ b/src/c_fl_tiled_image.cpp @@ -11,54 +11,54 @@ -TILED_IMAGE new_fl_tiled_image(void * i, int w, int h) { - Fl_Tiled_Image *t = new Fl_Tiled_Image(reinterpret_cast<Fl_Image*>(i), w, h); +TILEDIMAGE new_fl_tiled_image(void * i, int w, int h) { + Fl_Tiled_Image *t = new Fl_Tiled_Image(static_cast<Fl_Image*>(i), w, h); return t; } -void free_fl_tiled_image(TILED_IMAGE t) { - delete reinterpret_cast<Fl_Tiled_Image*>(t); +void free_fl_tiled_image(TILEDIMAGE t) { + delete static_cast<Fl_Tiled_Image*>(t); } -TILED_IMAGE fl_tiled_image_copy(TILED_IMAGE t, int w, int h) { +TILEDIMAGE fl_tiled_image_copy(TILEDIMAGE t, int w, int h) { // virtual so disable dispatch - return reinterpret_cast<Fl_Tiled_Image*>(t)->Fl_Tiled_Image::copy(w, h); + return static_cast<Fl_Tiled_Image*>(t)->Fl_Tiled_Image::copy(w, h); } -TILED_IMAGE fl_tiled_image_copy2(TILED_IMAGE t) { - return reinterpret_cast<Fl_Tiled_Image*>(t)->copy(); +TILEDIMAGE fl_tiled_image_copy2(TILEDIMAGE t) { + return static_cast<Fl_Tiled_Image*>(t)->copy(); } -void * fl_tiled_image_get_image(TILED_IMAGE t) { - return reinterpret_cast<Fl_Tiled_Image*>(t)->image(); +void * fl_tiled_image_get_image(TILEDIMAGE t) { + return static_cast<Fl_Tiled_Image*>(t)->image(); } -void fl_tiled_image_color_average(TILED_IMAGE t, int c, float b) { +void fl_tiled_image_color_average(TILEDIMAGE t, int c, float b) { // virtual so disable dispatch - reinterpret_cast<Fl_Tiled_Image*>(t)->Fl_Tiled_Image::color_average(c, b); + static_cast<Fl_Tiled_Image*>(t)->Fl_Tiled_Image::color_average(c, b); } -void fl_tiled_image_desaturate(TILED_IMAGE t) { +void fl_tiled_image_desaturate(TILEDIMAGE t) { // virtual so disable dispatch - reinterpret_cast<Fl_Tiled_Image*>(t)->Fl_Tiled_Image::desaturate(); + static_cast<Fl_Tiled_Image*>(t)->Fl_Tiled_Image::desaturate(); } -void fl_tiled_image_draw(TILED_IMAGE t, int x, int y) { - reinterpret_cast<Fl_Tiled_Image*>(t)->draw(x, y); +void fl_tiled_image_draw(TILEDIMAGE t, int x, int y) { + static_cast<Fl_Tiled_Image*>(t)->draw(x, y); } -void fl_tiled_image_draw2(TILED_IMAGE t, int x, int y, int w, int h, int cx, int cy) { +void fl_tiled_image_draw2(TILEDIMAGE t, int x, int y, int w, int h, int cx, int cy) { // virtual so disable dispatch - reinterpret_cast<Fl_Tiled_Image*>(t)->Fl_Tiled_Image::draw(x, y, w, h, cx, cy); + static_cast<Fl_Tiled_Image*>(t)->Fl_Tiled_Image::draw(x, y, w, h, cx, cy); } diff --git a/src/c_fl_tiled_image.h b/src/c_fl_tiled_image.h index 95d202b..9eee3dd 100644 --- a/src/c_fl_tiled_image.h +++ b/src/c_fl_tiled_image.h @@ -8,31 +8,26 @@ #define FL_TILED_IMAGE_GUARD +typedef void* TILEDIMAGE; -typedef void* TILED_IMAGE; +extern "C" TILEDIMAGE new_fl_tiled_image(void * i, int w, int h); +extern "C" void free_fl_tiled_image(TILEDIMAGE t); +extern "C" TILEDIMAGE fl_tiled_image_copy(TILEDIMAGE t, int w, int h); +extern "C" TILEDIMAGE fl_tiled_image_copy2(TILEDIMAGE t); +extern "C" void * fl_tiled_image_get_image(TILEDIMAGE t); -extern "C" TILED_IMAGE new_fl_tiled_image(void * i, int w, int h); -extern "C" void free_fl_tiled_image(TILED_IMAGE t); -extern "C" TILED_IMAGE fl_tiled_image_copy(TILED_IMAGE t, int w, int h); -extern "C" TILED_IMAGE fl_tiled_image_copy2(TILED_IMAGE t); +extern "C" void fl_tiled_image_color_average(TILEDIMAGE t, int c, float b); +extern "C" void fl_tiled_image_desaturate(TILEDIMAGE t); - - -extern "C" void * fl_tiled_image_get_image(TILED_IMAGE t); - - -extern "C" void fl_tiled_image_color_average(TILED_IMAGE t, int c, float b); -extern "C" void fl_tiled_image_desaturate(TILED_IMAGE t); - - -extern "C" void fl_tiled_image_draw(TILED_IMAGE t, int x, int y); -extern "C" void fl_tiled_image_draw2(TILED_IMAGE t, int x, int y, int w, int h, int cx, int cy); +extern "C" void fl_tiled_image_draw(TILEDIMAGE t, int x, int y); +extern "C" void fl_tiled_image_draw2(TILEDIMAGE t, int x, int y, int w, int h, int cx, int cy); #endif + diff --git a/src/c_fl_toggle_button.cpp b/src/c_fl_toggle_button.cpp index 631fc21..d396f37 100644 --- a/src/c_fl_toggle_button.cpp +++ b/src/c_fl_toggle_button.cpp @@ -50,18 +50,18 @@ TOGGLEBUTTON new_fl_toggle_button(int x, int y, int w, int h, char* label) { } void free_fl_toggle_button(TOGGLEBUTTON b) { - delete reinterpret_cast<My_Toggle_Button*>(b); + delete static_cast<My_Toggle_Button*>(b); } void fl_toggle_button_draw(TOGGLEBUTTON b) { - reinterpret_cast<My_Toggle_Button*>(b)->Fl_Toggle_Button::draw(); + static_cast<My_Toggle_Button*>(b)->Fl_Toggle_Button::draw(); } int fl_toggle_button_handle(TOGGLEBUTTON b, int e) { - return reinterpret_cast<My_Toggle_Button*>(b)->Fl_Toggle_Button::handle(e); + return static_cast<My_Toggle_Button*>(b)->Fl_Toggle_Button::handle(e); } diff --git a/src/c_fl_tooltip.cpp b/src/c_fl_tooltip.cpp index 768b357..8819da4 100644 --- a/src/c_fl_tooltip.cpp +++ b/src/c_fl_tooltip.cpp @@ -16,7 +16,7 @@ void * fl_tooltip_get_current(void) { } void fl_tooltip_set_current(void * i) { - Fl_Tooltip::current(reinterpret_cast<Fl_Widget*>(i)); + Fl_Tooltip::current(static_cast<Fl_Widget*>(i)); } int fl_tooltip_enabled(void) { @@ -32,7 +32,7 @@ void fl_tooltip_disable() { } void fl_tooltip_enter_area(void * i, int x, int y, int w, int h, const char * t) { - Fl_Tooltip::enter_area(reinterpret_cast<Fl_Widget*>(i),x,y,w,h,t); + Fl_Tooltip::enter_area(static_cast<Fl_Widget*>(i),x,y,w,h,t); } diff --git a/src/c_fl_valuator.cpp b/src/c_fl_valuator.cpp index f70e6dd..b878077 100644 --- a/src/c_fl_valuator.cpp +++ b/src/c_fl_valuator.cpp @@ -61,84 +61,84 @@ VALUATOR new_fl_valuator(int x, int y, int w, int h, char* label) { } void free_fl_valuator(VALUATOR v) { - delete reinterpret_cast<My_Valuator*>(v); + delete static_cast<My_Valuator*>(v); } double fl_valuator_clamp(VALUATOR v, double a) { - return reinterpret_cast<Fl_Valuator*>(v)->clamp(a); + return static_cast<Fl_Valuator*>(v)->clamp(a); } double fl_valuator_round(VALUATOR v, double a) { - return reinterpret_cast<Fl_Valuator*>(v)->round(a); + return static_cast<Fl_Valuator*>(v)->round(a); } double fl_valuator_increment(VALUATOR v, double a, int s) { - return reinterpret_cast<Fl_Valuator*>(v)->increment(a,s); + return static_cast<Fl_Valuator*>(v)->increment(a,s); } double fl_valuator_get_minimum(VALUATOR v) { - return reinterpret_cast<Fl_Valuator*>(v)->minimum(); + return static_cast<Fl_Valuator*>(v)->minimum(); } void fl_valuator_set_minimum(VALUATOR v, double t) { - reinterpret_cast<Fl_Valuator*>(v)->minimum(t); + static_cast<Fl_Valuator*>(v)->minimum(t); } double fl_valuator_get_maximum(VALUATOR v) { - return reinterpret_cast<Fl_Valuator*>(v)->maximum(); + return static_cast<Fl_Valuator*>(v)->maximum(); } void fl_valuator_set_maximum(VALUATOR v, double t) { - reinterpret_cast<Fl_Valuator*>(v)->maximum(t); + static_cast<Fl_Valuator*>(v)->maximum(t); } double fl_valuator_get_step(VALUATOR v) { - return reinterpret_cast<Fl_Valuator*>(v)->step(); + return static_cast<Fl_Valuator*>(v)->step(); } void fl_valuator_set_step_top(VALUATOR v, double t) { - reinterpret_cast<Fl_Valuator*>(v)->step(t); + static_cast<Fl_Valuator*>(v)->step(t); } void fl_valuator_set_step_bottom(VALUATOR v, int b) { - reinterpret_cast<Fl_Valuator*>(v)->step(b); + static_cast<Fl_Valuator*>(v)->step(b); } void fl_valuator_set_step(VALUATOR v, double t, int b) { - reinterpret_cast<Fl_Valuator*>(v)->step(t, b); + static_cast<Fl_Valuator*>(v)->step(t, b); } double fl_valuator_get_value(VALUATOR v) { - return reinterpret_cast<Fl_Valuator*>(v)->value(); + return static_cast<Fl_Valuator*>(v)->value(); } void fl_valuator_set_value(VALUATOR v, double t) { - reinterpret_cast<Fl_Valuator*>(v)->value(t); + static_cast<Fl_Valuator*>(v)->value(t); } void fl_valuator_bounds(VALUATOR v, double a, double b) { - reinterpret_cast<Fl_Valuator*>(v)->bounds(a,b); + static_cast<Fl_Valuator*>(v)->bounds(a,b); } void fl_valuator_precision(VALUATOR v, int s) { - reinterpret_cast<Fl_Valuator*>(v)->precision(s); + static_cast<Fl_Valuator*>(v)->precision(s); } void fl_valuator_range(VALUATOR v, double a, double b) { - reinterpret_cast<Fl_Valuator*>(v)->range(a,b); + static_cast<Fl_Valuator*>(v)->range(a,b); } void fl_valuator_value_damage(VALUATOR v) { - (reinterpret_cast<Fl_Valuator*>(v)->*(&Friend_Valuator::value_damage))(); + (static_cast<Fl_Valuator*>(v)->*(&Friend_Valuator::value_damage))(); } void fl_valuator_draw(VALUATOR v) { @@ -150,7 +150,7 @@ void fl_valuator_draw(VALUATOR v) { } int fl_valuator_handle(VALUATOR v, int e) { - return reinterpret_cast<My_Valuator*>(v)->Fl_Valuator::handle(e); + return static_cast<My_Valuator*>(v)->Fl_Valuator::handle(e); } diff --git a/src/c_fl_value_input.cpp b/src/c_fl_value_input.cpp index 37273a7..e6a5498 100644 --- a/src/c_fl_value_input.cpp +++ b/src/c_fl_value_input.cpp @@ -50,92 +50,92 @@ VALUEINPUT new_fl_value_input(int x, int y, int w, int h, char* label) { } void free_fl_value_input(VALUEINPUT a) { - delete reinterpret_cast<My_Value_Input*>(a); + delete static_cast<My_Value_Input*>(a); } void * fl_value_input_get_input(VALUEINPUT v) { - return &(reinterpret_cast<Fl_Value_Input*>(v)->input); + return &(static_cast<Fl_Value_Input*>(v)->input); } unsigned int fl_value_input_get_cursor_color(VALUEINPUT v) { - return reinterpret_cast<Fl_Value_Input*>(v)->cursor_color(); + return static_cast<Fl_Value_Input*>(v)->cursor_color(); } void fl_value_input_set_cursor_color(VALUEINPUT v, unsigned int c) { - reinterpret_cast<Fl_Value_Input*>(v)->cursor_color(c); + static_cast<Fl_Value_Input*>(v)->cursor_color(c); } int fl_value_input_get_shortcut(VALUEINPUT v) { - return reinterpret_cast<Fl_Value_Input*>(v)->Fl_Value_Input::shortcut(); + return static_cast<Fl_Value_Input*>(v)->Fl_Value_Input::shortcut(); } void fl_value_input_set_shortcut(VALUEINPUT v, int k) { - reinterpret_cast<Fl_Value_Input*>(v)->Fl_Value_Input::shortcut(k); + static_cast<Fl_Value_Input*>(v)->Fl_Value_Input::shortcut(k); } int fl_value_input_is_soft(VALUEINPUT a) { - return reinterpret_cast<Fl_Value_Input*>(a)->soft(); + return static_cast<Fl_Value_Input*>(a)->soft(); } void fl_value_input_set_soft(VALUEINPUT a, int t) { - reinterpret_cast<Fl_Value_Input*>(a)->soft(t); + static_cast<Fl_Value_Input*>(a)->soft(t); } unsigned int fl_value_input_get_text_color(VALUEINPUT v) { - return reinterpret_cast<Fl_Value_Input*>(v)->textcolor(); + return static_cast<Fl_Value_Input*>(v)->textcolor(); } void fl_value_input_set_text_color(VALUEINPUT v, unsigned int c) { - reinterpret_cast<Fl_Value_Input*>(v)->textcolor(static_cast<Fl_Color>(c)); + static_cast<Fl_Value_Input*>(v)->textcolor(static_cast<Fl_Color>(c)); } int fl_value_input_get_text_font(VALUEINPUT v) { - return reinterpret_cast<Fl_Value_Input*>(v)->textfont(); + return static_cast<Fl_Value_Input*>(v)->textfont(); } void fl_value_input_set_text_font(VALUEINPUT v, int f) { - reinterpret_cast<Fl_Value_Input*>(v)->textfont(static_cast<Fl_Font>(f)); + static_cast<Fl_Value_Input*>(v)->textfont(static_cast<Fl_Font>(f)); } int fl_value_input_get_text_size(VALUEINPUT v) { - return reinterpret_cast<Fl_Value_Input*>(v)->textsize(); + return static_cast<Fl_Value_Input*>(v)->textsize(); } void fl_value_input_set_text_size(VALUEINPUT v, int s) { - reinterpret_cast<Fl_Value_Input*>(v)->textsize(static_cast<Fl_Fontsize>(s)); + static_cast<Fl_Value_Input*>(v)->textsize(static_cast<Fl_Fontsize>(s)); } void fl_value_input_resize(VALUEINPUT v, int x, int y, int w, int h) { - reinterpret_cast<Fl_Value_Input*>(v)->resize(x, y, w, h); + static_cast<Fl_Value_Input*>(v)->resize(x, y, w, h); } void fl_value_input_draw(VALUEINPUT a) { - reinterpret_cast<My_Value_Input*>(a)->Fl_Value_Input::draw(); + static_cast<My_Value_Input*>(a)->Fl_Value_Input::draw(); } int fl_value_input_handle(VALUEINPUT a, int e) { - return reinterpret_cast<My_Value_Input*>(a)->Fl_Value_Input::handle(e); + return static_cast<My_Value_Input*>(a)->Fl_Value_Input::handle(e); } diff --git a/src/c_fl_value_output.cpp b/src/c_fl_value_output.cpp index b7cc1d6..3294b6b 100644 --- a/src/c_fl_value_output.cpp +++ b/src/c_fl_value_output.cpp @@ -50,56 +50,56 @@ VALUEOUTPUT new_fl_value_output(int x, int y, int w, int h, char* label) { } void free_fl_value_output(VALUEOUTPUT a) { - delete reinterpret_cast<My_Value_Output*>(a); + delete static_cast<My_Value_Output*>(a); } int fl_value_output_is_soft(VALUEOUTPUT a) { - return reinterpret_cast<Fl_Value_Output*>(a)->soft(); + return static_cast<Fl_Value_Output*>(a)->soft(); } void fl_value_output_set_soft(VALUEOUTPUT a, int t) { - reinterpret_cast<Fl_Value_Output*>(a)->soft(t); + static_cast<Fl_Value_Output*>(a)->soft(t); } unsigned int fl_value_output_get_text_color(VALUEOUTPUT v) { - return reinterpret_cast<Fl_Value_Output*>(v)->textcolor(); + return static_cast<Fl_Value_Output*>(v)->textcolor(); } void fl_value_output_set_text_color(VALUEOUTPUT v, unsigned int c) { - reinterpret_cast<Fl_Value_Output*>(v)->textcolor(static_cast<Fl_Color>(c)); + static_cast<Fl_Value_Output*>(v)->textcolor(static_cast<Fl_Color>(c)); } int fl_value_output_get_text_font(VALUEOUTPUT v) { - return reinterpret_cast<Fl_Value_Output*>(v)->textfont(); + return static_cast<Fl_Value_Output*>(v)->textfont(); } void fl_value_output_set_text_font(VALUEOUTPUT v, int f) { - reinterpret_cast<Fl_Value_Output*>(v)->textfont(static_cast<Fl_Font>(f)); + static_cast<Fl_Value_Output*>(v)->textfont(static_cast<Fl_Font>(f)); } int fl_value_output_get_text_size(VALUEOUTPUT v) { - return reinterpret_cast<Fl_Value_Output*>(v)->textsize(); + return static_cast<Fl_Value_Output*>(v)->textsize(); } void fl_value_output_set_text_size(VALUEOUTPUT v, int s) { - reinterpret_cast<Fl_Value_Output*>(v)->textsize(static_cast<Fl_Fontsize>(s)); + static_cast<Fl_Value_Output*>(v)->textsize(static_cast<Fl_Fontsize>(s)); } void fl_value_output_draw(VALUEOUTPUT a) { - reinterpret_cast<My_Value_Output*>(a)->Fl_Value_Output::draw(); + static_cast<My_Value_Output*>(a)->Fl_Value_Output::draw(); } int fl_value_output_handle(VALUEOUTPUT a, int e) { - return reinterpret_cast<My_Value_Output*>(a)->Fl_Value_Output::handle(e); + return static_cast<My_Value_Output*>(a)->Fl_Value_Output::handle(e); } diff --git a/src/c_fl_value_slider.cpp b/src/c_fl_value_slider.cpp index b79d7f5..7d6d59b 100644 --- a/src/c_fl_value_slider.cpp +++ b/src/c_fl_value_slider.cpp @@ -50,45 +50,45 @@ VALUESLIDER new_fl_value_slider(int x, int y, int w, int h, char* label) { } void free_fl_value_slider(VALUESLIDER s) { - delete reinterpret_cast<My_Value_Slider*>(s); + delete static_cast<My_Value_Slider*>(s); } unsigned int fl_value_slider_get_textcolor(VALUESLIDER s) { - return reinterpret_cast<Fl_Value_Slider*>(s)->textcolor(); + return static_cast<Fl_Value_Slider*>(s)->textcolor(); } void fl_value_slider_set_textcolor(VALUESLIDER s, unsigned int t) { - reinterpret_cast<Fl_Value_Slider*>(s)->textcolor(t); + static_cast<Fl_Value_Slider*>(s)->textcolor(t); } int fl_value_slider_get_textfont(VALUESLIDER s) { - return reinterpret_cast<Fl_Value_Slider*>(s)->textfont(); + return static_cast<Fl_Value_Slider*>(s)->textfont(); } void fl_value_slider_set_textfont(VALUESLIDER s, int t) { - reinterpret_cast<Fl_Value_Slider*>(s)->textfont(t); + static_cast<Fl_Value_Slider*>(s)->textfont(t); } int fl_value_slider_get_textsize(VALUESLIDER s) { - return reinterpret_cast<Fl_Value_Slider*>(s)->textsize(); + return static_cast<Fl_Value_Slider*>(s)->textsize(); } void fl_value_slider_set_textsize(VALUESLIDER s, int t) { - reinterpret_cast<Fl_Value_Slider*>(s)->textsize(t); + static_cast<Fl_Value_Slider*>(s)->textsize(t); } void fl_value_slider_draw(VALUESLIDER s) { - reinterpret_cast<My_Value_Slider*>(s)->Fl_Value_Slider::draw(); + static_cast<My_Value_Slider*>(s)->Fl_Value_Slider::draw(); } int fl_value_slider_handle(VALUESLIDER s, int e) { - return reinterpret_cast<My_Value_Slider*>(s)->Fl_Value_Slider::handle(e); + return static_cast<My_Value_Slider*>(s)->Fl_Value_Slider::handle(e); } diff --git a/src/c_fl_widget.cpp b/src/c_fl_widget.cpp index db7312d..6eda9e3 100644 --- a/src/c_fl_widget.cpp +++ b/src/c_fl_widget.cpp @@ -63,313 +63,313 @@ WIDGET new_fl_widget(int x, int y, int w, int h, char* label) { } void free_fl_widget(WIDGET w) { - delete reinterpret_cast<My_Widget*>(w); + delete static_cast<My_Widget*>(w); } void * fl_widget_get_user_data(WIDGET w) { - return reinterpret_cast<Fl_Widget*>(w)->user_data(); + return static_cast<Fl_Widget*>(w)->user_data(); } void fl_widget_set_user_data(WIDGET w, void * d) { - reinterpret_cast<Fl_Widget*>(w)->user_data(d); + static_cast<Fl_Widget*>(w)->user_data(d); } void fl_widget_activate(WIDGET w) { - reinterpret_cast<Fl_Widget*>(w)->activate(); + static_cast<Fl_Widget*>(w)->activate(); } void fl_widget_deactivate(WIDGET w) { - reinterpret_cast<Fl_Widget*>(w)->deactivate(); + static_cast<Fl_Widget*>(w)->deactivate(); } int fl_widget_active(WIDGET w) { - return reinterpret_cast<Fl_Widget*>(w)->active(); + return static_cast<Fl_Widget*>(w)->active(); } int fl_widget_active_r(WIDGET w) { - return reinterpret_cast<Fl_Widget*>(w)->active_r(); + return static_cast<Fl_Widget*>(w)->active_r(); } void fl_widget_set_active(WIDGET w) { - reinterpret_cast<Fl_Widget*>(w)->set_active(); + static_cast<Fl_Widget*>(w)->set_active(); } void fl_widget_clear_active(WIDGET w) { - reinterpret_cast<Fl_Widget*>(w)->clear_active(); + static_cast<Fl_Widget*>(w)->clear_active(); } unsigned int fl_widget_changed(WIDGET w) { - return reinterpret_cast<Fl_Widget*>(w)->changed(); + return static_cast<Fl_Widget*>(w)->changed(); } void fl_widget_set_changed(WIDGET w) { - reinterpret_cast<Fl_Widget*>(w)->set_changed(); + static_cast<Fl_Widget*>(w)->set_changed(); } void fl_widget_clear_changed(WIDGET w) { - reinterpret_cast<Fl_Widget*>(w)->clear_changed(); + static_cast<Fl_Widget*>(w)->clear_changed(); } int fl_widget_output(WIDGET w) { - return reinterpret_cast<Fl_Widget*>(w)->output(); + return static_cast<Fl_Widget*>(w)->output(); } void fl_widget_set_output(WIDGET w) { - reinterpret_cast<Fl_Widget*>(w)->set_output(); + static_cast<Fl_Widget*>(w)->set_output(); } void fl_widget_clear_output(WIDGET w) { - reinterpret_cast<Fl_Widget*>(w)->clear_output(); + static_cast<Fl_Widget*>(w)->clear_output(); } int fl_widget_visible(WIDGET w) { - return reinterpret_cast<Fl_Widget*>(w)->visible(); + return static_cast<Fl_Widget*>(w)->visible(); } int fl_widget_visible_r(WIDGET w) { - return reinterpret_cast<Fl_Widget*>(w)->visible_r(); + return static_cast<Fl_Widget*>(w)->visible_r(); } void fl_widget_set_visible(WIDGET w) { - reinterpret_cast<Fl_Widget*>(w)->set_visible(); + static_cast<Fl_Widget*>(w)->set_visible(); } void fl_widget_clear_visible(WIDGET w) { - reinterpret_cast<Fl_Widget*>(w)->clear_visible(); + static_cast<Fl_Widget*>(w)->clear_visible(); } int fl_widget_get_visible_focus(WIDGET w) { - return reinterpret_cast<Fl_Widget*>(w)->visible_focus(); + return static_cast<Fl_Widget*>(w)->visible_focus(); } void fl_widget_set_visible_focus(WIDGET w, int f) { - reinterpret_cast<Fl_Widget*>(w)->visible_focus(f); + static_cast<Fl_Widget*>(w)->visible_focus(f); } int fl_widget_take_focus(WIDGET w) { - return reinterpret_cast<Fl_Widget*>(w)->take_focus(); + return static_cast<Fl_Widget*>(w)->take_focus(); } int fl_widget_takesevents(WIDGET w) { - return reinterpret_cast<Fl_Widget*>(w)->takesevents(); + return static_cast<Fl_Widget*>(w)->takesevents(); } unsigned int fl_widget_get_color(WIDGET w) { - return reinterpret_cast<Fl_Widget*>(w)->color(); + return static_cast<Fl_Widget*>(w)->color(); } void fl_widget_set_color(WIDGET w, unsigned int b) { - reinterpret_cast<Fl_Widget*>(w)->color(b); + static_cast<Fl_Widget*>(w)->color(b); } unsigned int fl_widget_get_selection_color(WIDGET w) { - return reinterpret_cast<Fl_Widget*>(w)->selection_color(); + return static_cast<Fl_Widget*>(w)->selection_color(); } void fl_widget_set_selection_color(WIDGET w, unsigned int c) { - reinterpret_cast<Fl_Widget*>(w)->selection_color(c); + static_cast<Fl_Widget*>(w)->selection_color(c); } void * fl_widget_get_parent(WIDGET w) { - return reinterpret_cast<Fl_Widget*>(w)->parent(); + return static_cast<Fl_Widget*>(w)->parent(); } int fl_widget_contains(WIDGET w, WIDGET i) { - return reinterpret_cast<Fl_Widget*>(w)->contains(reinterpret_cast<Fl_Widget*>(i)); + return static_cast<Fl_Widget*>(w)->contains(static_cast<Fl_Widget*>(i)); } int fl_widget_inside(WIDGET w, WIDGET p) { - return reinterpret_cast<Fl_Widget*>(w)->inside(reinterpret_cast<Fl_Widget*>(p)); + return static_cast<Fl_Widget*>(w)->inside(static_cast<Fl_Widget*>(p)); } void * fl_widget_window(WIDGET w) { - return reinterpret_cast<Fl_Widget*>(w)->window(); + return static_cast<Fl_Widget*>(w)->window(); } void * fl_widget_top_window(WIDGET w) { - return reinterpret_cast<Fl_Widget*>(w)->top_window(); + return static_cast<Fl_Widget*>(w)->top_window(); } void * fl_widget_top_window_offset(WIDGET w, int &x, int &y) { - return reinterpret_cast<Fl_Widget*>(w)->top_window_offset(x,y); + return static_cast<Fl_Widget*>(w)->top_window_offset(x,y); } unsigned int fl_widget_get_align(WIDGET w) { - return reinterpret_cast<Fl_Widget*>(w)->align(); + return static_cast<Fl_Widget*>(w)->align(); } void fl_widget_set_align(WIDGET w, unsigned int a) { - reinterpret_cast<Fl_Widget*>(w)->align(a); + static_cast<Fl_Widget*>(w)->align(a); } int fl_widget_get_box(WIDGET w) { - return reinterpret_cast<Fl_Widget*>(w)->box(); + return static_cast<Fl_Widget*>(w)->box(); } void fl_widget_set_box(WIDGET w, int b) { - reinterpret_cast<Fl_Widget*>(w)->box(static_cast<Fl_Boxtype>(b)); + static_cast<Fl_Widget*>(w)->box(static_cast<Fl_Boxtype>(b)); } const char * fl_widget_tooltip(WIDGET w) { - return reinterpret_cast<Fl_Widget*>(w)->tooltip(); + return static_cast<Fl_Widget*>(w)->tooltip(); } void fl_widget_copy_tooltip(WIDGET w, const char * t) { - reinterpret_cast<Fl_Widget*>(w)->copy_tooltip(t); + static_cast<Fl_Widget*>(w)->copy_tooltip(t); } const char* fl_widget_get_label(WIDGET w) { - return reinterpret_cast<Fl_Widget*>(w)->label(); + return static_cast<Fl_Widget*>(w)->label(); } void fl_widget_set_label(WIDGET w, const char* t) { - reinterpret_cast<Fl_Widget*>(w)->copy_label(t); + static_cast<Fl_Widget*>(w)->copy_label(t); } unsigned int fl_widget_get_labelcolor(WIDGET w) { - return reinterpret_cast<Fl_Widget*>(w)->labelcolor(); + return static_cast<Fl_Widget*>(w)->labelcolor(); } void fl_widget_set_labelcolor(WIDGET w, unsigned int v) { - reinterpret_cast<Fl_Widget*>(w)->labelcolor(v); + static_cast<Fl_Widget*>(w)->labelcolor(v); } int fl_widget_get_labelfont(WIDGET w) { - return reinterpret_cast<Fl_Widget*>(w)->labelfont(); + return static_cast<Fl_Widget*>(w)->labelfont(); } void fl_widget_set_labelfont(WIDGET w, int f) { - reinterpret_cast<Fl_Widget*>(w)->labelfont(static_cast<Fl_Font>(f)); + static_cast<Fl_Widget*>(w)->labelfont(static_cast<Fl_Font>(f)); } int fl_widget_get_labelsize(WIDGET w) { - return reinterpret_cast<Fl_Widget*>(w)->labelsize(); + return static_cast<Fl_Widget*>(w)->labelsize(); } void fl_widget_set_labelsize(WIDGET w, int s) { - reinterpret_cast<Fl_Widget*>(w)->labelsize(static_cast<Fl_Fontsize>(s)); + static_cast<Fl_Widget*>(w)->labelsize(static_cast<Fl_Fontsize>(s)); } int fl_widget_get_labeltype(WIDGET w) { - return reinterpret_cast<Fl_Widget*>(w)->labeltype(); + return static_cast<Fl_Widget*>(w)->labeltype(); } void fl_widget_set_labeltype(WIDGET w, int l) { - reinterpret_cast<Fl_Widget*>(w)->labeltype(static_cast<Fl_Labeltype>(l)); + static_cast<Fl_Widget*>(w)->labeltype(static_cast<Fl_Labeltype>(l)); } void fl_widget_measure_label(WIDGET w, int &d, int &h) { - reinterpret_cast<Fl_Widget*>(w)->measure_label(d,h); + static_cast<Fl_Widget*>(w)->measure_label(d,h); } void fl_widget_set_callback(WIDGET w, void * cb) { - reinterpret_cast<Fl_Widget*>(w)->callback(reinterpret_cast<Fl_Callback_p>(cb)); + static_cast<Fl_Widget*>(w)->callback(reinterpret_cast<Fl_Callback_p>(cb)); } unsigned int fl_widget_get_when(WIDGET w) { - return reinterpret_cast<Fl_Widget*>(w)->when(); + return static_cast<Fl_Widget*>(w)->when(); } void fl_widget_set_when(WIDGET w, unsigned int c) { - reinterpret_cast<Fl_Widget*>(w)->when(c); + static_cast<Fl_Widget*>(w)->when(c); } int fl_widget_get_x(WIDGET w) { - return reinterpret_cast<Fl_Widget*>(w)->x(); + return static_cast<Fl_Widget*>(w)->x(); } int fl_widget_get_y(WIDGET w) { - return reinterpret_cast<Fl_Widget*>(w)->y(); + return static_cast<Fl_Widget*>(w)->y(); } int fl_widget_get_w(WIDGET w) { - return reinterpret_cast<Fl_Widget*>(w)->w(); + return static_cast<Fl_Widget*>(w)->w(); } int fl_widget_get_h(WIDGET w) { - return reinterpret_cast<Fl_Widget*>(w)->h(); + return static_cast<Fl_Widget*>(w)->h(); } void fl_widget_size(WIDGET w, int d, int h) { - reinterpret_cast<Fl_Widget*>(w)->size(d, h); + static_cast<Fl_Widget*>(w)->size(d, h); } void fl_widget_position(WIDGET w, int x, int y) { - reinterpret_cast<Fl_Widget*>(w)->position(x, y); + static_cast<Fl_Widget*>(w)->position(x, y); } void fl_widget_set_image(WIDGET w, void * img) { - reinterpret_cast<Fl_Widget*>(w)->image(reinterpret_cast<Fl_Image*>(img)); + static_cast<Fl_Widget*>(w)->image(static_cast<Fl_Image*>(img)); } void fl_widget_set_deimage(WIDGET w, void * img) { - reinterpret_cast<Fl_Widget*>(w)->deimage(reinterpret_cast<Fl_Image*>(img)); + static_cast<Fl_Widget*>(w)->deimage(static_cast<Fl_Image*>(img)); } unsigned char fl_widget_get_type(WIDGET w) { - return reinterpret_cast<Fl_Widget*>(w)->type(); + return static_cast<Fl_Widget*>(w)->type(); } void fl_widget_set_type(WIDGET w, unsigned char t) { - reinterpret_cast<Fl_Widget*>(w)->type(t); + static_cast<Fl_Widget*>(w)->type(t); } int fl_widget_damage(WIDGET w) { - return reinterpret_cast<Fl_Widget*>(w)->damage(); + return static_cast<Fl_Widget*>(w)->damage(); } void fl_widget_set_damage(WIDGET w, int t) { if (t != 0) { - reinterpret_cast<Fl_Widget*>(w)->damage(0xff); + static_cast<Fl_Widget*>(w)->damage(0xff); } else { - reinterpret_cast<Fl_Widget*>(w)->damage(0x00); + static_cast<Fl_Widget*>(w)->damage(0x00); } } void fl_widget_set_damage2(WIDGET w, int t, int x, int y, int d, int h) { if (t != 0) { - reinterpret_cast<Fl_Widget*>(w)->damage(0xff,x,y,d,h); + static_cast<Fl_Widget*>(w)->damage(0xff,x,y,d,h); } else { - reinterpret_cast<Fl_Widget*>(w)->damage(0x00,x,y,d,h); + static_cast<Fl_Widget*>(w)->damage(0x00,x,y,d,h); } } @@ -382,19 +382,19 @@ void fl_widget_draw(WIDGET w) { } void fl_widget_draw_label(WIDGET w, int x, int y, int d, int h, unsigned int a) { - reinterpret_cast<Fl_Widget*>(w)->draw_label(x,y,d,h,a); + static_cast<Fl_Widget*>(w)->draw_label(x,y,d,h,a); } void fl_widget_redraw(WIDGET w) { - reinterpret_cast<Fl_Widget*>(w)->redraw(); + static_cast<Fl_Widget*>(w)->redraw(); } void fl_widget_redraw_label(WIDGET w) { - reinterpret_cast<Fl_Widget*>(w)->redraw_label(); + static_cast<Fl_Widget*>(w)->redraw_label(); } int fl_widget_handle(WIDGET w, int e) { - return reinterpret_cast<My_Widget*>(w)->Fl_Widget::handle(e); + return static_cast<My_Widget*>(w)->Fl_Widget::handle(e); } diff --git a/src/c_fl_window.cpp b/src/c_fl_window.cpp index 631c98b..806e66f 100644 --- a/src/c_fl_window.cpp +++ b/src/c_fl_window.cpp @@ -56,7 +56,7 @@ WINDOW new_fl_window2(int w, int h, char* label) { } void free_fl_window(WINDOW n) { - delete reinterpret_cast<My_Window*>(n); + delete static_cast<My_Window*>(n); } @@ -64,186 +64,186 @@ void free_fl_window(WINDOW n) { void fl_window_show(WINDOW n) { // virtual, so disable dispatch - reinterpret_cast<Fl_Window*>(n)->Fl_Window::show(); + static_cast<Fl_Window*>(n)->Fl_Window::show(); } void fl_window_show2(WINDOW n, int c, void * v) { - reinterpret_cast<Fl_Window*>(n)->show(c, static_cast<char**>(v)); + static_cast<Fl_Window*>(n)->show(c, static_cast<char**>(v)); } void fl_window_hide(WINDOW n) { // virtual, so disable dispatch - reinterpret_cast<Fl_Window*>(n)->Fl_Window::hide(); + static_cast<Fl_Window*>(n)->Fl_Window::hide(); } int fl_window_shown(WINDOW n) { - return reinterpret_cast<Fl_Window*>(n)->shown(); + return static_cast<Fl_Window*>(n)->shown(); } void fl_window_wait_for_expose(WINDOW n) { - reinterpret_cast<Fl_Window*>(n)->wait_for_expose(); + static_cast<Fl_Window*>(n)->wait_for_expose(); } void fl_window_iconize(WINDOW n) { - reinterpret_cast<Fl_Window*>(n)->iconize(); + static_cast<Fl_Window*>(n)->iconize(); } void fl_window_make_current(WINDOW n) { - reinterpret_cast<Fl_Window*>(n)->make_current(); + static_cast<Fl_Window*>(n)->make_current(); } void fl_window_free_position(WINDOW n) { - reinterpret_cast<Fl_Window*>(n)->free_position(); + static_cast<Fl_Window*>(n)->free_position(); } unsigned int fl_window_fullscreen_active(WINDOW n) { - return reinterpret_cast<Fl_Window*>(n)->fullscreen_active(); + return static_cast<Fl_Window*>(n)->fullscreen_active(); } void fl_window_fullscreen(WINDOW n) { - reinterpret_cast<Fl_Window*>(n)->fullscreen(); + static_cast<Fl_Window*>(n)->fullscreen(); } void fl_window_fullscreen_off(WINDOW n) { - reinterpret_cast<Fl_Window*>(n)->fullscreen_off(); + static_cast<Fl_Window*>(n)->fullscreen_off(); } void fl_window_fullscreen_off2(WINDOW n, int x, int y, int w, int h) { - reinterpret_cast<Fl_Window*>(n)->fullscreen_off(x,y,w,h); + static_cast<Fl_Window*>(n)->fullscreen_off(x,y,w,h); } void fl_window_fullscreen_screens(WINDOW n, int t, int b, int l, int r) { - reinterpret_cast<Fl_Window*>(n)->fullscreen_screens(t,b,l,r); + static_cast<Fl_Window*>(n)->fullscreen_screens(t,b,l,r); } void fl_window_set_icon(WINDOW n, void * img) { - reinterpret_cast<Fl_Window*>(n)->icon(reinterpret_cast<Fl_RGB_Image*>(img)); + static_cast<Fl_Window*>(n)->icon(static_cast<Fl_RGB_Image*>(img)); } void fl_window_default_icon(void * img) { - Fl_Window::default_icon(reinterpret_cast<Fl_RGB_Image*>(img)); + Fl_Window::default_icon(static_cast<Fl_RGB_Image*>(img)); } const char * fl_window_get_iconlabel(WINDOW n) { - return reinterpret_cast<Fl_Window*>(n)->iconlabel(); + return static_cast<Fl_Window*>(n)->iconlabel(); } void fl_window_set_iconlabel(WINDOW n, const char * s) { - reinterpret_cast<Fl_Window*>(n)->iconlabel(s); + static_cast<Fl_Window*>(n)->iconlabel(s); } void fl_window_set_cursor(WINDOW n, int c) { - reinterpret_cast<Fl_Window*>(n)->cursor(static_cast<Fl_Cursor>(c)); + static_cast<Fl_Window*>(n)->cursor(static_cast<Fl_Cursor>(c)); } void fl_window_set_cursor2(WINDOW n, void * img, int x, int y) { - reinterpret_cast<Fl_Window*>(n)->cursor(reinterpret_cast<Fl_RGB_Image*>(img),x,y); + static_cast<Fl_Window*>(n)->cursor(static_cast<Fl_RGB_Image*>(img),x,y); } void fl_window_set_default_cursor(WINDOW n, int c) { - reinterpret_cast<Fl_Window*>(n)->default_cursor(static_cast<Fl_Cursor>(c)); + static_cast<Fl_Window*>(n)->default_cursor(static_cast<Fl_Cursor>(c)); } unsigned int fl_window_get_border(WINDOW n) { - return reinterpret_cast<Fl_Window*>(n)->border(); + return static_cast<Fl_Window*>(n)->border(); } void fl_window_set_border(WINDOW n, int b) { - reinterpret_cast<Fl_Window*>(n)->border(b); + static_cast<Fl_Window*>(n)->border(b); } unsigned int fl_window_get_override(WINDOW n) { - return reinterpret_cast<Fl_Window*>(n)->override(); + return static_cast<Fl_Window*>(n)->override(); } void fl_window_set_override(WINDOW n) { - reinterpret_cast<Fl_Window*>(n)->set_override(); + static_cast<Fl_Window*>(n)->set_override(); } unsigned int fl_window_modal(WINDOW n) { - return reinterpret_cast<Fl_Window*>(n)->modal(); + return static_cast<Fl_Window*>(n)->modal(); } unsigned int fl_window_non_modal(WINDOW n) { - return reinterpret_cast<Fl_Window*>(n)->non_modal(); + return static_cast<Fl_Window*>(n)->non_modal(); } void fl_window_clear_modal_states(WINDOW n) { - reinterpret_cast<Fl_Window*>(n)->clear_modal_states(); + static_cast<Fl_Window*>(n)->clear_modal_states(); } void fl_window_set_modal(WINDOW n) { - reinterpret_cast<Fl_Window*>(n)->set_modal(); + static_cast<Fl_Window*>(n)->set_modal(); } void fl_window_set_non_modal(WINDOW n) { - reinterpret_cast<Fl_Window*>(n)->set_non_modal(); + static_cast<Fl_Window*>(n)->set_non_modal(); } const char * fl_window_get_label(WINDOW n) { - return reinterpret_cast<Fl_Window*>(n)->label(); + return static_cast<Fl_Window*>(n)->label(); } void fl_window_set_label(WINDOW n, char* text) { - reinterpret_cast<Fl_Window*>(n)->copy_label(text); + static_cast<Fl_Window*>(n)->copy_label(text); } void fl_window_hotspot(WINDOW n, int x, int y, int s) { - reinterpret_cast<Fl_Window*>(n)->hotspot(x,y,s); + static_cast<Fl_Window*>(n)->hotspot(x,y,s); } void fl_window_hotspot2(WINDOW n, void * i, int s) { - reinterpret_cast<Fl_Window*>(n)->hotspot(reinterpret_cast<Fl_Widget*>(i),s); + static_cast<Fl_Window*>(n)->hotspot(static_cast<Fl_Widget*>(i),s); } void fl_window_size_range(WINDOW n, int lw, int lh, int hw, int hh, int dw, int dh, int a) { - reinterpret_cast<Fl_Window*>(n)->size_range(lw, lh, hw, hh, dw, dh, a); + static_cast<Fl_Window*>(n)->size_range(lw, lh, hw, hh, dw, dh, a); } void fl_window_shape(WINDOW n, void * p) { - reinterpret_cast<Fl_Window*>(n)->shape(reinterpret_cast<Fl_Image*>(p)); + static_cast<Fl_Window*>(n)->shape(static_cast<Fl_Image*>(p)); } int fl_window_get_x_root(WINDOW n) { - return reinterpret_cast<Fl_Window*>(n)->x_root(); + return static_cast<Fl_Window*>(n)->x_root(); } int fl_window_get_y_root(WINDOW n) { - return reinterpret_cast<Fl_Window*>(n)->y_root(); + return static_cast<Fl_Window*>(n)->y_root(); } int fl_window_get_decorated_w(WINDOW n) { - return reinterpret_cast<Fl_Window*>(n)->decorated_w(); + return static_cast<Fl_Window*>(n)->decorated_w(); } int fl_window_get_decorated_h(WINDOW n) { - return reinterpret_cast<Fl_Window*>(n)->decorated_h(); + return static_cast<Fl_Window*>(n)->decorated_h(); } void fl_window_draw(WINDOW n) { - reinterpret_cast<My_Window*>(n)->Fl_Window::draw(); + static_cast<My_Window*>(n)->Fl_Window::draw(); } int fl_window_handle(WINDOW n, int e) { - return reinterpret_cast<My_Window*>(n)->Fl_Window::handle(e); + return static_cast<My_Window*>(n)->Fl_Window::handle(e); } diff --git a/src/c_fl_wizard.cpp b/src/c_fl_wizard.cpp index d826ca6..e29995a 100644 --- a/src/c_fl_wizard.cpp +++ b/src/c_fl_wizard.cpp @@ -67,40 +67,40 @@ WIZARD new_fl_wizard(int x, int y, int w, int h, char* label) { } void free_fl_wizard(WIZARD w) { - delete reinterpret_cast<My_Wizard*>(w); + delete static_cast<My_Wizard*>(w); } void fl_wizard_next(WIZARD w) { - reinterpret_cast<Fl_Wizard*>(w)->next(); + static_cast<Fl_Wizard*>(w)->next(); } void fl_wizard_prev(WIZARD w) { - reinterpret_cast<Fl_Wizard*>(w)->prev(); + static_cast<Fl_Wizard*>(w)->prev(); } void * fl_wizard_get_visible(WIZARD w) { - return reinterpret_cast<Fl_Wizard*>(w)->value(); + return static_cast<Fl_Wizard*>(w)->value(); } void fl_wizard_set_visible(WIZARD w, void * i) { - reinterpret_cast<Fl_Wizard*>(w)->value(reinterpret_cast<Fl_Widget*>(i)); + static_cast<Fl_Wizard*>(w)->value(static_cast<Fl_Widget*>(i)); } void fl_wizard_draw(WIZARD w) { - reinterpret_cast<My_Wizard*>(w)->real_draw(); + static_cast<My_Wizard*>(w)->real_draw(); } int fl_wizard_handle(WIZARD w, int e) { - return reinterpret_cast<My_Wizard*>(w)->Fl_Wizard::handle(e); + return static_cast<My_Wizard*>(w)->Fl_Wizard::handle(e); } diff --git a/src/c_fl_xbm_image.cpp b/src/c_fl_xbm_image.cpp index 7bb6ccf..2ecd890 100644 --- a/src/c_fl_xbm_image.cpp +++ b/src/c_fl_xbm_image.cpp @@ -10,12 +10,13 @@ -XBM_IMAGE new_fl_xbm_image(const char * f) { +XBMIMAGE new_fl_xbm_image(const char * f) { Fl_XBM_Image *b = new Fl_XBM_Image(f); return b; } -void free_fl_xbm_image(XBM_IMAGE b) { - delete reinterpret_cast<Fl_XBM_Image*>(b); +void free_fl_xbm_image(XBMIMAGE b) { + delete static_cast<Fl_XBM_Image*>(b); } + diff --git a/src/c_fl_xbm_image.h b/src/c_fl_xbm_image.h index c7ed8ca..668d3f8 100644 --- a/src/c_fl_xbm_image.h +++ b/src/c_fl_xbm_image.h @@ -8,16 +8,13 @@ #define FL_XBM_IMAGE_GUARD +typedef void* XBMIMAGE; -typedef void* XBM_IMAGE; - - - - -extern "C" XBM_IMAGE new_fl_xbm_image(const char * f); -extern "C" void free_fl_xbm_image(XBM_IMAGE b); +extern "C" XBMIMAGE new_fl_xbm_image(const char * f); +extern "C" void free_fl_xbm_image(XBMIMAGE b); #endif + diff --git a/src/c_fl_xpm_image.cpp b/src/c_fl_xpm_image.cpp index 7902020..fcf60c2 100644 --- a/src/c_fl_xpm_image.cpp +++ b/src/c_fl_xpm_image.cpp @@ -10,12 +10,13 @@ -XPM_IMAGE new_fl_xpm_image(const char * f) { +XPMIMAGE new_fl_xpm_image(const char * f) { Fl_XPM_Image *j = new Fl_XPM_Image(f); return j; } -void free_fl_xpm_image(XPM_IMAGE j) { - delete reinterpret_cast<Fl_XPM_Image*>(j); +void free_fl_xpm_image(XPMIMAGE j) { + delete static_cast<Fl_XPM_Image*>(j); } + diff --git a/src/c_fl_xpm_image.h b/src/c_fl_xpm_image.h index d1ac6eb..a925c33 100644 --- a/src/c_fl_xpm_image.h +++ b/src/c_fl_xpm_image.h @@ -8,16 +8,13 @@ #define FL_XPM_IMAGE_GUARD +typedef void* XPMIMAGE; -typedef void* XPM_IMAGE; - - - - -extern "C" XPM_IMAGE new_fl_xpm_image(const char * f); -extern "C" void free_fl_xpm_image(XPM_IMAGE j); +extern "C" XPMIMAGE new_fl_xpm_image(const char * f); +extern "C" void free_fl_xpm_image(XPMIMAGE j); #endif + |