Merge branch 'master' into databinding

Conflicts:
	declarative/tabpage.go

declarative/tabwidget.go

@@ -22,7 +22,10 @@ type TabWidget struct {
 	Column             int
 	ColumnSpan         int
 	ContextMenuActions []*walk.Action
-	Pages              []TabPage
+	Margins            Margins
+	MarginsZero        bool
+	PageTitles         []string
+	Pages              []Widget
 }
 
 func (tw TabWidget) Create(parent walk.Container) error {
@@ -32,18 +35,37 @@ func (tw TabWidget) Create(parent walk.Container) error {
 	}
 
 	return InitWidget(tw, w, func() error {
-		var p *walk.TabPage
+		for i, page := range tw.Pages {
+			wp, err := walk.NewTabPage()
+			if err != nil {
+				return err
+			}
+
+			if len(tw.PageTitles) > i {
+				if err := wp.SetTitle(tw.PageTitles[i]); err != nil {
+					return err
+				}
+			}
+
+			if err := w.Pages().Add(wp); err != nil {
+				return err
+			}
 
-		for _, page := range tw.Pages {
-			if page.AssignTo == nil {
-				page.AssignTo = &p
+			l := walk.NewHBoxLayout()
+			m := tw.Margins
+			if !tw.MarginsZero && m.isZero() {
+				m = Margins{9, 9, 9, 9}
+			}
+
+			if err := l.SetMargins(m.toW()); err != nil {
+				return err
 			}
 
-			if err := page.Create(nil); err != nil {
+			if err := wp.SetLayout(l); err != nil {
 				return err
 			}
 
-			if err := w.Pages().Add(p); err != nil {
+			if err := page.Create(wp); err != nil {
 				return err
 			}
 		}

numberedit.go

@@ -90,11 +90,12 @@ func (ne *NumberEdit) SetEnabled(value bool) {
 }
 
 func (ne *NumberEdit) Font() *Font {
-	if ne.edit == nil {
-		return ne.font
+	var f *Font
+	if ne.edit != nil {
+		f = ne.font
 	}
 
-	if f := ne.edit.font; f != nil {
+	if f != nil {
 		return f
 	} else if ne.parent != nil {
 		return ne.parent.Font()