rebase by 5313f8a commit

.gitignore

@@ -1,5 +1,9 @@
 .DS_Store
 /fltk_build
+/bin/
+/FLTK.framework/
+/share/
+
 *~
 *.swp
 .idea/

README.md

@@ -1,7 +1,7 @@
 # go-fltk
 
 ---
-[![GoDoc](https://img.shields.io/static/v1?label=godoc&message=reference&color=blue)](https://pkg.go.dev/github.com/pwiecz/go-fltk)
+[![GoDoc](https://img.shields.io/static/v1?label=godoc&message=reference&color=blue)](https://pkg.go.dev/github.com/george012/fltk_go)
 
 * [Document](./README.md)
 * [中文文档](./README_zh-cn.md)
@@ -15,7 +15,7 @@ go-fltk comes with prebuilt FLTK libraries for some architectures (linux/amd64,
 or build them for other architectures.
 To build FLTK libraries for your platform it should be enough to call `go generate` from the root of the go-fltk source tree.
 
-If the build procedure doesn't work for you, you can modify `fltk-build.sh` or `fltk-build.bat` yourself or ask a question on `https://github.com/pwiecz/go-fltk/discussions`.
+If the build procedure doesn't work for you, you can modify `fltk-build.sh` or `fltk-build.bat` yourself or ask a question on `https://github.com/george012/fltk_go/discussions`.
 
 For running programs built using go-fltk you will need some system libs which are normally available on operating systems with a graphical user interfaces:
 - Windows: No external dependencies, besides a (for mingw64)
@@ -34,7 +34,7 @@ For running programs built using go-fltk you will need some system libs which ar
 ```go
 package main
 
-import "github.com/pwiecz/go-fltk"
+import "github.com/george012/fltk_go"
 
 func main() {
     win := fltk.NewWindow(400, 300)
@@ -68,7 +68,7 @@ package main
 import (
 	"strconv"
 
-	"github.com/pwiecz/go-fltk"
+	"github.com/george012/fltk_go"
 )
 
 // FLTK uses an RGBI color representation, the I is an index into FLTK's color map
@@ -136,7 +136,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/pwiecz/go-fltk"
+	"github.com/george012/fltk_go"
 )
 
 func main() {
@@ -156,4 +156,4 @@ func main() {
 
 ## Resources
 - [Link](https://www.fltk.org/doc-1.4/index.html) to the official FLTK 1.4 documentation.
-- [Link](https://pkg.go.dev/github.com/pwiecz/go-fltk) to go-fltk documentation.
+- [Link](https://pkg.go.dev/github.com/george012/fltk_go) to go-fltk documentation.

README_zh-cn.md

@@ -12,7 +12,7 @@
 # 1. go-fltk
 
 ---
-[![GoDoc](https://img.shields.io/static/v1?label=godoc&message=reference&color=blue)](https://pkg.go.dev/github.com/pwiecz/go-fltk)
+[![GoDoc](https://img.shields.io/static/v1?label=godoc&message=reference&color=blue)](https://pkg.go.dev/github.com/george012/fltk_go)
 
 * [Document](./README.md)
 * [中文文档](./README_zh-cn.md)
@@ -25,7 +25,7 @@
 go-fltk 带有一些架构的预构建 FLTK 库（linux/amd64, windows/amd64），但你也可以轻松地自己重建它们，或者为其他架构构建它们。
 要为你的平台构建 FLTK 库，只需从 go-fltk 源代码树的根目录运行 go generate。
 
-如果构建过程对你不起作用，你可以自行修改 fltk-build.sh 或 fltk-build.bat，或者在 https://github.com/pwiecz/go-fltk/discussions 提出问题。
+如果构建过程对你不起作用，你可以自行修改 fltk-build.sh 或 fltk-build.bat，或者在 https://github.com/george012/fltk_go/discussions 提出问题。
 
 要运行使用 go-fltk 构建的程序，你将需要一些系统库，这些库通常在带有图形用户界面的操作系统上是可用的：
 
@@ -45,7 +45,7 @@ go-fltk 带有一些架构的预构建 FLTK 库（linux/amd64, windows/amd64）
 ```go
 package main
 
-import "github.com/pwiecz/go-fltk"
+import "github.com/george012/fltk_go"
 
 func main() {
     win := fltk.NewWindow(400, 300)
@@ -79,7 +79,7 @@ package main
 import (
 	"strconv"
 
-	"github.com/pwiecz/go-fltk"
+	"github.com/george012/fltk_go"
 )
 
 // FLTK 使用 RGBI 颜色表示法，其中 I 是 FLTK 颜色表的索引
@@ -147,7 +147,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/pwiecz/go-fltk"
+	"github.com/george012/fltk_go"
 )
 
 func main() {
@@ -167,4 +167,4 @@ func main() {
 
 ## 1.5. 资源
 - [官方 FLTK 1.4 文档](https://www.fltk.org/doc-1.4/index.html)
-- [go-fltk 文档](https://pkg.go.dev/github.com/pwiecz/go-fltk) 
+- [go-fltk 文档](https://pkg.go.dev/github.com/george012/fltk_go) 

cgo_darwin_amd64.go

@@ -3,6 +3,6 @@
 package fltk
 
 // #cgo darwin,amd64 CXXFLAGS: -std=c++11
-// #cgo darwin,amd64 CPPFLAGS: -I${SRCDIR}/lib/darwin/amd64 -I${SRCDIR}/include -I${SRCDIR}/include/FL/images -I${SRCDIR}/include/png -I${SRCDIR}/include/zlib -I${SRCDIR}/include/jpeg -isysroot /Applications/Xcode_14.2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX13.1.sdk -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_THREAD_SAFE -D_REENTRANT
+// #cgo darwin,amd64 CPPFLAGS: -I${SRCDIR}/lib/darwin/amd64 -I${SRCDIR}/include -I${SRCDIR}/include/FL/images -I${SRCDIR}/include/png -I${SRCDIR}/include/zlib -I${SRCDIR}/include/jpeg -isysroot /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_THREAD_SAFE -D_REENTRANT
 // #cgo darwin,amd64 LDFLAGS: ${SRCDIR}/lib/darwin/amd64/libfltk_images.a ${SRCDIR}/lib/darwin/amd64/libfltk_jpeg.a ${SRCDIR}/lib/darwin/amd64/libfltk_png.a ${SRCDIR}/lib/darwin/amd64/libfltk_z.a ${SRCDIR}/lib/darwin/amd64/libfltk_gl.a -framework OpenGL ${SRCDIR}/lib/darwin/amd64/libfltk_forms.a ${SRCDIR}/lib/darwin/amd64/libfltk.a -lm -lpthread -framework Cocoa
 import "C"

cgo_darwin_arm64.go

@@ -1,8 +1,9 @@
 //go:build darwin && arm64
+// +build darwin,arm64
 
 package fltk
 
 // #cgo darwin,arm64 CXXFLAGS: -std=c++11
-// #cgo darwin,arm64 CPPFLAGS: -I${SRCDIR}/lib/darwin/arm64 -I${SRCDIR}/include -I${SRCDIR}/include/FL/images -I${SRCDIR}/include/png -I${SRCDIR}/include/zlib -I${SRCDIR}/include/jpeg -isysroot /Library/Developer/CommandLineTools/SDKs/MacOSX13.3.sdk -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_THREAD_SAFE -D_REENTRANT
+// #cgo darwin,arm64 CPPFLAGS: -I${SRCDIR}/lib/darwin/arm64 -I${SRCDIR}/include -I${SRCDIR}/include/FL/images -I${SRCDIR}/include/png -I${SRCDIR}/include/zlib -I${SRCDIR}/include/jpeg -isysroot /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_THREAD_SAFE -D_REENTRANT
 // #cgo darwin,arm64 LDFLAGS: ${SRCDIR}/lib/darwin/arm64/libfltk_images.a ${SRCDIR}/lib/darwin/arm64/libfltk_jpeg.a ${SRCDIR}/lib/darwin/arm64/libfltk_png.a ${SRCDIR}/lib/darwin/arm64/libfltk_z.a ${SRCDIR}/lib/darwin/arm64/libfltk_gl.a -framework OpenGL ${SRCDIR}/lib/darwin/arm64/libfltk_forms.a ${SRCDIR}/lib/darwin/arm64/libfltk.a -lm -lpthread -framework Cocoa
 import "C"

config/config.go

@@ -0,0 +1,6 @@
+package config
+
+const (
+	ProjectName    = "fltk_go"
+	ProjectVersion = "v0.0.1"
+)

examples/7GUIs/cells/main.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/pwiecz/go-fltk"
+	"github.com/george012/fltk_go"
 )
 
 const (

examples/7GUIs/cells/panel.go

@@ -3,7 +3,7 @@ package main
 import (
 	"log"
 
-	"github.com/pwiecz/go-fltk"
+	"github.com/george012/fltk_go"
 )
 
 type Panel struct {

examples/7GUIs/circle/main.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/pwiecz/go-fltk"
+	"github.com/george012/fltk_go"
 )
 
 const (

examples/7GUIs/circle/panel.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"runtime"
 
-	"github.com/pwiecz/go-fltk"
+	"github.com/george012/fltk_go"
 )
 
 type Panel struct {

examples/7GUIs/counter/main.go

@@ -3,7 +3,7 @@ package main
 import (
 	"strconv"
 
-	"github.com/pwiecz/go-fltk"
+	"github.com/george012/fltk_go"
 )
 
 const (

examples/7GUIs/crud/main.go

@@ -5,7 +5,7 @@ import (
 	"log"
 	"strings"
 
-	"github.com/pwiecz/go-fltk"
+	"github.com/george012/fltk_go"
 )
 
 const (

examples/7GUIs/flightbooker/main.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/pwiecz/go-fltk"
+	"github.com/george012/fltk_go"
 )
 
 const (

examples/7GUIs/temperature/main.go

@@ -4,7 +4,7 @@ import (
 	"log"
 	"strconv"
 
-	"github.com/pwiecz/go-fltk"
+	"github.com/george012/fltk_go"
 )
 
 const (

examples/7GUIs/timer/main.go

@@ -3,7 +3,7 @@ package main
 import (
 	"time"
 
-	"github.com/pwiecz/go-fltk"
+	"github.com/george012/fltk_go"
 )
 
 const (

examples/chart/main.go

@@ -4,7 +4,7 @@ import (
 	"math/rand"
 	"strconv"
 
-	"github.com/pwiecz/go-fltk"
+	"github.com/george012/fltk_go"
 )
 
 func main() {

examples/choice/main.go

@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/pwiecz/go-fltk"
+	"github.com/george012/fltk_go"
 )
 
 func main() {

examples/custom-dial/main.go

@@ -3,7 +3,7 @@ package main
 import (
 	"strconv"
 
-	"github.com/pwiecz/go-fltk"
+	"github.com/george012/fltk_go"
 )
 
 type MyDial struct {

examples/dnd/main.go

@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/pwiecz/go-fltk"
+	"github.com/george012/fltk_go"
 )
 
 type Sender struct {

examples/flex/main.go

@@ -3,7 +3,7 @@ package main
 import (
 	"strconv"
 
-	"github.com/pwiecz/go-fltk"
+	"github.com/george012/fltk_go"
 )
 
 var i = 0

examples/flutter-like/main.go

@@ -3,7 +3,7 @@ package main
 import (
 	"strconv"
 
-	"github.com/pwiecz/go-fltk"
+	"github.com/george012/fltk_go"
 )
 
 // FLTK uses an RGBI color representation, the I is an index into FLTK's color map

examples/grid/main.go

@@ -1,6 +1,6 @@
 package main
 
-import "github.com/pwiecz/go-fltk"
+import "github.com/george012/fltk_go"
 
 func main() {
 	win := fltk.NewWindow(320, 180)

examples/group/main.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"runtime"
 
-	"github.com/pwiecz/go-fltk"
+	"github.com/george012/fltk_go"
 )
 
 func main() {

examples/helpview/main.go

@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/pwiecz/go-fltk"
+	"github.com/george012/fltk_go"
 )
 
 func main() {

examples/icons/main.go

@@ -7,7 +7,7 @@ import (
 	_ "image/png"
 	"runtime"
 
-	"github.com/pwiecz/go-fltk"
+	"github.com/george012/fltk_go"
 )
 
 //go:embed 8x8.png

examples/image/main.go

@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/pwiecz/go-fltk"
+	"github.com/george012/fltk_go"
 )
 
 func main() {

examples/input_choice/main.go

@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/pwiecz/go-fltk"
+	"github.com/george012/fltk_go"
 )
 
 func main() {

examples/mdviewer/go.mod

@@ -1,9 +1,9 @@
-module github.com/pwiecz/go-fltk/examples/mdviewer
+module github.com/george012/fltk_go/examples/mdviewer
 
 go 1.17
 
-replace github.com/pwiecz/go-fltk => ../../
+replace github.com/george012/fltk_go => ../../
 
-require github.com/pwiecz/go-fltk v0.0.0
+require github.com/george012/fltk_go v0.0.0
 
 require github.com/yuin/goldmark v1.4.14

examples/mdviewer/main.go

@@ -5,7 +5,6 @@ import (
 
 	_ "embed"
 
-	"github.com/pwiecz/go-fltk"
 	"github.com/yuin/goldmark"
 )
 

examples/native_file_chooser/main.go

@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/pwiecz/go-fltk"
+	"github.com/george012/fltk_go"
 )
 
 func main() {

examples/opengl/go.mod

@@ -1,10 +1,10 @@
-module github.com/pwiecz/go-fltk/examples/opengl
+module github.com/george012/fltk_go/examples/opengl
 
 go 1.17
 
 require (
 	github.com/go-gl/gl v0.0.0-20211210172815-726fda9656d6
-	github.com/pwiecz/go-fltk v0.0.0-20220723095549-2020b5635372
+	github.com/george012/fltk_go v0.0.0-20220723095549-2020b5635372
 )
 
-replace github.com/pwiecz/go-fltk => ../../
+replace github.com/george012/fltk_go => ../../

examples/opengl/main.go

@@ -4,8 +4,8 @@ import (
 	"log"
 	"runtime"
 
+	"github.com/george012/fltk_go"
 	"github.com/go-gl/gl/v2.1/gl"
-	"github.com/pwiecz/go-fltk"
 )
 
 // A port of fltk CubeView test program to Go

examples/paint/main.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/pwiecz/go-fltk"
+	"github.com/george012/fltk_go"
 )
 
 func main() {