1 files changed, 113 insertions, 14 deletions

diff --git a/src/c_fl_window.cpp b/src/c_fl_window.cpp
index 83f19f1..d6bb262 100644
--- a/src/c_fl_window.cpp
+++ b/src/c_fl_window.cpp
@@ -64,8 +64,8 @@ WINDOW new_fl_window(int x, int y, int w, int h, char* label) {
     return n;
 }
 
-WINDOW new_fl_window2(int w, int h) {
-    My_Window *n = new My_Window(w, h);
+WINDOW new_fl_window2(int w, int h, char* label) {
+    My_Window *n = new My_Window(w, h, label);
     return n;
 }
 
@@ -77,17 +77,89 @@ void free_fl_window(WINDOW n) {
 
 
 void fl_window_show(WINDOW n) {
-    reinterpret_cast<Fl_Window*>(n)->show();
+    //  virtual, so disable dispatch
+    reinterpret_cast<Fl_Window*>(n)->Fl_Window::show();
 }
 
 void fl_window_hide(WINDOW n) {
-    reinterpret_cast<Fl_Window*>(n)->hide();
+    //  virtual, so disable dispatch
+    reinterpret_cast<Fl_Window*>(n)->Fl_Window::hide();
+}
+
+int fl_window_shown(WINDOW n) {
+    return reinterpret_cast<Fl_Window*>(n)->shown();
+}
+
+void fl_window_wait_for_expose(WINDOW n) {
+    reinterpret_cast<Fl_Window*>(n)->wait_for_expose();
+}
+
+void fl_window_iconize(WINDOW n) {
+    reinterpret_cast<Fl_Window*>(n)->iconize();
 }
 
 void fl_window_make_current(WINDOW n) {
     reinterpret_cast<Fl_Window*>(n)->make_current();
 }
 
+void fl_window_free_position(WINDOW n) {
+    reinterpret_cast<Fl_Window*>(n)->free_position();
+}
+
+
+
+
+unsigned int fl_window_fullscreen_active(WINDOW n) {
+    return reinterpret_cast<Fl_Window*>(n)->fullscreen_active();
+}
+
+void fl_window_fullscreen(WINDOW n) {
+    reinterpret_cast<Fl_Window*>(n)->fullscreen();
+}
+
+void fl_window_fullscreen_off(WINDOW n) {
+    reinterpret_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);
+}
+
+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);
+}
+
+
+
+
+void fl_window_set_icon(WINDOW n, void * img) {
+    reinterpret_cast<Fl_Window*>(n)->icon(reinterpret_cast<Fl_RGB_Image*>(img));
+}
+
+void fl_window_default_icon(void * img) {
+    Fl_Window::default_icon(reinterpret_cast<Fl_RGB_Image*>(img));
+}
+
+const char * fl_window_get_iconlabel(WINDOW n) {
+    return reinterpret_cast<Fl_Window*>(n)->iconlabel();
+}
+
+void fl_window_set_iconlabel(WINDOW n, const char * s) {
+    reinterpret_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));
+}
+
+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);
+}
+
+void fl_window_set_default_cursor(WINDOW n, int c) {
+    reinterpret_cast<Fl_Window*>(n)->default_cursor(static_cast<Fl_Cursor>(c));
+}
+
 
 
 
@@ -99,16 +171,24 @@ void fl_window_set_border(WINDOW n, int b) {
     reinterpret_cast<Fl_Window*>(n)->border(b);
 }
 
-void fl_window_set_label(WINDOW n, char* text) {
-    reinterpret_cast<Fl_Window*>(n)->copy_label(text);
+unsigned int fl_window_get_override(WINDOW n) {
+    return reinterpret_cast<Fl_Window*>(n)->override();
 }
 
-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);
+void fl_window_set_override(WINDOW n) {
+    reinterpret_cast<Fl_Window*>(n)->set_override();
 }
 
-void fl_window_set_icon(WINDOW n, void * img) {
-    reinterpret_cast<Fl_Window*>(n)->icon(reinterpret_cast<Fl_RGB_Image*>(img));
+unsigned int fl_window_modal(WINDOW n) {
+    return reinterpret_cast<Fl_Window*>(n)->modal();
+}
+
+unsigned int fl_window_non_modal(WINDOW n) {
+    return reinterpret_cast<Fl_Window*>(n)->non_modal();
+}
+
+void fl_window_clear_modal_states(WINDOW n) {
+    reinterpret_cast<Fl_Window*>(n)->clear_modal_states();
 }
 
 void fl_window_set_modal(WINDOW n) {
@@ -119,12 +199,31 @@ void fl_window_set_non_modal(WINDOW n) {
     reinterpret_cast<Fl_Window*>(n)->set_non_modal();
 }
 
-void fl_window_set_cursor(WINDOW n, int c) {
-    reinterpret_cast<Fl_Window*>(n)->cursor(static_cast<Fl_Cursor>(c));
+
+
+
+const char * fl_window_get_label(WINDOW n) {
+    return reinterpret_cast<Fl_Window*>(n)->label();
 }
 
-void fl_window_set_default_cursor(WINDOW n, int c) {
-    reinterpret_cast<Fl_Window*>(n)->default_cursor(static_cast<Fl_Cursor>(c));
+void fl_window_set_label(WINDOW n, char* text) {
+    reinterpret_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);
+}
+
+void fl_window_hotspot2(WINDOW n, void * i, int s) {
+    reinterpret_cast<Fl_Window*>(n)->hotspot(reinterpret_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);
+}
+
+void fl_window_shape(WINDOW n, void * p) {
+    reinterpret_cast<Fl_Window*>(n)->shape(reinterpret_cast<Fl_Image*>(p));
 }