Merge branch 'dev'

ying32 · Oct 18, 2018 · ba218d7 · ba218d7
2 parents 8e024b5 + d31ce09
commit ba218d7
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 2 deletions.
diff --git a/Tools/res2go/src/uresourceformtogo.pas b/Tools/res2go/src/uresourceformtogo.pas
@@ -18,7 +18,7 @@ implementation
 
 
 const
-  APPVERSION = '1.0.4';
+  APPVERSION = '1.0.5';
 
 type
   TComponentItem = record

diff --git a/samples/winJumpList/main.go b/samples/winJumpList/main.go
@@ -1,3 +1,5 @@
+// +build windows
+
 package main
 
 import (

diff --git a/samples/winTaskbar/main.go b/samples/winTaskbar/main.go
@@ -1,3 +1,5 @@
+// +build windows
+
 package main
 
 import (

diff --git a/samples/windowsspy/main.go b/samples/windowsspy/main.go
@@ -1,3 +1,5 @@
+// +build windows
+
 package main
 
 import (

diff --git a/vcl/exts/wke/wke_windows_386.go b/vcl/exts/wke/wke_windows_386.go
@@ -29,7 +29,7 @@ type TWkeWebBrowser struct {
 
 func NewWkeWebBrowser(hWnd types.HWND) *TWkeWebBrowser {
 	w := new(TWkeWebBrowser)
-	r := win.GetClientRect(hWnd)
+	r, _ := win.GetClientRect2(hWnd)
 	w.wkePtr = wkeCreateWebWindow(WKE_WINDOW_TYPE_CONTROL, hWnd, 0, 0, r.Right-r.Left, r.Bottom-r.Top)
 	ptr := uintptr(unsafe.Pointer(w))
 	wkeOnTitleChanged(w.wkePtr, _wkeTitleChangedCallback, ptr)
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,7 +18,7 @@ implementation @@
     const
-      APPVERSION = '1.0.4';
+      APPVERSION = '1.0.5';
     type
       TComponentItem = record
@@ Expand Down @@