diff --git a/README.mdown b/README.mdown
index fc67ca464..37a0e1f34 100644
--- a/README.mdown
+++ b/README.mdown
@@ -15,7 +15,7 @@ See [Getting Started](http://golang.org/doc/install.html)
Walk currently requires Go 1.11.x or later.
##### To Install
-Now run `go get github.com/lxn/walk`
+Now run `go get github.com/terryliu/walk`
Using Walk
==========
@@ -29,8 +29,8 @@ as illustrated in this small example:
package main
import (
- "github.com/lxn/walk"
- . "github.com/lxn/walk/declarative"
+ "github.com/terryliu/walk"
+ . "github.com/terryliu/walk/declarative"
"strings"
)
diff --git a/declarative/accessibility.go b/declarative/accessibility.go
index eeffda7b5..d2abbc39a 100644
--- a/declarative/accessibility.go
+++ b/declarative/accessibility.go
@@ -7,7 +7,7 @@
package declarative
import (
- "github.com/lxn/walk"
+ "github.com/terryliu/walk"
)
// AccState enum defines the state of the window/control
diff --git a/declarative/action.go b/declarative/action.go
index fabcc73cd..6944a5aa9 100644
--- a/declarative/action.go
+++ b/declarative/action.go
@@ -9,7 +9,7 @@ package declarative
import (
"fmt"
- "github.com/lxn/walk"
+ "github.com/terryliu/walk"
)
type Shortcut struct {
diff --git a/declarative/brush.go b/declarative/brush.go
index d928f597a..78ccb5989 100644
--- a/declarative/brush.go
+++ b/declarative/brush.go
@@ -9,7 +9,7 @@ package declarative
import (
"strconv"
- "github.com/lxn/walk"
+ "github.com/terryliu/walk"
)
type TransparentBrush struct {
diff --git a/declarative/builder.go b/declarative/builder.go
index ea0476713..0904f6672 100644
--- a/declarative/builder.go
+++ b/declarative/builder.go
@@ -13,7 +13,7 @@ import (
"regexp"
"strings"
- "github.com/lxn/walk"
+ "github.com/terryliu/walk"
"gopkg.in/Knetic/govaluate.v3"
)
diff --git a/declarative/checkbox.go b/declarative/checkbox.go
index cd440b0dd..71cd9ada0 100644
--- a/declarative/checkbox.go
+++ b/declarative/checkbox.go
@@ -7,7 +7,7 @@
package declarative
import (
- "github.com/lxn/walk"
+ "github.com/terryliu/walk"
)
type CheckBox struct {
diff --git a/declarative/combobox.go b/declarative/combobox.go
index 209a263b1..36c93b5f4 100644
--- a/declarative/combobox.go
+++ b/declarative/combobox.go
@@ -11,7 +11,7 @@ import (
)
import (
- "github.com/lxn/walk"
+ "github.com/terryliu/walk"
)
type ComboBox struct {
diff --git a/declarative/composite.go b/declarative/composite.go
index 206af207f..f196540fc 100644
--- a/declarative/composite.go
+++ b/declarative/composite.go
@@ -7,7 +7,7 @@
package declarative
import (
- "github.com/lxn/walk"
+ "github.com/terryliu/walk"
"github.com/lxn/win"
)
diff --git a/declarative/customwidget.go b/declarative/customwidget.go
index 0025ea753..90937ebdd 100644
--- a/declarative/customwidget.go
+++ b/declarative/customwidget.go
@@ -7,7 +7,7 @@
package declarative
import (
- "github.com/lxn/walk"
+ "github.com/terryliu/walk"
)
type PaintMode int
diff --git a/declarative/databinder.go b/declarative/databinder.go
index 665ae2108..8f930cf0c 100644
--- a/declarative/databinder.go
+++ b/declarative/databinder.go
@@ -9,7 +9,7 @@ package declarative
import (
"time"
- "github.com/lxn/walk"
+ "github.com/terryliu/walk"
)
type DataBinder struct {
diff --git a/declarative/dateedit.go b/declarative/dateedit.go
index 8186b312c..481b25c40 100644
--- a/declarative/dateedit.go
+++ b/declarative/dateedit.go
@@ -11,7 +11,7 @@ import (
)
import (
- "github.com/lxn/walk"
+ "github.com/terryliu/walk"
)
type DateEdit struct {
diff --git a/declarative/datelabel.go b/declarative/datelabel.go
index c4f879276..e0a3d6fcc 100644
--- a/declarative/datelabel.go
+++ b/declarative/datelabel.go
@@ -7,7 +7,7 @@
package declarative
import (
- "github.com/lxn/walk"
+ "github.com/terryliu/walk"
)
type DateLabel struct {
diff --git a/declarative/dialog.go b/declarative/dialog.go
index e0c338134..81e9f7229 100644
--- a/declarative/dialog.go
+++ b/declarative/dialog.go
@@ -7,7 +7,7 @@
package declarative
import (
- "github.com/lxn/walk"
+ "github.com/terryliu/walk"
)
type Dialog struct {
diff --git a/declarative/font.go b/declarative/font.go
index ecd81363b..c9986c026 100644
--- a/declarative/font.go
+++ b/declarative/font.go
@@ -7,7 +7,7 @@
package declarative
import (
- "github.com/lxn/walk"
+ "github.com/terryliu/walk"
)
type Font struct {
diff --git a/declarative/gradientcomposite.go b/declarative/gradientcomposite.go
index cbdb3274a..474b7b0de 100644
--- a/declarative/gradientcomposite.go
+++ b/declarative/gradientcomposite.go
@@ -7,7 +7,7 @@
package declarative
import (
- "github.com/lxn/walk"
+ "github.com/terryliu/walk"
"github.com/lxn/win"
)
diff --git a/declarative/groupbox.go b/declarative/groupbox.go
index 11de5d40e..21983e5a9 100644
--- a/declarative/groupbox.go
+++ b/declarative/groupbox.go
@@ -7,7 +7,7 @@
package declarative
import (
- "github.com/lxn/walk"
+ "github.com/terryliu/walk"
)
type GroupBox struct {
diff --git a/declarative/imageview.go b/declarative/imageview.go
index 3b36c6324..64d06b286 100644
--- a/declarative/imageview.go
+++ b/declarative/imageview.go
@@ -7,7 +7,7 @@
package declarative
import (
- "github.com/lxn/walk"
+ "github.com/terryliu/walk"
)
type ImageViewMode int
diff --git a/declarative/interfaces.go b/declarative/interfaces.go
index bfdfb598e..e93facf22 100644
--- a/declarative/interfaces.go
+++ b/declarative/interfaces.go
@@ -9,7 +9,7 @@ package declarative
import (
"path/filepath"
- "github.com/lxn/walk"
+ "github.com/terryliu/walk"
)
func tr(source string, context ...string) string {
diff --git a/declarative/label.go b/declarative/label.go
index 520b6b269..d1f703b2f 100644
--- a/declarative/label.go
+++ b/declarative/label.go
@@ -7,7 +7,7 @@
package declarative
import (
- "github.com/lxn/walk"
+ "github.com/terryliu/walk"
)
type EllipsisMode int
diff --git a/declarative/layouts.go b/declarative/layouts.go
index 158a0cbb1..079b38ded 100644
--- a/declarative/layouts.go
+++ b/declarative/layouts.go
@@ -9,7 +9,7 @@ package declarative
import (
"errors"
- "github.com/lxn/walk"
+ "github.com/terryliu/walk"
)
type Orientation byte
diff --git a/declarative/lineedit.go b/declarative/lineedit.go
index 1a7f5ef4f..c5669cbc8 100644
--- a/declarative/lineedit.go
+++ b/declarative/lineedit.go
@@ -7,7 +7,7 @@
package declarative
import (
- "github.com/lxn/walk"
+ "github.com/terryliu/walk"
)
type CaseMode uint32
diff --git a/declarative/linklabel.go b/declarative/linklabel.go
index 0a6ed02d8..895ba5fec 100644
--- a/declarative/linklabel.go
+++ b/declarative/linklabel.go
@@ -7,7 +7,7 @@
package declarative
import (
- "github.com/lxn/walk"
+ "github.com/terryliu/walk"
)
type LinkLabel struct {
diff --git a/declarative/listbox.go b/declarative/listbox.go
index 5654a8bb8..027aa540c 100644
--- a/declarative/listbox.go
+++ b/declarative/listbox.go
@@ -11,7 +11,7 @@ import (
)
import (
- "github.com/lxn/walk"
+ "github.com/terryliu/walk"
"github.com/lxn/win"
)
diff --git a/declarative/mainwindow.go b/declarative/mainwindow.go
index 2e10d9c5a..4e337a4cb 100644
--- a/declarative/mainwindow.go
+++ b/declarative/mainwindow.go
@@ -6,7 +6,7 @@
package declarative
-import "github.com/lxn/walk"
+import "github.com/terryliu/walk"
type MainWindow struct {
// Window
diff --git a/declarative/numberedit.go b/declarative/numberedit.go
index ab92460aa..70ce75cac 100644
--- a/declarative/numberedit.go
+++ b/declarative/numberedit.go
@@ -7,7 +7,7 @@
package declarative
import (
- "github.com/lxn/walk"
+ "github.com/terryliu/walk"
)
type NumberEdit struct {
diff --git a/declarative/numberlabel.go b/declarative/numberlabel.go
index dd168e2ab..1a5fde1f7 100644
--- a/declarative/numberlabel.go
+++ b/declarative/numberlabel.go
@@ -7,7 +7,7 @@
package declarative
import (
- "github.com/lxn/walk"
+ "github.com/terryliu/walk"
)
type NumberLabel struct {
diff --git a/declarative/progressbar.go b/declarative/progressbar.go
index fb8177104..1feddba89 100644
--- a/declarative/progressbar.go
+++ b/declarative/progressbar.go
@@ -7,7 +7,7 @@
package declarative
import (
- "github.com/lxn/walk"
+ "github.com/terryliu/walk"
)
type ProgressBar struct {
diff --git a/declarative/pushbutton.go b/declarative/pushbutton.go
index 73dca21d8..eb4facaac 100644
--- a/declarative/pushbutton.go
+++ b/declarative/pushbutton.go
@@ -7,7 +7,7 @@
package declarative
import (
- "github.com/lxn/walk"
+ "github.com/terryliu/walk"
)
type PushButton struct {
diff --git a/declarative/radiobutton.go b/declarative/radiobutton.go
index da5e34d31..512bee32a 100644
--- a/declarative/radiobutton.go
+++ b/declarative/radiobutton.go
@@ -7,7 +7,7 @@
package declarative
import (
- "github.com/lxn/walk"
+ "github.com/terryliu/walk"
)
type RadioButton struct {
diff --git a/declarative/radiobuttongroup.go b/declarative/radiobuttongroup.go
index ff0a2cdd6..53f810f11 100644
--- a/declarative/radiobuttongroup.go
+++ b/declarative/radiobuttongroup.go
@@ -12,7 +12,7 @@ import (
)
import (
- "github.com/lxn/walk"
+ "github.com/terryliu/walk"
)
type RadioButtonGroup struct {
diff --git a/declarative/radiobuttongroupbox.go b/declarative/radiobuttongroupbox.go
index 966cc0439..b48cbff3d 100644
--- a/declarative/radiobuttongroupbox.go
+++ b/declarative/radiobuttongroupbox.go
@@ -7,7 +7,7 @@
package declarative
import (
- "github.com/lxn/walk"
+ "github.com/terryliu/walk"
)
type RadioButtonGroupBox struct {
diff --git a/declarative/scrollview.go b/declarative/scrollview.go
index 7e73acb56..495768b74 100644
--- a/declarative/scrollview.go
+++ b/declarative/scrollview.go
@@ -7,7 +7,7 @@
package declarative
import (
- "github.com/lxn/walk"
+ "github.com/terryliu/walk"
)
type ScrollView struct {
diff --git a/declarative/separator.go b/declarative/separator.go
index 7a9492af1..0cddb4f62 100644
--- a/declarative/separator.go
+++ b/declarative/separator.go
@@ -7,7 +7,7 @@
package declarative
import (
- "github.com/lxn/walk"
+ "github.com/terryliu/walk"
)
type HSeparator struct {
diff --git a/declarative/slider.go b/declarative/slider.go
index b85de5fcb..2ddc6aa3d 100644
--- a/declarative/slider.go
+++ b/declarative/slider.go
@@ -7,7 +7,7 @@
package declarative
import (
- "github.com/lxn/walk"
+ "github.com/terryliu/walk"
)
type Slider struct {
diff --git a/declarative/spacer.go b/declarative/spacer.go
index 3ac593528..b1c071ece 100644
--- a/declarative/spacer.go
+++ b/declarative/spacer.go
@@ -7,7 +7,7 @@
package declarative
import (
- "github.com/lxn/walk"
+ "github.com/terryliu/walk"
)
type HSpacer struct {
diff --git a/declarative/splitbutton.go b/declarative/splitbutton.go
index 982751b9f..3dcc7e487 100644
--- a/declarative/splitbutton.go
+++ b/declarative/splitbutton.go
@@ -7,7 +7,7 @@
package declarative
import (
- "github.com/lxn/walk"
+ "github.com/terryliu/walk"
)
type SplitButton struct {
diff --git a/declarative/splitter.go b/declarative/splitter.go
index f71e6e106..304c3fb3c 100644
--- a/declarative/splitter.go
+++ b/declarative/splitter.go
@@ -7,7 +7,7 @@
package declarative
import (
- "github.com/lxn/walk"
+ "github.com/terryliu/walk"
)
type HSplitter struct {
diff --git a/declarative/tableview.go b/declarative/tableview.go
index dd8866553..7e85d9dd9 100644
--- a/declarative/tableview.go
+++ b/declarative/tableview.go
@@ -7,7 +7,7 @@
package declarative
import (
- "github.com/lxn/walk"
+ "github.com/terryliu/walk"
"github.com/lxn/win"
)
diff --git a/declarative/tableviewcolumn.go b/declarative/tableviewcolumn.go
index 27212b5be..44f8cf215 100644
--- a/declarative/tableviewcolumn.go
+++ b/declarative/tableviewcolumn.go
@@ -7,7 +7,7 @@
package declarative
import (
- "github.com/lxn/walk"
+ "github.com/terryliu/walk"
)
type Alignment1D uint
diff --git a/declarative/tabpage.go b/declarative/tabpage.go
index b1b8acbea..dc073eea5 100644
--- a/declarative/tabpage.go
+++ b/declarative/tabpage.go
@@ -7,7 +7,7 @@
package declarative
import (
- "github.com/lxn/walk"
+ "github.com/terryliu/walk"
)
type TabPage struct {
diff --git a/declarative/tabwidget.go b/declarative/tabwidget.go
index fce998317..93999b9e2 100644
--- a/declarative/tabwidget.go
+++ b/declarative/tabwidget.go
@@ -7,7 +7,7 @@
package declarative
import (
- "github.com/lxn/walk"
+ "github.com/terryliu/walk"
)
type TabWidget struct {
diff --git a/declarative/textedit.go b/declarative/textedit.go
index 81cae50e6..43d7fa386 100644
--- a/declarative/textedit.go
+++ b/declarative/textedit.go
@@ -7,7 +7,7 @@
package declarative
import (
- "github.com/lxn/walk"
+ "github.com/terryliu/walk"
"github.com/lxn/win"
)
diff --git a/declarative/textlabel.go b/declarative/textlabel.go
index b256364fb..3d720dd02 100644
--- a/declarative/textlabel.go
+++ b/declarative/textlabel.go
@@ -7,7 +7,7 @@
package declarative
import (
- "github.com/lxn/walk"
+ "github.com/terryliu/walk"
)
type Alignment2D uint
diff --git a/declarative/toolbar.go b/declarative/toolbar.go
index 635e921c4..ba243d1eb 100644
--- a/declarative/toolbar.go
+++ b/declarative/toolbar.go
@@ -7,7 +7,7 @@
package declarative
import (
- "github.com/lxn/walk"
+ "github.com/terryliu/walk"
)
type ToolBarButtonStyle int
diff --git a/declarative/toolbutton.go b/declarative/toolbutton.go
index 7a598f809..86539e720 100644
--- a/declarative/toolbutton.go
+++ b/declarative/toolbutton.go
@@ -7,7 +7,7 @@
package declarative
import (
- "github.com/lxn/walk"
+ "github.com/terryliu/walk"
)
type ToolButton struct {
diff --git a/declarative/treeview.go b/declarative/treeview.go
index bb4a1f56e..adc3115c8 100644
--- a/declarative/treeview.go
+++ b/declarative/treeview.go
@@ -7,7 +7,7 @@
package declarative
import (
- "github.com/lxn/walk"
+ "github.com/terryliu/walk"
)
type TreeView struct {
diff --git a/declarative/validators.go b/declarative/validators.go
index 7f6e8e661..4b573eee3 100644
--- a/declarative/validators.go
+++ b/declarative/validators.go
@@ -7,7 +7,7 @@
package declarative
import (
- "github.com/lxn/walk"
+ "github.com/terryliu/walk"
)
type ValidatorRef struct {
diff --git a/declarative/webview.go b/declarative/webview.go
index 2b141977d..e90e16fbc 100644
--- a/declarative/webview.go
+++ b/declarative/webview.go
@@ -7,7 +7,7 @@
package declarative
import (
- "github.com/lxn/walk"
+ "github.com/terryliu/walk"
)
type WebView struct {
diff --git a/examples/actions/actions.go b/examples/actions/actions.go
index 7314821a6..786843165 100644
--- a/examples/actions/actions.go
+++ b/examples/actions/actions.go
@@ -9,8 +9,8 @@ import (
)
import (
- "github.com/lxn/walk"
- . "github.com/lxn/walk/declarative"
+ "github.com/terryliu/walk"
+ . "github.com/terryliu/walk/declarative"
)
var isSpecialMode = walk.NewMutableCondition()
diff --git a/examples/clipboard/clipboard.go b/examples/clipboard/clipboard.go
index e6c4fb136..0722b3b76 100644
--- a/examples/clipboard/clipboard.go
+++ b/examples/clipboard/clipboard.go
@@ -9,8 +9,8 @@ import (
)
import (
- "github.com/lxn/walk"
- . "github.com/lxn/walk/declarative"
+ "github.com/terryliu/walk"
+ . "github.com/terryliu/walk/declarative"
)
func main() {
diff --git a/examples/databinding/databinding.go b/examples/databinding/databinding.go
index 42ef70924..d60826286 100644
--- a/examples/databinding/databinding.go
+++ b/examples/databinding/databinding.go
@@ -9,9 +9,9 @@ import (
"log"
"time"
- "github.com/lxn/walk"
+ "github.com/terryliu/walk"
- . "github.com/lxn/walk/declarative"
+ . "github.com/terryliu/walk/declarative"
)
func main() {
diff --git a/examples/drawing/drawing.go b/examples/drawing/drawing.go
index 3c19201f4..b17524730 100644
--- a/examples/drawing/drawing.go
+++ b/examples/drawing/drawing.go
@@ -10,8 +10,8 @@ import (
)
import (
- "github.com/lxn/walk"
- . "github.com/lxn/walk/declarative"
+ "github.com/terryliu/walk"
+ . "github.com/terryliu/walk/declarative"
)
func main() {
diff --git a/examples/dropfiles/dropfiles.go b/examples/dropfiles/dropfiles.go
index 9c0da7679..bb6c013d3 100644
--- a/examples/dropfiles/dropfiles.go
+++ b/examples/dropfiles/dropfiles.go
@@ -7,8 +7,8 @@ package main
import (
"strings"
- "github.com/lxn/walk"
- . "github.com/lxn/walk/declarative"
+ "github.com/terryliu/walk"
+ . "github.com/terryliu/walk/declarative"
)
func main() {
diff --git a/examples/externalwidgets/externalwidgets.go b/examples/externalwidgets/externalwidgets.go
index a7ebd0072..9a1c800b2 100644
--- a/examples/externalwidgets/externalwidgets.go
+++ b/examples/externalwidgets/externalwidgets.go
@@ -7,9 +7,9 @@ package main
import (
"log"
- "github.com/lxn/walk"
+ "github.com/terryliu/walk"
- . "github.com/lxn/walk/declarative"
+ . "github.com/terryliu/walk/declarative"
"github.com/lxn/win"
)
diff --git a/examples/filebrowser/filebrowser.go b/examples/filebrowser/filebrowser.go
index c1a93b1b9..b24d08c7d 100644
--- a/examples/filebrowser/filebrowser.go
+++ b/examples/filebrowser/filebrowser.go
@@ -12,8 +12,8 @@ import (
)
import (
- "github.com/lxn/walk"
- . "github.com/lxn/walk/declarative"
+ "github.com/terryliu/walk"
+ . "github.com/terryliu/walk/declarative"
)
type Directory struct {
diff --git a/examples/gradientcomposite/gradientcomposite.go b/examples/gradientcomposite/gradientcomposite.go
index 60f451022..deed179fc 100644
--- a/examples/gradientcomposite/gradientcomposite.go
+++ b/examples/gradientcomposite/gradientcomposite.go
@@ -5,8 +5,8 @@
package main
import (
- "github.com/lxn/walk"
- . "github.com/lxn/walk/declarative"
+ "github.com/terryliu/walk"
+ . "github.com/terryliu/walk/declarative"
)
func main() {
diff --git a/examples/imageicon/main.go b/examples/imageicon/main.go
index f40dcf070..c8cc8eac4 100644
--- a/examples/imageicon/main.go
+++ b/examples/imageicon/main.go
@@ -12,8 +12,8 @@ import (
)
import (
- "github.com/lxn/walk"
- . "github.com/lxn/walk/declarative"
+ "github.com/terryliu/walk"
+ . "github.com/terryliu/walk/declarative"
)
func main() {
diff --git a/examples/imageview/imageview.go b/examples/imageview/imageview.go
index a863790a5..6a624efbe 100644
--- a/examples/imageview/imageview.go
+++ b/examples/imageview/imageview.go
@@ -5,8 +5,8 @@
package main
import (
- "github.com/lxn/walk"
- . "github.com/lxn/walk/declarative"
+ "github.com/terryliu/walk"
+ . "github.com/terryliu/walk/declarative"
)
func main() {
diff --git a/examples/imageviewer/imageviewer.go b/examples/imageviewer/imageviewer.go
index 844d2ba1f..dc042cde5 100644
--- a/examples/imageviewer/imageviewer.go
+++ b/examples/imageviewer/imageviewer.go
@@ -11,8 +11,8 @@ import (
)
import (
- "github.com/lxn/walk"
- . "github.com/lxn/walk/declarative"
+ "github.com/terryliu/walk"
+ . "github.com/terryliu/walk/declarative"
)
func main() {
diff --git a/examples/linklabel/linklabel.go b/examples/linklabel/linklabel.go
index bd0402846..3dd5766dc 100644
--- a/examples/linklabel/linklabel.go
+++ b/examples/linklabel/linklabel.go
@@ -9,8 +9,8 @@ import (
)
import (
- "github.com/lxn/walk"
- . "github.com/lxn/walk/declarative"
+ "github.com/terryliu/walk"
+ . "github.com/terryliu/walk/declarative"
)
func main() {
@@ -21,7 +21,7 @@ func main() {
Children: []Widget{
LinkLabel{
MaxSize: Size{100, 0},
- Text: `I can contain multiple links like this or that one.`,
+ Text: `I can contain multiple links like this or that one.`,
OnLinkActivated: func(link *walk.LinkLabelLink) {
log.Printf("id: '%s', url: '%s'\n", link.Id(), link.URL())
},
diff --git a/examples/listbox/listbox.go b/examples/listbox/listbox.go
index 2e9d3af36..202688aeb 100644
--- a/examples/listbox/listbox.go
+++ b/examples/listbox/listbox.go
@@ -12,8 +12,8 @@ import (
)
import (
- "github.com/lxn/walk"
- . "github.com/lxn/walk/declarative"
+ "github.com/terryliu/walk"
+ . "github.com/terryliu/walk/declarative"
)
func main() {
diff --git a/examples/listbox_ownerdrawing/listbox_ownerdrawing.go b/examples/listbox_ownerdrawing/listbox_ownerdrawing.go
index 032addf4a..a036085ba 100644
--- a/examples/listbox_ownerdrawing/listbox_ownerdrawing.go
+++ b/examples/listbox_ownerdrawing/listbox_ownerdrawing.go
@@ -10,8 +10,8 @@ import (
"strings"
"time"
- "github.com/lxn/walk"
- . "github.com/lxn/walk/declarative"
+ "github.com/terryliu/walk"
+ . "github.com/terryliu/walk/declarative"
"github.com/lxn/win"
)
diff --git a/examples/logview/logview.go b/examples/logview/logview.go
index 737f3d684..c4078e947 100644
--- a/examples/logview/logview.go
+++ b/examples/logview/logview.go
@@ -10,7 +10,7 @@ import (
)
import (
- "github.com/lxn/walk"
+ "github.com/terryliu/walk"
"github.com/lxn/win"
)
diff --git a/examples/logview/logviewapp.go b/examples/logview/logviewapp.go
index 948293f2a..6a7dc146a 100644
--- a/examples/logview/logviewapp.go
+++ b/examples/logview/logviewapp.go
@@ -10,8 +10,8 @@ import (
)
import (
- "github.com/lxn/walk"
- . "github.com/lxn/walk/declarative"
+ "github.com/terryliu/walk"
+ . "github.com/terryliu/walk/declarative"
)
func main() {
diff --git a/examples/multiplepages/main.go b/examples/multiplepages/main.go
index 4108492fc..34cb869e7 100644
--- a/examples/multiplepages/main.go
+++ b/examples/multiplepages/main.go
@@ -9,8 +9,8 @@ import (
)
import (
- "github.com/lxn/walk"
- . "github.com/lxn/walk/declarative"
+ "github.com/terryliu/walk"
+ . "github.com/terryliu/walk/declarative"
)
func main() {
diff --git a/examples/multiplepages/multipagemainwindow.go b/examples/multiplepages/multipagemainwindow.go
index 9cb8809bb..c9bfd4abb 100644
--- a/examples/multiplepages/multipagemainwindow.go
+++ b/examples/multiplepages/multipagemainwindow.go
@@ -5,8 +5,8 @@
package main
import (
- "github.com/lxn/walk"
- . "github.com/lxn/walk/declarative"
+ "github.com/terryliu/walk"
+ . "github.com/terryliu/walk/declarative"
)
type MultiPageMainWindowConfig struct {
diff --git a/examples/notifyicon/notifyicon.go b/examples/notifyicon/notifyicon.go
index d54b86aa0..b364819e7 100644
--- a/examples/notifyicon/notifyicon.go
+++ b/examples/notifyicon/notifyicon.go
@@ -9,7 +9,7 @@ import (
)
import (
- "github.com/lxn/walk"
+ "github.com/terryliu/walk"
)
func main() {
diff --git a/examples/progressindicator/dialog_ui.go b/examples/progressindicator/dialog_ui.go
index 24bb0c844..0b60fdb2f 100644
--- a/examples/progressindicator/dialog_ui.go
+++ b/examples/progressindicator/dialog_ui.go
@@ -3,7 +3,7 @@
package main
import (
- "github.com/lxn/walk"
+ "github.com/terryliu/walk"
)
type myDialogUI struct {
diff --git a/examples/progressindicator/pi.go b/examples/progressindicator/pi.go
index 9794786dc..663034f12 100644
--- a/examples/progressindicator/pi.go
+++ b/examples/progressindicator/pi.go
@@ -11,7 +11,7 @@ import (
)
import (
- "github.com/lxn/walk"
+ "github.com/terryliu/walk"
)
func main() {
diff --git a/examples/radiobutton/radiobutton.go b/examples/radiobutton/radiobutton.go
index 0622a572c..5d4fa53a0 100644
--- a/examples/radiobutton/radiobutton.go
+++ b/examples/radiobutton/radiobutton.go
@@ -9,7 +9,7 @@ import (
)
import (
- . "github.com/lxn/walk/declarative"
+ . "github.com/terryliu/walk/declarative"
)
type Foo struct {
diff --git a/examples/settings/settings.go b/examples/settings/settings.go
index 946874030..fdfe89856 100644
--- a/examples/settings/settings.go
+++ b/examples/settings/settings.go
@@ -12,8 +12,8 @@ import (
)
import (
- "github.com/lxn/walk"
- . "github.com/lxn/walk/declarative"
+ "github.com/terryliu/walk"
+ . "github.com/terryliu/walk/declarative"
)
func main() {
diff --git a/examples/slider/slider.go b/examples/slider/slider.go
index 9405bbe9e..05b436a21 100644
--- a/examples/slider/slider.go
+++ b/examples/slider/slider.go
@@ -7,8 +7,8 @@ package main
import (
"log"
- "github.com/lxn/walk"
- . "github.com/lxn/walk/declarative"
+ "github.com/terryliu/walk"
+ . "github.com/terryliu/walk/declarative"
)
func main() {
diff --git a/examples/statusbar/statusbar.go b/examples/statusbar/statusbar.go
index 857ed0d86..9517d9548 100644
--- a/examples/statusbar/statusbar.go
+++ b/examples/statusbar/statusbar.go
@@ -10,8 +10,8 @@ package main
import (
"log"
- "github.com/lxn/walk"
- . "github.com/lxn/walk/declarative"
+ "github.com/terryliu/walk"
+ . "github.com/terryliu/walk/declarative"
)
func main() {
diff --git a/examples/tableview/tableview.go b/examples/tableview/tableview.go
index b5ca4b910..2d72b23cf 100644
--- a/examples/tableview/tableview.go
+++ b/examples/tableview/tableview.go
@@ -13,8 +13,8 @@ import (
)
import (
- "github.com/lxn/walk"
- . "github.com/lxn/walk/declarative"
+ "github.com/terryliu/walk"
+ . "github.com/terryliu/walk/declarative"
)
type Foo struct {
diff --git a/examples/webview/webview.go b/examples/webview/webview.go
index be4fe794e..99ae01a06 100644
--- a/examples/webview/webview.go
+++ b/examples/webview/webview.go
@@ -7,8 +7,8 @@ package main
import (
"strings"
- "github.com/lxn/walk"
- . "github.com/lxn/walk/declarative"
+ "github.com/terryliu/walk"
+ . "github.com/terryliu/walk/declarative"
)
func main() {
@@ -33,7 +33,7 @@ func main() {
WebView{
AssignTo: &wv,
Name: "wv",
- URL: "https://github.com/lxn/walk",
+ URL: "https://github.com/terryliu/walk",
},
},
Functions: map[string]func(args ...interface{}) (interface{}, error){
diff --git a/examples/webview_events/webview_events.go b/examples/webview_events/webview_events.go
index e0c16201b..3d6d31fd9 100644
--- a/examples/webview_events/webview_events.go
+++ b/examples/webview_events/webview_events.go
@@ -9,8 +9,8 @@ import (
"log"
"strings"
- "github.com/lxn/walk"
- . "github.com/lxn/walk/declarative"
+ "github.com/terryliu/walk"
+ . "github.com/terryliu/walk/declarative"
)
type MainWin struct {
@@ -50,7 +50,7 @@ func NewMainWin() (*MainWin, error) {
WebView{
AssignTo: &mainWin.wv,
Name: "wv",
- URL: "https://github.com/lxn/walk",
+ URL: "https://github.com/terryliu/walk",
ShortcutsEnabled: true,
NativeContextMenuEnabled: true,
OnNavigating: mainWin.webView_OnNavigating,
diff --git a/go.mod b/go.mod
new file mode 100644
index 000000000..ed2eab90b
--- /dev/null
+++ b/go.mod
@@ -0,0 +1,12 @@
+module walk
+
+go 1.14
+
+require (
+ github.com/terryliu/walk v0.0.1
+ github.com/lxn/win v0.0.0-20191128105842-2da648fda5b4
+ golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae
+ gopkg.in/Knetic/govaluate.v3 v3.0.0
+)
+
+replace github.com/terryliu/walk v0.0.1 => ../walk
diff --git a/go.sum b/go.sum
new file mode 100644
index 000000000..47d654bb7
--- /dev/null
+++ b/go.sum
@@ -0,0 +1,11 @@
+github.com/lxn/walk v0.0.0-20191128110447-55ccb3a9f5c1 h1:/QwQcwWVOQXcoNuV9tHx30gQ3q7jCE/rKcGjwzsa5tg=
+github.com/lxn/walk v0.0.0-20191128110447-55ccb3a9f5c1/go.mod h1:E23UucZGqpuUANJooIbHWCufXvOcT6E7Stq81gU+CSQ=
+github.com/lxn/win v0.0.0-20191128105842-2da648fda5b4 h1:5BmtGkQbch91lglMHQ9JIDGiYCL3kBRBA0ItZTvOcEI=
+github.com/lxn/win v0.0.0-20191128105842-2da648fda5b4/go.mod h1:ouWl4wViUNh8tPSIwxTVMuS014WakR1hqvBc2I0bMoA=
+github.com/terryliu/walk v0.0.0-20191128110447-55ccb3a9f5c1/go.mod h1:N909TKXVa9T2+UBSFm3uYa+59HtDKJMZYkjQ4nLt+HA=
+github.com/terryliu/walk v0.0.1/go.mod h1:N909TKXVa9T2+UBSFm3uYa+59HtDKJMZYkjQ4nLt+HA=
+golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae h1:Ih9Yo4hSPImZOpfGuA4bR/ORKTAbhZo2AbWNRCnevdo=
+golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+gopkg.in/Knetic/govaluate.v3 v3.0.0 h1:18mUyIt4ZlRlFZAAfVetz4/rzlJs9yhN+U02F4u1AOc=
+gopkg.in/Knetic/govaluate.v3 v3.0.0/go.mod h1:csKLBORsPbafmSCGTEh3U7Ozmsuq8ZSIlKk1bcqph0E=
diff --git a/tools/ui2walk/ui2walk.go b/tools/ui2walk/ui2walk.go
index 2e1629396..c302a6608 100644
--- a/tools/ui2walk/ui2walk.go
+++ b/tools/ui2walk/ui2walk.go
@@ -898,7 +898,7 @@ func generateUICode(buf *bytes.Buffer, ui *UI) error {
package main
import (
- "github.com/lxn/walk"
+ "github.com/terryliu/walk"
)
`)
@@ -1070,7 +1070,7 @@ func generateLogicCode(buf *bytes.Buffer, ui *UI) error {
`package main
import (
- "github.com/lxn/walk"
+ "github.com/terryliu/walk"
)
`)
diff --git a/webview_dwebbrowserevents2.go b/webview_dwebbrowserevents2.go
index 10d370385..3e6136df0 100644
--- a/webview_dwebbrowserevents2.go
+++ b/webview_dwebbrowserevents2.go
@@ -209,7 +209,7 @@ func webView_DWebBrowserEvents2_Invoke(
eventData := &WebViewNewWindowEventData{
ppDisp: (*rgvargPtr)[4].MustPPDispatch(),
cancel: (*rgvargPtr)[3].MustPBool(),
- dwFlags: (*rgvargPtr)[2].MustULong(),
+ dwFlags: (*rgvargPtr)[2].MustLong(),
bstrUrlContext: (*rgvargPtr)[1].MustBSTR(),
bstrUrl: (*rgvargPtr)[0].MustBSTR(),
}
diff --git a/webview_events.go b/webview_events.go
index 697ae5d3c..2219312b5 100644
--- a/webview_events.go
+++ b/webview_events.go
@@ -230,7 +230,7 @@ func (p *WebViewNavigatedErrorEventPublisher) Publish(eventData *WebViewNavigate
type WebViewNewWindowEventData struct {
ppDisp **win.IDispatch
cancel *win.VARIANT_BOOL
- dwFlags uint32
+ dwFlags int32
bstrUrlContext *uint16
bstrUrl *uint16
}
@@ -258,7 +258,7 @@ func (eventData *WebViewNewWindowEventData) SetCanceled(value bool) {
}
}
-func (eventData *WebViewNewWindowEventData) Flags() uint32 {
+func (eventData *WebViewNewWindowEventData) Flags() int32 {
return eventData.dwFlags
}