Merge pull request #422 from angros47/master

FLTK

inc/FLTK/Fl_Button.bi

@@ -2,10 +2,10 @@
 
 extern "c++"
 
-#define FL_NORMAL_BUTTON	0
-#define FL_TOGGLE_BUTTON	1
-#define FL_RADIO_BUTTON		(FL_RESERVED_TYPE+2)
-#define FL_HIDDEN_BUTTON	3
+#define FL_NORMAL_BUTTON_	0
+#define FL_TOGGLE_BUTTON_	1
+#define FL_RADIO_BUTTON_	(FL_RESERVED_TYPE+2)
+#define FL_HIDDEN_BUTTON_	3
 
 #ifndef fl_old_shortcut
 declare function fl_old_shortcut(as const zstring ptr) as unsigned long

inc/FLTK/Fl_Double_Window.bi

@@ -9,12 +9,12 @@ protected:
 	declare constructor (byref b as const Fl_Double_Window)
 	declare operator let (byref b as const Fl_Double_Window)
 public:
-	declare sub show()
+	declare virtual sub show()
 	declare sub show(a as long, b as zstring ptr ptr)
-	declare sub flush()
-	declare sub resize(as long, as long, as long, as long)
-	declare sub hide()
-	declare destructor
+	declare virtual sub flush()
+	declare virtual sub resize(as long, as long, as long, as long)
+	declare virtual sub hide()
+	declare virtual destructor
 
 
 	declare constructor(W as long, H as long, l as const zstring ptr=0)

inc/FLTK/Fl_Gl_Window.bi

@@ -73,7 +73,7 @@ public:
 	declare function pixel_w() as long
 	declare function pixel_h() as long
 
-	declare destructor()
+	declare virtual destructor()
 
 
 	declare constructor(W as long, H as long, l as const zstring ptr=0)
@@ -137,6 +137,10 @@ private function Fl_Gl_Window.as_gl_window() as Fl_Gl_Window_ ptr
 	return @this
 end function
 
+private function Fl_Gl_Window.pixels_per_unit() as single
+	return 1
+end function
+
 private function Fl_Gl_Window.pixel_w() as long
 	return int(pixels_per_unit() * w() + 0.5)
 end function

inc/FLTK/Fl_Group.bi

@@ -46,7 +46,7 @@ public:
 	declare const function find(byref f as const Fl_Widget) as long
 	declare const function array() as Fl_Widget ptr const ptr
 
-	declare sub resize(x as long, y as long, x1 as long, y1 as long)
+	declare virtual sub resize(x as long, y as long, x1 as long, y1 as long)
 
 	declare sub add(byref w as Fl_Widget)
 	declare sub add(w as Fl_Widget ptr)

inc/FLTK/Fl_Overlay_Window.bi

@@ -19,7 +19,7 @@ public:
 
 	declare function can_do_overlay() as long
 	declare sub redraw_overlay()
-private:
+protected:
 	declare constructor(W as long, H as long, l as const zstring ptr=0)
 	declare constructor(X as long, Y as long, W as long, H as long, l as const zstring ptr=0)
 public:

inc/FLTK/Fl_Window.bi

@@ -91,8 +91,8 @@ protected:
 	declare sub free_icons()
 public:
 
-	declare constructor(w as long, h as long, title as const zstring ptr)
-	declare constructor(x as long, y as long, w as long, h as long, title as const zstring ptr)
+	declare constructor(w as long, h as long, title as const zstring ptr=0)
+	declare constructor(x as long, y as long, w as long, h as long, title as const zstring ptr=0)
 
 	declare virtual destructor
 

inc/FLTK/filename.bi

@@ -23,3 +23,16 @@ declare function fl_numericsort(as dirent ptr ptr, as dirent ptr ptr) as long
 type Fl_File_Sort_F as function(as dirent ptr ptr, as dirent ptr ptr) as long
 
 end extern
+
+extern "c++"
+
+declare function fl_filename_list(d as const zstring ptr, l as dirent ptr ptr ptr, s as Fl_File_Sort_F = @fl_numericsort) as long
+declare sub fl_filename_free_list(l as dirent ptr ptr ptr, n as long)
+
+declare function fl_open_uri(uri as const zstring ptr, msg as zstring ptr = 0, msglen as long = 0) as long
+
+declare sub fl_decode_uri(uri as zstring ptr)
+
+declare function _fl_filename_isdir_quick(name as const zstring ptr) as long
+
+end extern

inc/FLTK/forms.bi

@@ -573,7 +573,7 @@ end function
 #define FL_INOUT_BUTTON		5
 #define FL_RETURN_BUTTON_	6
 #define FL_HIDDEN_RET_BUTTON	7
-#define FL_PUSH_BUTTON		FL_TOGGLE_BUTTON
+#define FL_PUSH_BUTTON		FL_TOGGLE_BUTTON_
 #define FL_MENU_BUTTON_		9
 
 declare function fl_add_button(t as unsigned byte, x as long, y as long, w as long, h as long,l as const zstring ptr) as Fl_Button ptr