bugfix: duplicate gtk2.set_tab_pos

4 files changed, 17 insertions, 18 deletions

diff --git a/examples/htmltitle.nim b/examples/htmltitle.nim
index 3b6418164..f3c672382 100755
--- a/examples/htmltitle.nim
+++ b/examples/htmltitle.nim
@@ -1,4 +1,4 @@
-# Example program to show the new parsexml module
+# Example program to show the parsexml module
 # This program reads an HTML file and writes its title to stdout.
 # Errors and whitespace are ignored.
 
@@ -31,6 +31,6 @@ while true:
   of xmlEof: break # end of file reached
   else: nil # ignore other events
 
-quit("Could not determine title!")
 x.close()
+quit("Could not determine title!")
 
diff --git a/lib/wrappers/gtk/gtk2.nim b/lib/wrappers/gtk/gtk2.nim
index f82547471..b7b6bb560 100755
--- a/lib/wrappers/gtk/gtk2.nim
+++ b/lib/wrappers/gtk/gtk2.nim
@@ -7732,7 +7732,6 @@ proc set_homogeneous*(a: PNotebook, `homogeneous`: guint)
 proc show_border*(a: PNotebook): guint
 proc set_show_border*(a: PNotebook, `show_border`: guint)
 proc tab_pos*(a: PNotebook): guint
-proc set_tab_pos*(a: PNotebook, `tab_pos`: guint)
 proc scrollable*(a: PNotebook): guint
 proc set_scrollable*(a: PNotebook, `scrollable`: guint)
 proc in_child*(a: PNotebook): guint
@@ -14219,11 +14218,6 @@ proc tab_pos*(a: PNotebook): guint =
   result = (a.Notebookflag0 and bm_TGtkNotebook_tab_pos) shr
       bp_TGtkNotebook_tab_pos
 
-proc set_tab_pos*(a: PNotebook, `tab_pos`: guint) = 
-  a.Notebookflag0 = a.Notebookflag0 or
-      (int16(`tab_pos` shl bp_TGtkNotebook_tab_pos) and
-      bm_TGtkNotebook_tab_pos)
-
 proc scrollable*(a: PNotebook): guint = 
   result = (a.Notebookflag0 and bm_TGtkNotebook_scrollable) shr
       bp_TGtkNotebook_scrollable
diff --git a/rod/semexprs.nim b/rod/semexprs.nim
index 61823df32..8d8b627eb 100755
--- a/rod/semexprs.nim
+++ b/rod/semexprs.nim
@@ -22,13 +22,12 @@ proc semTemplateExpr(c: PContext, n: PNode, s: PSym,
 
 proc semFieldAccess(c: PContext, n: PNode, flags: TExprFlags = {}): PNode
 proc semExprWithType(c: PContext, n: PNode, flags: TExprFlags = {}): PNode = 
-  var d: PNode
   result = semExpr(c, n, flags)
   if result == nil: InternalError("semExprWithType")
   if (result.typ == nil): 
     liMessage(n.info, errExprXHasNoType, renderTree(result, {renderNoComments}))
   if result.typ.kind == tyVar: 
-    d = newNodeIT(nkHiddenDeref, result.info, result.typ.sons[0])
+    var d = newNodeIT(nkHiddenDeref, result.info, result.typ.sons[0])
     addSon(d, result)
     result = d
 
@@ -39,13 +38,7 @@ proc semSym(c: PContext, n: PNode, s: PSym, flags: TExprFlags): PNode =
   of skProc, skMethod, skIterator, skConverter: 
     if not (sfProcVar in s.flags) and (s.typ.callConv == ccDefault) and
         (getModule(s).id != c.module.id): 
-      liMessage(n.info, warnXisPassedToProcVar, s.name.s)
-      # XXX change this to 
-      # errXCannotBePassedToProcVar after version 0.8.2
-      # TODO VERSION 0.8.4
-      #if (s.magic <> mNone) then
-      #  liMessage(n.info, 
-      #  errInvalidContextForBuiltinX, s.name.s);
+      liMessage(n.info, errXCannotBePassedToProcVar, s.name.s)
     result = symChoice(c, n, s)
   of skConst: 
     #
@@ -109,7 +102,7 @@ proc checkConvertible(info: TLineInfo, castDest, src: PType) =
     checkConversionBetweenObjects(info, d, s)
   elif (skipTypes(castDest, abstractVarRange).Kind in IntegralTypes) and
       (skipTypes(src, abstractVarRange).Kind in IntegralTypes): 
-    # accept conversion between intregral types
+    # accept conversion between integral types
   else: 
     # we use d, s here to speed up that operation a bit:
     case cmpTypes(d, s)
diff --git a/web/news.txt b/web/news.txt
index e75aa9bae..5096f9af4 100755
--- a/web/news.txt
+++ b/web/news.txt
@@ -2,6 +2,18 @@
 News
 ====
 
+2010-XX-XX Version 0.8.10 released
+==================================
+
+
+Changes affecting backwards compatibility
+-----------------------------------------
+
+- Procs not marked as ``procvar`` cannot only be passed to a procvar anymore,
+  unless they are used in the same module.
+
+
+
 2010-03-14 Version 0.8.8 released
 =================================