Changeset 5c67e4e in tol for tolbase/lib

Timestamp:

Dec 4, 2011, 12:22:00 AM (15 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

af9a0af

Parents:

73aa767e

Message:

refs #1347, fixing some bugs after including notebook markup in tolbase

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@3883 be4846ae-f051-483a-831f-b64e7d08527f

Location:

tolbase/lib

Files:

• markupparser/pkgIndex.tcl (modified) (1 diff)
• markupviewer/markupviewer.tcl (modified) (8 diffs)
• renderpane/renderpane.tcl (modified) (2 diffs)

tolbase/lib/markupparser/pkgIndex.tcl

@@ -1 +1 @@
 # Tcl package index file
 
-package ifneeded markupparser 1.0 \
+package ifneeded markupparser 2.0 \
     [list source [file join $dir markupparser.tcl]]
 

tolbase/lib/markupviewer/markupviewer.tcl

@@ -17 +17 @@
 package require renderpane
 
-package require autoscroll
+package require autoscroll 1.1
 
 snit::widget markupviewer {
@@ -81 +81 @@
 
         # Create the renderpane.
+
         install rp using renderpane $win.rp \
             -yscrollcommand "$win.scroll set" \
@@ -92 +93 @@
         scrollbar $win.scroll \
             -command "$win.rp yview"
-        ::autoscroll::autoscroll $win.scroll
 
         # grid them in.
-        
+        # josp: use grid and autoscroll
         if { 0 } {
           pack $win.scroll  -side right -fill y    -expand false
@@ -105 +105 @@
         grid rowconfigure $win 0 -weight 1
         grid columnconfigure $win 0 -weight 1
+        ::autoscroll::autoscroll $win.scroll
 
         #---------------------------------------------------------------
@@ -120 +121 @@
 
         # User Menu.
+        # josp: no user menu considered
         if { 0 } {
           menu $rp.user -tearoff no -postcommand [mymethod PostUserMenu]
@@ -149 +151 @@
     }
 
-    method UsePreferences {} {
-      # Update the display when the preferences change.
-      $self showpage
-    }
+    delegate method UsePreferences to rp
+    # josp: delegate UsePreferences on renderpane
+    if { 0 } {
+      method UsePreferences {} {
+        # Update the display when the preferences change.
+        $self showpage
+      }
+    }
+
     #-------------------------------------------------------------------
     # Public Methods
@@ -341 +348 @@
         }
         
+        # josp: don't known what is it for
         if { 0 } {
           $rp searchfor [$self searchtext]
@@ -346 +354 @@
         # NEXT, give the renderpane the focus so that we don't
         # need to click in it.
-        $self focus -friendly
+
+        #$self focus -friendly
 
         $self setpos $ypos

tolbase/lib/renderpane/renderpane.tcl

@@ -117 +117 @@
 
         # Next, create the rotext pane.
+      
+        # setgrid option makes conflict with tolbase geometry
+        #-setgrid true 
         installhull using text \
             -insertwidth 0 \
             -borderwidth 5 \
             -relief flat \
-            -setgrid true \
             -wrap word \
             -cursor xterm
@@ -152 +154 @@
 
         # Next, add the markup tags, using the user preferences.
+
         $self UsePreferences