From fb37523537cdb69a31dede401a604981ce8b7b9d Mon Sep 17 00:00:00 2001 From: Jed Barber Date: Sat, 17 Jun 2017 11:28:39 +1000 Subject: Updated coding style, added progress log --- src/c_fl_menu_window.cpp | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'src/c_fl_menu_window.cpp') diff --git a/src/c_fl_menu_window.cpp b/src/c_fl_menu_window.cpp index 7e186d7..3505483 100644 --- a/src/c_fl_menu_window.cpp +++ b/src/c_fl_menu_window.cpp @@ -23,42 +23,34 @@ class My_Menu_Window : public Fl_Menu_Window { h_hook_p handle_hook; }; - void My_Menu_Window::draw() { (*draw_hook)(this->user_data()); } - void My_Menu_Window::real_draw() { Fl_Menu_Window::draw(); } - int My_Menu_Window::handle(int e) { return (*handle_hook)(this->user_data(), e); } - int My_Menu_Window::real_handle(int e) { return Fl_Menu_Window::handle(e); } - void menu_window_set_draw_hook(MENUWINDOW n, void * d) { reinterpret_cast(n)->draw_hook = reinterpret_cast(d); } - void fl_menu_window_draw(MENUWINDOW n) { reinterpret_cast(n)->real_draw(); } - void menu_window_set_handle_hook(MENUWINDOW n, void * h) { reinterpret_cast(n)->handle_hook = reinterpret_cast(h); } - int fl_menu_window_handle(MENUWINDOW n, int e) { return reinterpret_cast(n)->real_handle(e); } @@ -71,13 +63,11 @@ MENUWINDOW new_fl_menu_window(int x, int y, int w, int h, char* label) { return m; } - MENUWINDOW new_fl_menu_window2(int w, int h) { My_Menu_Window *m = new My_Menu_Window(w, h); return m; } - void free_fl_menu_window(MENUWINDOW m) { delete reinterpret_cast(m); } @@ -89,27 +79,25 @@ void fl_menu_window_show(MENUWINDOW m) { reinterpret_cast(m)->show(); } - void fl_menu_window_hide(MENUWINDOW m) { reinterpret_cast(m)->hide(); } - void fl_menu_window_flush(MENUWINDOW m) { reinterpret_cast(m)->flush(); } + + void fl_menu_window_set_overlay(MENUWINDOW m) { reinterpret_cast(m)->set_overlay(); } - void fl_menu_window_clear_overlay(MENUWINDOW m) { reinterpret_cast(m)->clear_overlay(); } - unsigned int fl_menu_window_overlay(MENUWINDOW m) { return reinterpret_cast(m)->overlay(); } -- cgit