From b0816ea147f2376b29a16999fea51e76e4774e35 Mon Sep 17 00:00:00 2001 From: borey Date: Wed, 27 Nov 2019 12:04:59 +0800 Subject: [PATCH 1/3] Update logview.go fixed logview example --- examples/logview/logview.go | 60 ++++++++++--------------------------- 1 file changed, 15 insertions(+), 45 deletions(-) diff --git a/examples/logview/logview.go b/examples/logview/logview.go index 737f3d684..42d1e4e97 100644 --- a/examples/logview/logview.go +++ b/examples/logview/logview.go @@ -3,20 +3,15 @@ // license that can be found in the LICENSE file. package main -import ( - "errors" - "syscall" - "unsafe" -) - import ( "github.com/lxn/walk" "github.com/lxn/win" ) type LogView struct { - walk.WidgetBase + walk.TextEdit logChan chan string + maxSize int } const ( @@ -24,46 +19,29 @@ const ( ) func NewLogView(parent walk.Container) (*LogView, error) { - lc := make(chan string, 1024) - lv := &LogView{logChan: lc} - - if err := walk.InitWidget( - lv, + lv := &LogView{ + logChan: make(chan string, 1024), + maxSize: 0x7FFF0000, + } + if err := walk.InitWidget(lv, parent, "EDIT", win.WS_TABSTOP|win.WS_VISIBLE|win.WS_VSCROLL|win.ES_MULTILINE|win.ES_WANTRETURN, win.WS_EX_CLIENTEDGE); err != nil { return nil, err } - lv.setReadOnly(true) - lv.SendMessage(win.EM_SETLIMITTEXT, 4294967295, 0) + lv.TextEdit.SetReadOnly(true) + lv.TextEdit.SetMaxLength(lv.maxSize) return lv, nil } -func (*LogView) CreateLayoutItem(ctx *walk.LayoutContext) walk.LayoutItem { - return walk.NewGreedyLayoutItem() -} - -func (lv *LogView) setTextSelection(start, end int) { - lv.SendMessage(win.EM_SETSEL, uintptr(start), uintptr(end)) -} - -func (lv *LogView) textLength() int { - return int(lv.SendMessage(0x000E, uintptr(0), uintptr(0))) -} - func (lv *LogView) AppendText(value string) { - textLength := lv.textLength() - lv.setTextSelection(textLength, textLength) - lv.SendMessage(win.EM_REPLACESEL, 0, uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(value)))) -} - -func (lv *LogView) setReadOnly(readOnly bool) error { - if 0 == lv.SendMessage(win.EM_SETREADONLY, uintptr(win.BoolToBOOL(readOnly)), 0) { - return errors.New("fail to call EM_SETREADONLY") + textLength := lv.TextEdit.TextLength() + if textLength+len(value) < lv.maxSize { + lv.TextEdit.AppendText(value) + } else { + lv.TextEdit.SetText(value) } - - return nil } func (lv *LogView) PostAppendText(value string) { @@ -78,20 +56,12 @@ func (lv *LogView) Write(p []byte) (int, error) { func (lv *LogView) WndProc(hwnd win.HWND, msg uint32, wParam, lParam uintptr) uintptr { switch msg { - case win.WM_GETDLGCODE: - if wParam == win.VK_RETURN { - return win.DLGC_WANTALLKEYS - } - - return win.DLGC_HASSETSEL | win.DLGC_WANTARROWS | win.DLGC_WANTCHARS case TEM_APPENDTEXT: select { case value := <-lv.logChan: lv.AppendText(value) default: - return 0 } } - - return lv.WidgetBase.WndProc(hwnd, msg, wParam, lParam) + return lv.TextEdit.WndProc(hwnd, msg, wParam, lParam) } From 70d902fb5bfc6350d473898611f1f83900a2b416 Mon Sep 17 00:00:00 2001 From: borey Date: Wed, 27 Nov 2019 15:10:46 +0800 Subject: [PATCH 2/3] LoadIconWithScaleDown failed when LoadIconWithScaleDown failed, try to call LoadImage again --- icon.go | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/icon.go b/icon.go index e4870bfb6..6de5786d4 100644 --- a/icon.go +++ b/icon.go @@ -246,18 +246,21 @@ func (i *Icon) handleForDPIWithError(dpi int) (win.HICON, error) { var hInst win.HINSTANCE var name *uint16 + var flags uint32 if i.filePath != "" { absFilePath, err := filepath.Abs(i.filePath) if err != nil { return 0, err } - + flags |= win.LR_LOADFROMFILE name = syscall.StringToUTF16Ptr(absFilePath) } else { if !i.isStock { if hInst = win.GetModuleHandle(nil); hInst == 0 { return 0, lastError("GetModuleHandle") } + } else { + flags |= win.LR_SHARED } name = i.res @@ -265,6 +268,7 @@ func (i *Icon) handleForDPIWithError(dpi int) (win.HICON, error) { var size Size if i.size96dpi.Width == 0 || i.size96dpi.Height == 0 { + flags |= win.LR_DEFAULTSIZE size = SizeFrom96DPI(defaultIconSize(), dpi) } else { size = SizeFrom96DPI(i.size96dpi, dpi) @@ -291,7 +295,16 @@ func (i *Icon) handleForDPIWithError(dpi int) (win.HICON, error) { int32(size.Height), &hIcon)) if hr < 0 || hIcon == 0 { - return 0, lastError("LoadIconWithScaleDown") + hIcon = win.HICON(win.LoadImage( + hInst, + name, + win.IMAGE_ICON, + int32(size.Width), + int32(size.Height), + flags)) + if hIcon == 0 { + return 0, lastError("LoadIconWithScaleDown & LoadImage") + } } } From ea1cc4883b4d8e47ad7a18b7fe0c6a0997a4d929 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 27 Nov 2020 14:36:46 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=8C=85=E8=B7=AF?= =?UTF-8?q?=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.mdown | 6 +++--- accessibility.go | 2 +- application.go | 2 +- bitmap.go | 2 +- boxlayout.go | 2 +- brush.go | 2 +- button.go | 2 +- canvas.go | 2 +- checkbox.go | 2 +- clipboard.go | 2 +- combobox.go | 2 +- commondialogs.go | 4 +--- composite.go | 2 +- container.go | 2 +- cursor.go | 4 +--- customwidget.go | 2 +- dateedit.go | 2 +- declarative/accessibility.go | 2 +- declarative/action.go | 2 +- declarative/brush.go | 2 +- declarative/builder.go | 2 +- declarative/checkbox.go | 2 +- declarative/combobox.go | 4 +--- declarative/composite.go | 4 ++-- declarative/customwidget.go | 2 +- declarative/databinder.go | 2 +- declarative/dateedit.go | 4 +--- declarative/datelabel.go | 2 +- declarative/dialog.go | 2 +- declarative/font.go | 2 +- declarative/gradientcomposite.go | 4 ++-- declarative/groupbox.go | 2 +- declarative/imageview.go | 2 +- declarative/interfaces.go | 2 +- declarative/label.go | 2 +- declarative/layouts.go | 2 +- declarative/lineedit.go | 2 +- declarative/linklabel.go | 2 +- declarative/listbox.go | 6 ++---- declarative/mainwindow.go | 2 +- declarative/numberedit.go | 2 +- declarative/numberlabel.go | 2 +- declarative/progressbar.go | 2 +- declarative/pushbutton.go | 2 +- declarative/radiobutton.go | 2 +- declarative/radiobuttongroup.go | 4 +--- declarative/radiobuttongroupbox.go | 2 +- declarative/scrollview.go | 2 +- declarative/separator.go | 4 ++-- declarative/slider.go | 2 +- declarative/spacer.go | 2 +- declarative/splitbutton.go | 2 +- declarative/splitter.go | 2 +- declarative/tableview.go | 4 ++-- declarative/tableviewcolumn.go | 2 +- declarative/tabpage.go | 2 +- declarative/tabwidget.go | 2 +- declarative/textedit.go | 4 ++-- declarative/textlabel.go | 2 +- declarative/toolbar.go | 2 +- declarative/toolbutton.go | 2 +- declarative/treeview.go | 2 +- declarative/validators.go | 2 +- declarative/webview.go | 2 +- dialog.go | 2 +- dropfilesevent.go | 2 +- error.go | 4 +--- examples/actions/actions.go | 7 +++---- examples/clipboard/clipboard.go | 7 +++---- examples/databinding/databinding.go | 4 ++-- examples/drawing/drawing.go | 7 +++---- examples/dropfiles/dropfiles.go | 4 ++-- examples/externalwidgets/externalwidgets.go | 6 +++--- examples/filebrowser/filebrowser.go | 7 +++---- examples/gradientcomposite/gradientcomposite.go | 4 ++-- examples/imageicon/main.go | 7 +++---- examples/imageview/imageview.go | 4 ++-- examples/imageviewer/imageviewer.go | 7 +++---- examples/linklabel/linklabel.go | 9 ++++----- examples/listbox/listbox.go | 7 +++---- examples/listbox_ownerdrawing/listbox_ownerdrawing.go | 6 +++--- examples/logview/logview.go | 4 ++-- examples/logview/logviewapp.go | 7 +++---- examples/multiplepages/main.go | 7 +++---- examples/multiplepages/multipagemainwindow.go | 4 ++-- examples/notifyicon/notifyicon.go | 4 +--- examples/progressindicator/dialog_ui.go | 2 +- examples/progressindicator/pi.go | 4 +--- examples/radiobutton/radiobutton.go | 4 +--- examples/settings/settings.go | 7 +++---- examples/slider/slider.go | 4 ++-- examples/statusbar/statusbar.go | 4 ++-- examples/tableview/tableview.go | 7 +++---- examples/webview/webview.go | 6 +++--- examples/webview_events/webview_events.go | 6 +++--- flowlayout.go | 2 +- font.go | 4 +--- fontresource.go | 3 ++- form.go | 2 +- gradientcomposite.go | 2 +- groupbox.go | 2 +- icon.go | 2 +- image.go | 2 +- imagelist.go | 2 +- imageview.go | 2 +- keyboard.go | 4 +--- label.go | 2 +- layout.go | 2 +- lineedit.go | 4 +--- linklabel.go | 2 +- listbox.go | 2 +- mainloop_cgo.go | 2 +- mainloop_default.go | 2 +- mainwindow.go | 4 +--- menu.go | 2 +- messagebox.go | 4 +--- metafile.go | 2 +- models.go | 2 +- mouseevent.go | 2 +- notifyicon.go | 2 +- numberedit.go | 2 +- path.go | 2 +- pen.go | 2 +- point.go | 2 +- progressbar.go | 2 +- progressindicator.go | 6 ++---- pushbutton.go | 2 +- radiobutton.go | 2 +- rectangle.go | 2 +- registry.go | 4 +--- scrollview.go | 2 +- separator.go | 2 +- size.go | 2 +- slider.go | 2 +- splitbutton.go | 4 +--- splitter.go | 2 +- splitterhandle.go | 2 +- splitterlayout.go | 2 +- static.go | 2 +- statusbar.go | 4 +--- tableview.go | 2 +- tableviewcolumn.go | 2 +- tabpage.go | 2 +- tabpagelist.go | 2 +- tabwidget.go | 2 +- textedit.go | 2 +- toolbar.go | 2 +- toolbutton.go | 2 +- tools/ui2walk/ui2walk.go | 4 ++-- tooltip.go | 2 +- tooltiperrorpresenter.go | 2 +- treeview.go | 2 +- util.go | 2 +- webview.go | 4 +--- webview_dwebbrowserevents2.go | 7 ++----- webview_events.go | 4 +--- webview_idochostuihandler.go | 4 +--- webview_ioleclientsite.go | 4 +--- webview_ioleinplaceframe.go | 4 +--- webview_ioleinplacesite.go | 4 +--- widget.go | 2 +- widgetlist.go | 2 +- window.go | 2 +- windowgroup.go | 2 +- 164 files changed, 217 insertions(+), 281 deletions(-) diff --git a/README.mdown b/README.mdown index fc67ca464..277591b94 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/xlplbo/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/xlplbo/walk" + . "github.com/xlplbo/walk/declarative" "strings" ) diff --git a/accessibility.go b/accessibility.go index 6846d1de4..5e36a2319 100644 --- a/accessibility.go +++ b/accessibility.go @@ -6,7 +6,7 @@ package walk -import "github.com/lxn/win" +import "github.com/xlplbo/win" // AccState enum defines the state of the window/control type AccState int32 diff --git a/application.go b/application.go index 863385cca..34804bd20 100644 --- a/application.go +++ b/application.go @@ -11,7 +11,7 @@ import ( "sync" "time" - "github.com/lxn/win" + "github.com/xlplbo/win" ) type Settings interface { diff --git a/bitmap.go b/bitmap.go index 57f0e05f2..9670ee63f 100644 --- a/bitmap.go +++ b/bitmap.go @@ -14,7 +14,7 @@ import ( "syscall" "unsafe" - "github.com/lxn/win" + "github.com/xlplbo/win" ) const inchesPerMeter float64 = 39.37007874 diff --git a/boxlayout.go b/boxlayout.go index ab6880d08..044fcaf63 100644 --- a/boxlayout.go +++ b/boxlayout.go @@ -11,7 +11,7 @@ import ( "sort" "sync" - "github.com/lxn/win" + "github.com/xlplbo/win" ) type Orientation byte diff --git a/brush.go b/brush.go index d87cf80b2..999c12aa6 100644 --- a/brush.go +++ b/brush.go @@ -9,7 +9,7 @@ package walk import ( "unsafe" - "github.com/lxn/win" + "github.com/xlplbo/win" ) type HatchStyle int diff --git a/button.go b/button.go index dde10a795..b8e737256 100644 --- a/button.go +++ b/button.go @@ -10,7 +10,7 @@ import ( "fmt" "unsafe" - "github.com/lxn/win" + "github.com/xlplbo/win" ) type clickable interface { diff --git a/canvas.go b/canvas.go index 581a4a1ff..9a30ad260 100644 --- a/canvas.go +++ b/canvas.go @@ -11,7 +11,7 @@ import ( "unicode/utf8" "unsafe" - "github.com/lxn/win" + "github.com/xlplbo/win" ) // DrawText format flags diff --git a/checkbox.go b/checkbox.go index 701549b08..141adb9de 100644 --- a/checkbox.go +++ b/checkbox.go @@ -9,7 +9,7 @@ package walk import ( "strconv" - "github.com/lxn/win" + "github.com/xlplbo/win" ) type CheckState int diff --git a/clipboard.go b/clipboard.go index 39d7ed5a4..2c9cf4624 100644 --- a/clipboard.go +++ b/clipboard.go @@ -10,7 +10,7 @@ import ( "syscall" "unsafe" - "github.com/lxn/win" + "github.com/xlplbo/win" ) const clipboardWindowClass = `\o/ Walk_Clipboard_Class \o/` diff --git a/combobox.go b/combobox.go index 9a4f25298..b83e6d6dd 100644 --- a/combobox.go +++ b/combobox.go @@ -15,7 +15,7 @@ import ( "time" "unsafe" - "github.com/lxn/win" + "github.com/xlplbo/win" ) type ComboBox struct { diff --git a/commondialogs.go b/commondialogs.go index 804716dee..2367704e6 100644 --- a/commondialogs.go +++ b/commondialogs.go @@ -11,10 +11,8 @@ import ( "path/filepath" "syscall" "unsafe" -) -import ( - "github.com/lxn/win" + "github.com/xlplbo/win" ) type FileDialog struct { diff --git a/composite.go b/composite.go index 915b3914d..42ce22fa6 100644 --- a/composite.go +++ b/composite.go @@ -7,7 +7,7 @@ package walk import ( - "github.com/lxn/win" + "github.com/xlplbo/win" ) const compositeWindowClass = `\o/ Walk_Composite_Class \o/` diff --git a/container.go b/container.go index 1ca3763ac..a391986f3 100644 --- a/container.go +++ b/container.go @@ -11,7 +11,7 @@ import ( "time" "unsafe" - "github.com/lxn/win" + "github.com/xlplbo/win" ) type Container interface { diff --git a/cursor.go b/cursor.go index abed1a887..5193dffe7 100644 --- a/cursor.go +++ b/cursor.go @@ -8,10 +8,8 @@ package walk import ( "image" -) -import ( - "github.com/lxn/win" + "github.com/xlplbo/win" ) type Cursor interface { diff --git a/customwidget.go b/customwidget.go index d522cc87b..537fad006 100644 --- a/customwidget.go +++ b/customwidget.go @@ -9,7 +9,7 @@ package walk import ( "unsafe" - "github.com/lxn/win" + "github.com/xlplbo/win" ) const customWidgetWindowClass = `\o/ Walk_CustomWidget_Class \o/` diff --git a/dateedit.go b/dateedit.go index f05d40451..cbeacaa0c 100644 --- a/dateedit.go +++ b/dateedit.go @@ -12,7 +12,7 @@ import ( "time" "unsafe" - "github.com/lxn/win" + "github.com/xlplbo/win" ) type DateEdit struct { diff --git a/declarative/accessibility.go b/declarative/accessibility.go index eeffda7b5..f5b0a1918 100644 --- a/declarative/accessibility.go +++ b/declarative/accessibility.go @@ -7,7 +7,7 @@ package declarative import ( - "github.com/lxn/walk" + "github.com/xlplbo/walk" ) // AccState enum defines the state of the window/control diff --git a/declarative/action.go b/declarative/action.go index fabcc73cd..74b65a18e 100644 --- a/declarative/action.go +++ b/declarative/action.go @@ -9,7 +9,7 @@ package declarative import ( "fmt" - "github.com/lxn/walk" + "github.com/xlplbo/walk" ) type Shortcut struct { diff --git a/declarative/brush.go b/declarative/brush.go index d928f597a..da51f5f04 100644 --- a/declarative/brush.go +++ b/declarative/brush.go @@ -9,7 +9,7 @@ package declarative import ( "strconv" - "github.com/lxn/walk" + "github.com/xlplbo/walk" ) type TransparentBrush struct { diff --git a/declarative/builder.go b/declarative/builder.go index ea0476713..855e2349d 100644 --- a/declarative/builder.go +++ b/declarative/builder.go @@ -13,7 +13,7 @@ import ( "regexp" "strings" - "github.com/lxn/walk" + "github.com/xlplbo/walk" "gopkg.in/Knetic/govaluate.v3" ) diff --git a/declarative/checkbox.go b/declarative/checkbox.go index cd440b0dd..aa7d00432 100644 --- a/declarative/checkbox.go +++ b/declarative/checkbox.go @@ -7,7 +7,7 @@ package declarative import ( - "github.com/lxn/walk" + "github.com/xlplbo/walk" ) type CheckBox struct { diff --git a/declarative/combobox.go b/declarative/combobox.go index 209a263b1..f6f4fbd16 100644 --- a/declarative/combobox.go +++ b/declarative/combobox.go @@ -8,10 +8,8 @@ package declarative import ( "errors" -) -import ( - "github.com/lxn/walk" + "github.com/xlplbo/walk" ) type ComboBox struct { diff --git a/declarative/composite.go b/declarative/composite.go index 206af207f..4f23061fa 100644 --- a/declarative/composite.go +++ b/declarative/composite.go @@ -7,8 +7,8 @@ package declarative import ( - "github.com/lxn/walk" - "github.com/lxn/win" + "github.com/xlplbo/walk" + "github.com/xlplbo/win" ) type Composite struct { diff --git a/declarative/customwidget.go b/declarative/customwidget.go index 0025ea753..f19f31f35 100644 --- a/declarative/customwidget.go +++ b/declarative/customwidget.go @@ -7,7 +7,7 @@ package declarative import ( - "github.com/lxn/walk" + "github.com/xlplbo/walk" ) type PaintMode int diff --git a/declarative/databinder.go b/declarative/databinder.go index 665ae2108..2b5087bbd 100644 --- a/declarative/databinder.go +++ b/declarative/databinder.go @@ -9,7 +9,7 @@ package declarative import ( "time" - "github.com/lxn/walk" + "github.com/xlplbo/walk" ) type DataBinder struct { diff --git a/declarative/dateedit.go b/declarative/dateedit.go index 8186b312c..9aa944351 100644 --- a/declarative/dateedit.go +++ b/declarative/dateedit.go @@ -8,10 +8,8 @@ package declarative import ( "time" -) -import ( - "github.com/lxn/walk" + "github.com/xlplbo/walk" ) type DateEdit struct { diff --git a/declarative/datelabel.go b/declarative/datelabel.go index c4f879276..28b05aa12 100644 --- a/declarative/datelabel.go +++ b/declarative/datelabel.go @@ -7,7 +7,7 @@ package declarative import ( - "github.com/lxn/walk" + "github.com/xlplbo/walk" ) type DateLabel struct { diff --git a/declarative/dialog.go b/declarative/dialog.go index e0c338134..1149551df 100644 --- a/declarative/dialog.go +++ b/declarative/dialog.go @@ -7,7 +7,7 @@ package declarative import ( - "github.com/lxn/walk" + "github.com/xlplbo/walk" ) type Dialog struct { diff --git a/declarative/font.go b/declarative/font.go index ecd81363b..af41d5518 100644 --- a/declarative/font.go +++ b/declarative/font.go @@ -7,7 +7,7 @@ package declarative import ( - "github.com/lxn/walk" + "github.com/xlplbo/walk" ) type Font struct { diff --git a/declarative/gradientcomposite.go b/declarative/gradientcomposite.go index cbdb3274a..82b5695d2 100644 --- a/declarative/gradientcomposite.go +++ b/declarative/gradientcomposite.go @@ -7,8 +7,8 @@ package declarative import ( - "github.com/lxn/walk" - "github.com/lxn/win" + "github.com/xlplbo/walk" + "github.com/xlplbo/win" ) type GradientComposite struct { diff --git a/declarative/groupbox.go b/declarative/groupbox.go index 11de5d40e..0bb93e576 100644 --- a/declarative/groupbox.go +++ b/declarative/groupbox.go @@ -7,7 +7,7 @@ package declarative import ( - "github.com/lxn/walk" + "github.com/xlplbo/walk" ) type GroupBox struct { diff --git a/declarative/imageview.go b/declarative/imageview.go index 3b36c6324..8597ebd74 100644 --- a/declarative/imageview.go +++ b/declarative/imageview.go @@ -7,7 +7,7 @@ package declarative import ( - "github.com/lxn/walk" + "github.com/xlplbo/walk" ) type ImageViewMode int diff --git a/declarative/interfaces.go b/declarative/interfaces.go index bfdfb598e..559566e71 100644 --- a/declarative/interfaces.go +++ b/declarative/interfaces.go @@ -9,7 +9,7 @@ package declarative import ( "path/filepath" - "github.com/lxn/walk" + "github.com/xlplbo/walk" ) func tr(source string, context ...string) string { diff --git a/declarative/label.go b/declarative/label.go index 520b6b269..119fd6580 100644 --- a/declarative/label.go +++ b/declarative/label.go @@ -7,7 +7,7 @@ package declarative import ( - "github.com/lxn/walk" + "github.com/xlplbo/walk" ) type EllipsisMode int diff --git a/declarative/layouts.go b/declarative/layouts.go index 158a0cbb1..1da541720 100644 --- a/declarative/layouts.go +++ b/declarative/layouts.go @@ -9,7 +9,7 @@ package declarative import ( "errors" - "github.com/lxn/walk" + "github.com/xlplbo/walk" ) type Orientation byte diff --git a/declarative/lineedit.go b/declarative/lineedit.go index 1a7f5ef4f..1239a45a8 100644 --- a/declarative/lineedit.go +++ b/declarative/lineedit.go @@ -7,7 +7,7 @@ package declarative import ( - "github.com/lxn/walk" + "github.com/xlplbo/walk" ) type CaseMode uint32 diff --git a/declarative/linklabel.go b/declarative/linklabel.go index 0a6ed02d8..d9f9e1fc2 100644 --- a/declarative/linklabel.go +++ b/declarative/linklabel.go @@ -7,7 +7,7 @@ package declarative import ( - "github.com/lxn/walk" + "github.com/xlplbo/walk" ) type LinkLabel struct { diff --git a/declarative/listbox.go b/declarative/listbox.go index 5654a8bb8..55699c24b 100644 --- a/declarative/listbox.go +++ b/declarative/listbox.go @@ -8,11 +8,9 @@ package declarative import ( "errors" -) -import ( - "github.com/lxn/walk" - "github.com/lxn/win" + "github.com/xlplbo/walk" + "github.com/xlplbo/win" ) type ListBox struct { diff --git a/declarative/mainwindow.go b/declarative/mainwindow.go index 2e10d9c5a..13d093dd7 100644 --- a/declarative/mainwindow.go +++ b/declarative/mainwindow.go @@ -6,7 +6,7 @@ package declarative -import "github.com/lxn/walk" +import "github.com/xlplbo/walk" type MainWindow struct { // Window diff --git a/declarative/numberedit.go b/declarative/numberedit.go index ab92460aa..e141e8423 100644 --- a/declarative/numberedit.go +++ b/declarative/numberedit.go @@ -7,7 +7,7 @@ package declarative import ( - "github.com/lxn/walk" + "github.com/xlplbo/walk" ) type NumberEdit struct { diff --git a/declarative/numberlabel.go b/declarative/numberlabel.go index dd168e2ab..aa0a2006f 100644 --- a/declarative/numberlabel.go +++ b/declarative/numberlabel.go @@ -7,7 +7,7 @@ package declarative import ( - "github.com/lxn/walk" + "github.com/xlplbo/walk" ) type NumberLabel struct { diff --git a/declarative/progressbar.go b/declarative/progressbar.go index fb8177104..d4283a26e 100644 --- a/declarative/progressbar.go +++ b/declarative/progressbar.go @@ -7,7 +7,7 @@ package declarative import ( - "github.com/lxn/walk" + "github.com/xlplbo/walk" ) type ProgressBar struct { diff --git a/declarative/pushbutton.go b/declarative/pushbutton.go index 73dca21d8..f2b34c3f9 100644 --- a/declarative/pushbutton.go +++ b/declarative/pushbutton.go @@ -7,7 +7,7 @@ package declarative import ( - "github.com/lxn/walk" + "github.com/xlplbo/walk" ) type PushButton struct { diff --git a/declarative/radiobutton.go b/declarative/radiobutton.go index da5e34d31..94a9aca25 100644 --- a/declarative/radiobutton.go +++ b/declarative/radiobutton.go @@ -7,7 +7,7 @@ package declarative import ( - "github.com/lxn/walk" + "github.com/xlplbo/walk" ) type RadioButton struct { diff --git a/declarative/radiobuttongroup.go b/declarative/radiobuttongroup.go index ff0a2cdd6..b14030937 100644 --- a/declarative/radiobuttongroup.go +++ b/declarative/radiobuttongroup.go @@ -9,10 +9,8 @@ package declarative import ( "bytes" "errors" -) -import ( - "github.com/lxn/walk" + "github.com/xlplbo/walk" ) type RadioButtonGroup struct { diff --git a/declarative/radiobuttongroupbox.go b/declarative/radiobuttongroupbox.go index 966cc0439..7bf79a6e2 100644 --- a/declarative/radiobuttongroupbox.go +++ b/declarative/radiobuttongroupbox.go @@ -7,7 +7,7 @@ package declarative import ( - "github.com/lxn/walk" + "github.com/xlplbo/walk" ) type RadioButtonGroupBox struct { diff --git a/declarative/scrollview.go b/declarative/scrollview.go index 7e73acb56..47fd921fa 100644 --- a/declarative/scrollview.go +++ b/declarative/scrollview.go @@ -7,7 +7,7 @@ package declarative import ( - "github.com/lxn/walk" + "github.com/xlplbo/walk" ) type ScrollView struct { diff --git a/declarative/separator.go b/declarative/separator.go index 7a9492af1..4bc9660c9 100644 --- a/declarative/separator.go +++ b/declarative/separator.go @@ -7,7 +7,7 @@ package declarative import ( - "github.com/lxn/walk" + "github.com/xlplbo/walk" ) type HSeparator struct { @@ -69,7 +69,7 @@ func (s HSeparator) Create(builder *Builder) error { type VSeparator struct { // Window - Accessibility Accessibility + Accessibility Accessibility ContextMenuItems []MenuItem Enabled Property Font Font diff --git a/declarative/slider.go b/declarative/slider.go index b85de5fcb..8132cb746 100644 --- a/declarative/slider.go +++ b/declarative/slider.go @@ -7,7 +7,7 @@ package declarative import ( - "github.com/lxn/walk" + "github.com/xlplbo/walk" ) type Slider struct { diff --git a/declarative/spacer.go b/declarative/spacer.go index 3ac593528..a090b74db 100644 --- a/declarative/spacer.go +++ b/declarative/spacer.go @@ -7,7 +7,7 @@ package declarative import ( - "github.com/lxn/walk" + "github.com/xlplbo/walk" ) type HSpacer struct { diff --git a/declarative/splitbutton.go b/declarative/splitbutton.go index 982751b9f..fa3d24f10 100644 --- a/declarative/splitbutton.go +++ b/declarative/splitbutton.go @@ -7,7 +7,7 @@ package declarative import ( - "github.com/lxn/walk" + "github.com/xlplbo/walk" ) type SplitButton struct { diff --git a/declarative/splitter.go b/declarative/splitter.go index f71e6e106..1e7495e54 100644 --- a/declarative/splitter.go +++ b/declarative/splitter.go @@ -7,7 +7,7 @@ package declarative import ( - "github.com/lxn/walk" + "github.com/xlplbo/walk" ) type HSplitter struct { diff --git a/declarative/tableview.go b/declarative/tableview.go index dd8866553..768114d45 100644 --- a/declarative/tableview.go +++ b/declarative/tableview.go @@ -7,8 +7,8 @@ package declarative import ( - "github.com/lxn/walk" - "github.com/lxn/win" + "github.com/xlplbo/walk" + "github.com/xlplbo/win" ) type TableView struct { diff --git a/declarative/tableviewcolumn.go b/declarative/tableviewcolumn.go index 27212b5be..b4301e8bb 100644 --- a/declarative/tableviewcolumn.go +++ b/declarative/tableviewcolumn.go @@ -7,7 +7,7 @@ package declarative import ( - "github.com/lxn/walk" + "github.com/xlplbo/walk" ) type Alignment1D uint diff --git a/declarative/tabpage.go b/declarative/tabpage.go index b1b8acbea..a5d3ee952 100644 --- a/declarative/tabpage.go +++ b/declarative/tabpage.go @@ -7,7 +7,7 @@ package declarative import ( - "github.com/lxn/walk" + "github.com/xlplbo/walk" ) type TabPage struct { diff --git a/declarative/tabwidget.go b/declarative/tabwidget.go index fce998317..9a9f35051 100644 --- a/declarative/tabwidget.go +++ b/declarative/tabwidget.go @@ -7,7 +7,7 @@ package declarative import ( - "github.com/lxn/walk" + "github.com/xlplbo/walk" ) type TabWidget struct { diff --git a/declarative/textedit.go b/declarative/textedit.go index 81cae50e6..391485ace 100644 --- a/declarative/textedit.go +++ b/declarative/textedit.go @@ -7,8 +7,8 @@ package declarative import ( - "github.com/lxn/walk" - "github.com/lxn/win" + "github.com/xlplbo/walk" + "github.com/xlplbo/win" ) type TextEdit struct { diff --git a/declarative/textlabel.go b/declarative/textlabel.go index b256364fb..15e5f9c43 100644 --- a/declarative/textlabel.go +++ b/declarative/textlabel.go @@ -7,7 +7,7 @@ package declarative import ( - "github.com/lxn/walk" + "github.com/xlplbo/walk" ) type Alignment2D uint diff --git a/declarative/toolbar.go b/declarative/toolbar.go index 635e921c4..02d4fce87 100644 --- a/declarative/toolbar.go +++ b/declarative/toolbar.go @@ -7,7 +7,7 @@ package declarative import ( - "github.com/lxn/walk" + "github.com/xlplbo/walk" ) type ToolBarButtonStyle int diff --git a/declarative/toolbutton.go b/declarative/toolbutton.go index 7a598f809..2978e073a 100644 --- a/declarative/toolbutton.go +++ b/declarative/toolbutton.go @@ -7,7 +7,7 @@ package declarative import ( - "github.com/lxn/walk" + "github.com/xlplbo/walk" ) type ToolButton struct { diff --git a/declarative/treeview.go b/declarative/treeview.go index bb4a1f56e..f5582ae42 100644 --- a/declarative/treeview.go +++ b/declarative/treeview.go @@ -7,7 +7,7 @@ package declarative import ( - "github.com/lxn/walk" + "github.com/xlplbo/walk" ) type TreeView struct { diff --git a/declarative/validators.go b/declarative/validators.go index 7f6e8e661..16f9974cd 100644 --- a/declarative/validators.go +++ b/declarative/validators.go @@ -7,7 +7,7 @@ package declarative import ( - "github.com/lxn/walk" + "github.com/xlplbo/walk" ) type ValidatorRef struct { diff --git a/declarative/webview.go b/declarative/webview.go index 2b141977d..9adc0862a 100644 --- a/declarative/webview.go +++ b/declarative/webview.go @@ -7,7 +7,7 @@ package declarative import ( - "github.com/lxn/walk" + "github.com/xlplbo/walk" ) type WebView struct { diff --git a/dialog.go b/dialog.go index 590f898cb..148132c91 100644 --- a/dialog.go +++ b/dialog.go @@ -9,7 +9,7 @@ package walk import ( "unsafe" - "github.com/lxn/win" + "github.com/xlplbo/win" ) const ( diff --git a/dropfilesevent.go b/dropfilesevent.go index 22fd8ebe1..97679e31f 100644 --- a/dropfilesevent.go +++ b/dropfilesevent.go @@ -9,7 +9,7 @@ package walk import ( "syscall" - "github.com/lxn/win" + "github.com/xlplbo/win" ) type dropFilesEventHandlerInfo struct { diff --git a/error.go b/error.go index 656ddedba..69dad66ee 100644 --- a/error.go +++ b/error.go @@ -10,10 +10,8 @@ import ( "fmt" "log" "runtime/debug" -) -import ( - "github.com/lxn/win" + "github.com/xlplbo/win" ) var ( diff --git a/examples/actions/actions.go b/examples/actions/actions.go index 7314821a6..ccb2f7427 100644 --- a/examples/actions/actions.go +++ b/examples/actions/actions.go @@ -6,11 +6,10 @@ package main import ( "log" -) -import ( - "github.com/lxn/walk" - . "github.com/lxn/walk/declarative" + "github.com/xlplbo/walk" + + . "github.com/xlplbo/walk/declarative" ) var isSpecialMode = walk.NewMutableCondition() diff --git a/examples/clipboard/clipboard.go b/examples/clipboard/clipboard.go index e6c4fb136..44ab742cc 100644 --- a/examples/clipboard/clipboard.go +++ b/examples/clipboard/clipboard.go @@ -6,11 +6,10 @@ package main import ( "log" -) -import ( - "github.com/lxn/walk" - . "github.com/lxn/walk/declarative" + "github.com/xlplbo/walk" + + . "github.com/xlplbo/walk/declarative" ) func main() { diff --git a/examples/databinding/databinding.go b/examples/databinding/databinding.go index 42ef70924..8e5c25203 100644 --- a/examples/databinding/databinding.go +++ b/examples/databinding/databinding.go @@ -9,9 +9,9 @@ import ( "log" "time" - "github.com/lxn/walk" + "github.com/xlplbo/walk" - . "github.com/lxn/walk/declarative" + . "github.com/xlplbo/walk/declarative" ) func main() { diff --git a/examples/drawing/drawing.go b/examples/drawing/drawing.go index 3c19201f4..2af881a8b 100644 --- a/examples/drawing/drawing.go +++ b/examples/drawing/drawing.go @@ -7,11 +7,10 @@ package main import ( "log" "math" -) -import ( - "github.com/lxn/walk" - . "github.com/lxn/walk/declarative" + "github.com/xlplbo/walk" + + . "github.com/xlplbo/walk/declarative" ) func main() { diff --git a/examples/dropfiles/dropfiles.go b/examples/dropfiles/dropfiles.go index 9c0da7679..8ae0ad8c9 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/xlplbo/walk" + . "github.com/xlplbo/walk/declarative" ) func main() { diff --git a/examples/externalwidgets/externalwidgets.go b/examples/externalwidgets/externalwidgets.go index a7ebd0072..a282249f8 100644 --- a/examples/externalwidgets/externalwidgets.go +++ b/examples/externalwidgets/externalwidgets.go @@ -7,10 +7,10 @@ package main import ( "log" - "github.com/lxn/walk" + "github.com/xlplbo/walk" - . "github.com/lxn/walk/declarative" - "github.com/lxn/win" + . "github.com/xlplbo/walk/declarative" + "github.com/xlplbo/win" ) const myWidgetWindowClass = "MyWidget Class" diff --git a/examples/filebrowser/filebrowser.go b/examples/filebrowser/filebrowser.go index c1a93b1b9..472bb8766 100644 --- a/examples/filebrowser/filebrowser.go +++ b/examples/filebrowser/filebrowser.go @@ -9,11 +9,10 @@ import ( "os" "path/filepath" "time" -) -import ( - "github.com/lxn/walk" - . "github.com/lxn/walk/declarative" + "github.com/xlplbo/walk" + + . "github.com/xlplbo/walk/declarative" ) type Directory struct { diff --git a/examples/gradientcomposite/gradientcomposite.go b/examples/gradientcomposite/gradientcomposite.go index 60f451022..0d4359aea 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/xlplbo/walk" + . "github.com/xlplbo/walk/declarative" ) func main() { diff --git a/examples/imageicon/main.go b/examples/imageicon/main.go index f40dcf070..3f3010008 100644 --- a/examples/imageicon/main.go +++ b/examples/imageicon/main.go @@ -9,11 +9,10 @@ import ( "image/color" "image/draw" "log" -) -import ( - "github.com/lxn/walk" - . "github.com/lxn/walk/declarative" + "github.com/xlplbo/walk" + + . "github.com/xlplbo/walk/declarative" ) func main() { diff --git a/examples/imageview/imageview.go b/examples/imageview/imageview.go index a863790a5..c3179d4a3 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/xlplbo/walk" + . "github.com/xlplbo/walk/declarative" ) func main() { diff --git a/examples/imageviewer/imageviewer.go b/examples/imageviewer/imageviewer.go index 844d2ba1f..53f83fad9 100644 --- a/examples/imageviewer/imageviewer.go +++ b/examples/imageviewer/imageviewer.go @@ -8,11 +8,10 @@ import ( "log" "path" "strings" -) -import ( - "github.com/lxn/walk" - . "github.com/lxn/walk/declarative" + "github.com/xlplbo/walk" + + . "github.com/xlplbo/walk/declarative" ) func main() { diff --git a/examples/linklabel/linklabel.go b/examples/linklabel/linklabel.go index bd0402846..2d93854fa 100644 --- a/examples/linklabel/linklabel.go +++ b/examples/linklabel/linklabel.go @@ -6,11 +6,10 @@ package main import ( "log" -) -import ( - "github.com/lxn/walk" - . "github.com/lxn/walk/declarative" + "github.com/xlplbo/walk" + + . "github.com/xlplbo/walk/declarative" ) func main() { @@ -21,7 +20,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..13ce01177 100644 --- a/examples/listbox/listbox.go +++ b/examples/listbox/listbox.go @@ -9,11 +9,10 @@ import ( "log" "os" "strings" -) -import ( - "github.com/lxn/walk" - . "github.com/lxn/walk/declarative" + "github.com/xlplbo/walk" + + . "github.com/xlplbo/walk/declarative" ) func main() { diff --git a/examples/listbox_ownerdrawing/listbox_ownerdrawing.go b/examples/listbox_ownerdrawing/listbox_ownerdrawing.go index 032addf4a..18b8f0c34 100644 --- a/examples/listbox_ownerdrawing/listbox_ownerdrawing.go +++ b/examples/listbox_ownerdrawing/listbox_ownerdrawing.go @@ -10,9 +10,9 @@ import ( "strings" "time" - "github.com/lxn/walk" - . "github.com/lxn/walk/declarative" - "github.com/lxn/win" + "github.com/xlplbo/walk" + . "github.com/xlplbo/walk/declarative" + "github.com/xlplbo/win" ) func main() { diff --git a/examples/logview/logview.go b/examples/logview/logview.go index 42d1e4e97..2b8001bf4 100644 --- a/examples/logview/logview.go +++ b/examples/logview/logview.go @@ -4,8 +4,8 @@ package main import ( - "github.com/lxn/walk" - "github.com/lxn/win" + "github.com/xlplbo/walk" + "github.com/xlplbo/win" ) type LogView struct { diff --git a/examples/logview/logviewapp.go b/examples/logview/logviewapp.go index 948293f2a..ae5cc9ec2 100644 --- a/examples/logview/logviewapp.go +++ b/examples/logview/logviewapp.go @@ -7,11 +7,10 @@ package main import ( "log" "time" -) -import ( - "github.com/lxn/walk" - . "github.com/lxn/walk/declarative" + "github.com/xlplbo/walk" + + . "github.com/xlplbo/walk/declarative" ) func main() { diff --git a/examples/multiplepages/main.go b/examples/multiplepages/main.go index 4108492fc..929286121 100644 --- a/examples/multiplepages/main.go +++ b/examples/multiplepages/main.go @@ -6,11 +6,10 @@ package main import ( "bytes" -) -import ( - "github.com/lxn/walk" - . "github.com/lxn/walk/declarative" + "github.com/xlplbo/walk" + + . "github.com/xlplbo/walk/declarative" ) func main() { diff --git a/examples/multiplepages/multipagemainwindow.go b/examples/multiplepages/multipagemainwindow.go index 9cb8809bb..1547a5210 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/xlplbo/walk" + . "github.com/xlplbo/walk/declarative" ) type MultiPageMainWindowConfig struct { diff --git a/examples/notifyicon/notifyicon.go b/examples/notifyicon/notifyicon.go index d54b86aa0..7a13613d3 100644 --- a/examples/notifyicon/notifyicon.go +++ b/examples/notifyicon/notifyicon.go @@ -6,10 +6,8 @@ package main import ( "log" -) -import ( - "github.com/lxn/walk" + "github.com/xlplbo/walk" ) func main() { diff --git a/examples/progressindicator/dialog_ui.go b/examples/progressindicator/dialog_ui.go index 24bb0c844..866d137a2 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/xlplbo/walk" ) type myDialogUI struct { diff --git a/examples/progressindicator/pi.go b/examples/progressindicator/pi.go index 9794786dc..0b2abc692 100644 --- a/examples/progressindicator/pi.go +++ b/examples/progressindicator/pi.go @@ -8,10 +8,8 @@ import ( "fmt" "log" "time" -) -import ( - "github.com/lxn/walk" + "github.com/xlplbo/walk" ) func main() { diff --git a/examples/radiobutton/radiobutton.go b/examples/radiobutton/radiobutton.go index 0622a572c..0abbf343a 100644 --- a/examples/radiobutton/radiobutton.go +++ b/examples/radiobutton/radiobutton.go @@ -6,10 +6,8 @@ package main import ( "fmt" -) -import ( - . "github.com/lxn/walk/declarative" + . "github.com/xlplbo/walk/declarative" ) type Foo struct { diff --git a/examples/settings/settings.go b/examples/settings/settings.go index 946874030..6dacc9ba0 100644 --- a/examples/settings/settings.go +++ b/examples/settings/settings.go @@ -9,11 +9,10 @@ import ( "math/rand" "strings" "time" -) -import ( - "github.com/lxn/walk" - . "github.com/lxn/walk/declarative" + "github.com/xlplbo/walk" + + . "github.com/xlplbo/walk/declarative" ) func main() { diff --git a/examples/slider/slider.go b/examples/slider/slider.go index 9405bbe9e..7eb62fcc7 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/xlplbo/walk" + . "github.com/xlplbo/walk/declarative" ) func main() { diff --git a/examples/statusbar/statusbar.go b/examples/statusbar/statusbar.go index 857ed0d86..47d5e34ea 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/xlplbo/walk" + . "github.com/xlplbo/walk/declarative" ) func main() { diff --git a/examples/tableview/tableview.go b/examples/tableview/tableview.go index b5ca4b910..166909f76 100644 --- a/examples/tableview/tableview.go +++ b/examples/tableview/tableview.go @@ -10,11 +10,10 @@ import ( "sort" "strings" "time" -) -import ( - "github.com/lxn/walk" - . "github.com/lxn/walk/declarative" + "github.com/xlplbo/walk" + + . "github.com/xlplbo/walk/declarative" ) type Foo struct { diff --git a/examples/webview/webview.go b/examples/webview/webview.go index be4fe794e..df46fb0e1 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/xlplbo/walk" + . "github.com/xlplbo/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/xlplbo/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..8d915d6e7 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/xlplbo/walk" + . "github.com/xlplbo/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/xlplbo/walk", ShortcutsEnabled: true, NativeContextMenuEnabled: true, OnNavigating: mainWin.webView_OnNavigating, diff --git a/flowlayout.go b/flowlayout.go index 1c202d9fe..73c803c5b 100644 --- a/flowlayout.go +++ b/flowlayout.go @@ -7,7 +7,7 @@ package walk import ( - "github.com/lxn/win" + "github.com/xlplbo/win" ) type FlowLayout struct { diff --git a/font.go b/font.go index f893dc2a0..6fe6ba459 100644 --- a/font.go +++ b/font.go @@ -8,10 +8,8 @@ package walk import ( "syscall" -) -import ( - "github.com/lxn/win" + "github.com/xlplbo/win" ) type FontStyle byte diff --git a/fontresource.go b/fontresource.go index a3ce0f607..1d751ef17 100644 --- a/fontresource.go +++ b/fontresource.go @@ -7,8 +7,9 @@ package walk import ( - "github.com/lxn/win" "syscall" + + "github.com/xlplbo/win" ) // FontMemResource represents a font resource loaded into memory from diff --git a/form.go b/form.go index c04e16348..3f9337024 100644 --- a/form.go +++ b/form.go @@ -14,7 +14,7 @@ import ( "time" "unsafe" - "github.com/lxn/win" + "github.com/xlplbo/win" ) type CloseReason byte diff --git a/gradientcomposite.go b/gradientcomposite.go index 61e50dc0e..fb9aca47d 100644 --- a/gradientcomposite.go +++ b/gradientcomposite.go @@ -9,7 +9,7 @@ package walk import ( "unsafe" - "github.com/lxn/win" + "github.com/xlplbo/win" ) type GradientComposite struct { diff --git a/groupbox.go b/groupbox.go index 51e62d707..7620ec3d0 100644 --- a/groupbox.go +++ b/groupbox.go @@ -10,7 +10,7 @@ import ( "syscall" "unsafe" - "github.com/lxn/win" + "github.com/xlplbo/win" ) const groupBoxWindowClass = `\o/ Walk_GroupBox_Class \o/` diff --git a/icon.go b/icon.go index 6de5786d4..0c5de98a6 100644 --- a/icon.go +++ b/icon.go @@ -14,7 +14,7 @@ import ( "golang.org/x/sys/windows" - "github.com/lxn/win" + "github.com/xlplbo/win" ) // Icon is a bitmap that supports transparency and combining multiple diff --git a/image.go b/image.go index beec259d0..f2eadf967 100644 --- a/image.go +++ b/image.go @@ -10,7 +10,7 @@ import ( "strconv" "strings" - "github.com/lxn/win" + "github.com/xlplbo/win" ) type Image interface { diff --git a/imagelist.go b/imagelist.go index 8ef94e9dd..346a8d23e 100644 --- a/imagelist.go +++ b/imagelist.go @@ -10,7 +10,7 @@ import ( "syscall" "unsafe" - "github.com/lxn/win" + "github.com/xlplbo/win" ) type ImageList struct { diff --git a/imageview.go b/imageview.go index c98b87213..be40e879b 100644 --- a/imageview.go +++ b/imageview.go @@ -9,7 +9,7 @@ package walk import ( "math" - "github.com/lxn/win" + "github.com/xlplbo/win" ) type ImageViewMode int diff --git a/keyboard.go b/keyboard.go index 450391d9c..b8f13b53a 100644 --- a/keyboard.go +++ b/keyboard.go @@ -8,10 +8,8 @@ package walk import ( "bytes" -) -import ( - "github.com/lxn/win" + "github.com/xlplbo/win" ) type Key uint16 diff --git a/label.go b/label.go index 67cce2dd4..e65092aa0 100644 --- a/label.go +++ b/label.go @@ -6,7 +6,7 @@ package walk -import "github.com/lxn/win" +import "github.com/xlplbo/win" type EllipsisMode int diff --git a/layout.go b/layout.go index 0b34d5673..a4175ff18 100644 --- a/layout.go +++ b/layout.go @@ -9,7 +9,7 @@ package walk import ( "sync" - "github.com/lxn/win" + "github.com/xlplbo/win" ) func createLayoutItemForWidget(widget Widget) LayoutItem { diff --git a/lineedit.go b/lineedit.go index 36604271f..c286a7451 100644 --- a/lineedit.go +++ b/lineedit.go @@ -9,10 +9,8 @@ package walk import ( "syscall" "unsafe" -) -import ( - "github.com/lxn/win" + "github.com/xlplbo/win" ) type CaseMode uint32 diff --git a/linklabel.go b/linklabel.go index 32c63c833..bab09e777 100644 --- a/linklabel.go +++ b/linklabel.go @@ -10,7 +10,7 @@ import ( "syscall" "unsafe" - "github.com/lxn/win" + "github.com/xlplbo/win" ) type LinkLabel struct { diff --git a/listbox.go b/listbox.go index 8ebf8f3a0..5def0aa49 100644 --- a/listbox.go +++ b/listbox.go @@ -14,7 +14,7 @@ import ( "time" "unsafe" - "github.com/lxn/win" + "github.com/xlplbo/win" ) type ListBox struct { diff --git a/mainloop_cgo.go b/mainloop_cgo.go index 5a21feef6..8fa2a88ff 100644 --- a/mainloop_cgo.go +++ b/mainloop_cgo.go @@ -9,7 +9,7 @@ package walk import ( "unsafe" - "github.com/lxn/win" + "github.com/xlplbo/win" ) // #include diff --git a/mainloop_default.go b/mainloop_default.go index 389914fa2..a4764aaf3 100644 --- a/mainloop_default.go +++ b/mainloop_default.go @@ -9,7 +9,7 @@ package walk import ( "unsafe" - "github.com/lxn/win" + "github.com/xlplbo/win" ) func (fb *FormBase) mainLoop() int { diff --git a/mainwindow.go b/mainwindow.go index 1b8c746ae..a0a8a7e87 100644 --- a/mainwindow.go +++ b/mainwindow.go @@ -8,10 +8,8 @@ package walk import ( "unsafe" -) -import ( - "github.com/lxn/win" + "github.com/xlplbo/win" ) const mainWindowWindowClass = `\o/ Walk_MainWindow_Class \o/` diff --git a/menu.go b/menu.go index f4c2d44d1..351c9d411 100644 --- a/menu.go +++ b/menu.go @@ -11,7 +11,7 @@ import ( "syscall" "unsafe" - "github.com/lxn/win" + "github.com/xlplbo/win" ) type Menu struct { diff --git a/messagebox.go b/messagebox.go index 5386d3197..4fe9e8811 100644 --- a/messagebox.go +++ b/messagebox.go @@ -9,10 +9,8 @@ package walk import ( "strings" "syscall" -) -import ( - "github.com/lxn/win" + "github.com/xlplbo/win" ) type MsgBoxStyle uint diff --git a/metafile.go b/metafile.go index b2d087f3e..e29e23827 100644 --- a/metafile.go +++ b/metafile.go @@ -11,7 +11,7 @@ import ( "syscall" "unsafe" - "github.com/lxn/win" + "github.com/xlplbo/win" ) const milimeterPerMeter float64 = 1000.0 diff --git a/models.go b/models.go index 8fa9b2c94..b99de1384 100644 --- a/models.go +++ b/models.go @@ -9,7 +9,7 @@ package walk import ( "syscall" - "github.com/lxn/win" + "github.com/xlplbo/win" ) // BindingValueProvider is the interface that a model must implement to support diff --git a/mouseevent.go b/mouseevent.go index 81ab1e565..0764cf0a0 100644 --- a/mouseevent.go +++ b/mouseevent.go @@ -7,7 +7,7 @@ package walk import ( - "github.com/lxn/win" + "github.com/xlplbo/win" ) type MouseButton int diff --git a/notifyicon.go b/notifyicon.go index 5daabf575..fdcd33250 100644 --- a/notifyicon.go +++ b/notifyicon.go @@ -10,7 +10,7 @@ import ( "syscall" "unsafe" - "github.com/lxn/win" + "github.com/xlplbo/win" ) var notifyIcons = make(map[*NotifyIcon]bool) diff --git a/numberedit.go b/numberedit.go index d755e30f8..f29a013c4 100644 --- a/numberedit.go +++ b/numberedit.go @@ -15,7 +15,7 @@ import ( "syscall" "unsafe" - "github.com/lxn/win" + "github.com/xlplbo/win" ) const numberEditWindowClass = `\o/ Walk_NumberEdit_Class \o/` diff --git a/path.go b/path.go index 2c4d85f11..1a31fd8e0 100644 --- a/path.go +++ b/path.go @@ -9,7 +9,7 @@ package walk import ( "syscall" - "github.com/lxn/win" + "github.com/xlplbo/win" ) func knownFolderPath(id win.CSIDL) (string, error) { diff --git a/pen.go b/pen.go index d667bc4cb..0b75b52ac 100644 --- a/pen.go +++ b/pen.go @@ -7,7 +7,7 @@ package walk import ( - "github.com/lxn/win" + "github.com/xlplbo/win" ) type PenStyle int diff --git a/point.go b/point.go index 48559973c..7aabcf6da 100644 --- a/point.go +++ b/point.go @@ -6,7 +6,7 @@ package walk -import "github.com/lxn/win" +import "github.com/xlplbo/win" // Point defines 2D coordinate in 1/96" units ot native pixels. type Point struct { diff --git a/progressbar.go b/progressbar.go index 5478b4e58..a98ea01ec 100644 --- a/progressbar.go +++ b/progressbar.go @@ -7,7 +7,7 @@ package walk import ( - "github.com/lxn/win" + "github.com/xlplbo/win" ) type ProgressBar struct { diff --git a/progressindicator.go b/progressindicator.go index 79aaee5ed..55d73a9ba 100644 --- a/progressindicator.go +++ b/progressindicator.go @@ -7,12 +7,10 @@ package walk import ( + "syscall" "unsafe" -) -import ( - "github.com/lxn/win" - "syscall" + "github.com/xlplbo/win" ) type ProgressIndicator struct { diff --git a/pushbutton.go b/pushbutton.go index 6712ac31d..3c284206c 100644 --- a/pushbutton.go +++ b/pushbutton.go @@ -7,7 +7,7 @@ package walk import ( - "github.com/lxn/win" + "github.com/xlplbo/win" ) type PushButton struct { diff --git a/radiobutton.go b/radiobutton.go index f14be820c..034fb2e21 100644 --- a/radiobutton.go +++ b/radiobutton.go @@ -7,7 +7,7 @@ package walk import ( - "github.com/lxn/win" + "github.com/xlplbo/win" ) type RadioButtonGroup struct { diff --git a/rectangle.go b/rectangle.go index 045600ec2..d15811ef9 100644 --- a/rectangle.go +++ b/rectangle.go @@ -7,7 +7,7 @@ package walk import ( - "github.com/lxn/win" + "github.com/xlplbo/win" ) // Rectangle defines upper left corner with width and height region in 1/96" units, or native diff --git a/registry.go b/registry.go index 73357cde9..6c70e644e 100644 --- a/registry.go +++ b/registry.go @@ -9,10 +9,8 @@ package walk import ( "syscall" "unsafe" -) -import ( - "github.com/lxn/win" + "github.com/xlplbo/win" ) type RegistryKey struct { diff --git a/scrollview.go b/scrollview.go index a254ff201..34917e612 100644 --- a/scrollview.go +++ b/scrollview.go @@ -9,7 +9,7 @@ package walk import ( "unsafe" - "github.com/lxn/win" + "github.com/xlplbo/win" ) const scrollViewWindowClass = `\o/ Walk_ScrollView_Class \o/` diff --git a/separator.go b/separator.go index e7cd64dd9..6ca2efc0a 100644 --- a/separator.go +++ b/separator.go @@ -7,7 +7,7 @@ package walk import ( - "github.com/lxn/win" + "github.com/xlplbo/win" ) type Separator struct { diff --git a/size.go b/size.go index 95e032203..5e9e8450d 100644 --- a/size.go +++ b/size.go @@ -6,7 +6,7 @@ package walk -import "github.com/lxn/win" +import "github.com/xlplbo/win" // Size defines width and height in 1/96" units or native pixels, or dialog base units. // diff --git a/slider.go b/slider.go index 6d71619a4..3c83198b6 100644 --- a/slider.go +++ b/slider.go @@ -9,7 +9,7 @@ package walk import ( "strconv" - "github.com/lxn/win" + "github.com/xlplbo/win" ) type Slider struct { diff --git a/splitbutton.go b/splitbutton.go index eb54a529a..ee0cb2cfe 100644 --- a/splitbutton.go +++ b/splitbutton.go @@ -8,10 +8,8 @@ package walk import ( "unsafe" -) -import ( - "github.com/lxn/win" + "github.com/xlplbo/win" ) type SplitButton struct { diff --git a/splitter.go b/splitter.go index 33811836a..3e31b9ad0 100644 --- a/splitter.go +++ b/splitter.go @@ -13,7 +13,7 @@ import ( "strings" "unsafe" - "github.com/lxn/win" + "github.com/xlplbo/win" ) const splitterWindowClass = `\o/ Walk_Splitter_Class \o/` diff --git a/splitterhandle.go b/splitterhandle.go index 9de987d40..fe6fe6cfc 100644 --- a/splitterhandle.go +++ b/splitterhandle.go @@ -7,7 +7,7 @@ package walk import ( - "github.com/lxn/win" + "github.com/xlplbo/win" ) const splitterHandleWindowClass = `\o/ Walk_SplitterHandle_Class \o/` diff --git a/splitterlayout.go b/splitterlayout.go index f0ba6f69d..bab2b6f5f 100644 --- a/splitterlayout.go +++ b/splitterlayout.go @@ -9,7 +9,7 @@ package walk import ( "sort" - "github.com/lxn/win" + "github.com/xlplbo/win" ) type splitterLayout struct { diff --git a/static.go b/static.go index 38ed96639..f3215a3ff 100644 --- a/static.go +++ b/static.go @@ -10,7 +10,7 @@ import ( "syscall" "unsafe" - "github.com/lxn/win" + "github.com/xlplbo/win" ) const staticWindowClass = `\o/ Walk_Static_Class \o/` diff --git a/statusbar.go b/statusbar.go index 64c6a13d5..a90365657 100644 --- a/statusbar.go +++ b/statusbar.go @@ -9,10 +9,8 @@ package walk import ( "syscall" "unsafe" -) -import ( - "github.com/lxn/win" + "github.com/xlplbo/win" ) // StatusBar is a widget that displays status messages. diff --git a/tableview.go b/tableview.go index b0593ef3c..ae546aa16 100644 --- a/tableview.go +++ b/tableview.go @@ -15,7 +15,7 @@ import ( "time" "unsafe" - "github.com/lxn/win" + "github.com/xlplbo/win" ) const tableViewWindowClass = `\o/ Walk_TableView_Class \o/` diff --git a/tableviewcolumn.go b/tableviewcolumn.go index 5eba1f9a0..c6ceaccf9 100644 --- a/tableviewcolumn.go +++ b/tableviewcolumn.go @@ -10,7 +10,7 @@ import ( "syscall" "unsafe" - "github.com/lxn/win" + "github.com/xlplbo/win" ) // TableViewColumn represents a column in a TableView. diff --git a/tabpage.go b/tabpage.go index c983a9d05..2660285a6 100644 --- a/tabpage.go +++ b/tabpage.go @@ -7,7 +7,7 @@ package walk import ( - "github.com/lxn/win" + "github.com/xlplbo/win" ) const tabPageWindowClass = `\o/ Walk_TabPage_Class \o/` diff --git a/tabpagelist.go b/tabpagelist.go index 84bf7cb07..1964cf3aa 100644 --- a/tabpagelist.go +++ b/tabpagelist.go @@ -7,7 +7,7 @@ package walk import ( - "github.com/lxn/win" + "github.com/xlplbo/win" ) type tabPageListObserver interface { diff --git a/tabwidget.go b/tabwidget.go index c5223c7e8..8e55d64d1 100644 --- a/tabwidget.go +++ b/tabwidget.go @@ -11,7 +11,7 @@ import ( "syscall" "unsafe" - "github.com/lxn/win" + "github.com/xlplbo/win" ) const tabWidgetWindowClass = `\o/ Walk_TabWidget_Class \o/` diff --git a/textedit.go b/textedit.go index 3a77043db..2c66876f8 100644 --- a/textedit.go +++ b/textedit.go @@ -11,7 +11,7 @@ import ( "syscall" "unsafe" - "github.com/lxn/win" + "github.com/xlplbo/win" ) type TextEdit struct { diff --git a/toolbar.go b/toolbar.go index 60ef2c1b0..fcb5eac47 100644 --- a/toolbar.go +++ b/toolbar.go @@ -11,7 +11,7 @@ import ( "syscall" "unsafe" - "github.com/lxn/win" + "github.com/xlplbo/win" ) type ToolBarButtonStyle int diff --git a/toolbutton.go b/toolbutton.go index 45e4663c5..e2b5dd9ea 100644 --- a/toolbutton.go +++ b/toolbutton.go @@ -7,7 +7,7 @@ package walk import ( - "github.com/lxn/win" + "github.com/xlplbo/win" ) type ToolButton struct { diff --git a/tools/ui2walk/ui2walk.go b/tools/ui2walk/ui2walk.go index 2e1629396..7d12f7051 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/xlplbo/walk" ) `) @@ -1070,7 +1070,7 @@ func generateLogicCode(buf *bytes.Buffer, ui *UI) error { `package main import ( - "github.com/lxn/walk" + "github.com/xlplbo/walk" ) `) diff --git a/tooltip.go b/tooltip.go index 5b6f9283d..c364b4dde 100644 --- a/tooltip.go +++ b/tooltip.go @@ -10,7 +10,7 @@ import ( "syscall" "unsafe" - "github.com/lxn/win" + "github.com/xlplbo/win" ) // https://msdn.microsoft.com/en-us/library/windows/desktop/bb760416(v=vs.85).aspx says 80, diff --git a/tooltiperrorpresenter.go b/tooltiperrorpresenter.go index 14b8a5d77..649c50d4a 100644 --- a/tooltiperrorpresenter.go +++ b/tooltiperrorpresenter.go @@ -7,7 +7,7 @@ package walk import ( - "github.com/lxn/win" + "github.com/xlplbo/win" ) var ValidationErrorEffect WidgetGraphicsEffect diff --git a/treeview.go b/treeview.go index 7458e6471..2e978788a 100644 --- a/treeview.go +++ b/treeview.go @@ -10,7 +10,7 @@ import ( "syscall" "unsafe" - "github.com/lxn/win" + "github.com/xlplbo/win" ) type treeViewItemInfo struct { diff --git a/util.go b/util.go index 365e33cd7..6a337757a 100644 --- a/util.go +++ b/util.go @@ -15,7 +15,7 @@ import ( "syscall" "time" - "github.com/lxn/win" + "github.com/xlplbo/win" ) var ( diff --git a/webview.go b/webview.go index f033a48f5..199dd6101 100644 --- a/webview.go +++ b/webview.go @@ -10,10 +10,8 @@ import ( "fmt" "syscall" "unsafe" -) -import ( - "github.com/lxn/win" + "github.com/xlplbo/win" ) const webViewWindowClass = `\o/ Walk_WebView_Class \o/` diff --git a/webview_dwebbrowserevents2.go b/webview_dwebbrowserevents2.go index 10d370385..6102bf30c 100644 --- a/webview_dwebbrowserevents2.go +++ b/webview_dwebbrowserevents2.go @@ -8,13 +8,10 @@ package walk import ( "syscall" - "unsafe" -) - -import ( "time" + "unsafe" - "github.com/lxn/win" + "github.com/xlplbo/win" ) var webViewDWebBrowserEvents2Vtbl *win.DWebBrowserEvents2Vtbl diff --git a/webview_events.go b/webview_events.go index 697ae5d3c..1640f066f 100644 --- a/webview_events.go +++ b/webview_events.go @@ -8,10 +8,8 @@ package walk import ( "unsafe" -) -import ( - "github.com/lxn/win" + "github.com/xlplbo/win" ) type WebViewNavigatingEventData struct { diff --git a/webview_idochostuihandler.go b/webview_idochostuihandler.go index 488826f19..e23e4c18a 100644 --- a/webview_idochostuihandler.go +++ b/webview_idochostuihandler.go @@ -9,10 +9,8 @@ package walk import ( "syscall" "unsafe" -) -import ( - "github.com/lxn/win" + "github.com/xlplbo/win" ) var webViewIDocHostUIHandlerVtbl *win.IDocHostUIHandlerVtbl diff --git a/webview_ioleclientsite.go b/webview_ioleclientsite.go index b17269e51..f11f8438d 100644 --- a/webview_ioleclientsite.go +++ b/webview_ioleclientsite.go @@ -9,10 +9,8 @@ package walk import ( "syscall" "unsafe" -) -import ( - "github.com/lxn/win" + "github.com/xlplbo/win" ) var webViewIOleClientSiteVtbl *win.IOleClientSiteVtbl diff --git a/webview_ioleinplaceframe.go b/webview_ioleinplaceframe.go index 7f047763f..4d9bcbf97 100644 --- a/webview_ioleinplaceframe.go +++ b/webview_ioleinplaceframe.go @@ -8,10 +8,8 @@ package walk import ( "syscall" -) -import ( - "github.com/lxn/win" + "github.com/xlplbo/win" ) var webViewIOleInPlaceFrameVtbl *win.IOleInPlaceFrameVtbl diff --git a/webview_ioleinplacesite.go b/webview_ioleinplacesite.go index 19402ed39..a7ca93c51 100644 --- a/webview_ioleinplacesite.go +++ b/webview_ioleinplacesite.go @@ -9,10 +9,8 @@ package walk import ( "syscall" "unsafe" -) -import ( - "github.com/lxn/win" + "github.com/xlplbo/win" ) var webViewIOleInPlaceSiteVtbl *win.IOleInPlaceSiteVtbl diff --git a/widget.go b/widget.go index b684c0140..f4a315646 100644 --- a/widget.go +++ b/widget.go @@ -7,7 +7,7 @@ package walk import ( - "github.com/lxn/win" + "github.com/xlplbo/win" ) // LayoutFlags specify how a Widget wants to be treated when used with a Layout. diff --git a/widgetlist.go b/widgetlist.go index b5d2d00d5..55f3eff30 100644 --- a/widgetlist.go +++ b/widgetlist.go @@ -7,7 +7,7 @@ package walk import ( - "github.com/lxn/win" + "github.com/xlplbo/win" ) type widgetListObserver interface { diff --git a/window.go b/window.go index 4739dd77b..292f0a18c 100644 --- a/window.go +++ b/window.go @@ -16,7 +16,7 @@ import ( "syscall" "unsafe" - "github.com/lxn/win" + "github.com/xlplbo/win" ) // App-specific message ids for internal use in Walk. diff --git a/windowgroup.go b/windowgroup.go index 4b90c7279..6c4594566 100644 --- a/windowgroup.go +++ b/windowgroup.go @@ -10,7 +10,7 @@ import ( "sync" "unsafe" - "github.com/lxn/win" + "github.com/xlplbo/win" ) // The global window group manager instance.