Add NewWindowWithPosition function

Fixes #89
pwiecz · Jun 29, 2023 · 6ec5abf · 6ec5abf
1 parent 877d7fe
commit 6ec5abf
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 8 deletions.
diff --git a/window.cxx b/window.cxx
@@ -8,12 +8,18 @@
 
 class GWindow : public EventHandler<Fl_Double_Window> {
 public:
-  GWindow(int w, int h)
-    : EventHandler<Fl_Double_Window>(w, h) {}
+  GWindow(int w, int h, const char* title)
+    : EventHandler<Fl_Double_Window>(w, h, title) {}
+  GWindow(int x, int y, int w, int h, const char* title)
+    : EventHandler<Fl_Double_Window>(x, y, w, h, title) {}
 };
 
-GWindow *go_fltk_new_Window(int w, int h) {
-  return new GWindow(w, h);
+GWindow *go_fltk_new_Window(int w, int h, const char* title) {
+  return new GWindow(w, h, title);
+}
+
+GWindow *go_fltk_new_Window_with_position(int x, int y, int w, int h, const char* title) {
+  return new GWindow(x, y, w, h, title);
 }
 
 int go_fltk_Window_shown(Fl_Window *w) {

diff --git a/window.go b/window.go
@@ -12,9 +12,14 @@ type Window struct {
 	icons []*RgbImage
 }
 
-func NewWindow(w, h int) *Window {
+func NewWindow(w, h int, title ...string) *Window {
 	win := &Window{}
-	initWidget(win, unsafe.Pointer(C.go_fltk_new_Window(C.int(w), C.int(h))))
+	initWidget(win, unsafe.Pointer(C.go_fltk_new_Window(C.int(w), C.int(h), cStringOpt(title))))
+	return win
+}
+func NewWindowWithPosition(x, y, w, h int, title ...string) *Window {
+	win := &Window{}
+	initWidget(win, unsafe.Pointer(C.go_fltk_new_Window_with_position(C.int(x), C.int(y), C.int(w), C.int(h), cStringOpt(title))))
 	return win
 }
 func (w *Window) IsShown() bool {
@@ -70,7 +75,7 @@ func (w *Window) SetSizeRange(minW, minH, maxW, maxH, deltaX, deltaY int, aspect
 	if aspectRatio {
 		ratio = 1
 	}
-	C.go_fltk_Window_size_range((*C.Fl_Window)(w.ptr()), C.int(minW), C.int(minH), C.int(maxW), C.int(maxH), C.int(deltaX), C.int(deltaY), C.int(ratio));
+	C.go_fltk_Window_size_range((*C.Fl_Window)(w.ptr()), C.int(minW), C.int(minH), C.int(maxW), C.int(maxH), C.int(deltaX), C.int(deltaY), C.int(ratio))
 }
 
 type Cursor int

diff --git a/window.h b/window.h
@@ -8,7 +8,8 @@ extern "C" {
   typedef struct GWindow GWindow;
   typedef struct Fl_RGB_Image Fl_RGB_Image;
 
-  extern GWindow *go_fltk_new_Window(int w, int h);
+  extern GWindow *go_fltk_new_Window(int w, int h, const char* title);
+  extern GWindow *go_fltk_new_Window_with_position(int x, int y, int w, int h, const char* title);
 
   extern int go_fltk_Window_shown(Fl_Window* w);
   extern void go_fltk_Window_show(Fl_Window *w);