TaoLib

Check-in [e6f4b39754]
Login

Check-in [e6f4b39754]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Pulling in fix for Tcl/Tk 8.6.9
Timelines: family | ancestors | descendants | both | fsar-8-6-9
Files: files | file ages | folders
SHA1: e6f4b39754d57eb163214670a949ddc27146dd20
User & Date: hypnotoad 2019-01-08 00:28:53.023
Context
2019-01-08
00:35
Pulling fix from fsar check-in: c831ca1a54 user: hypnotoad tags: trunk
00:28
Pulling in fix for Tcl/Tk 8.6.9 Leaf check-in: e6f4b39754 user: hypnotoad tags: fsar-8-6-9
2018-12-11
23:01
New build of tool check-in: 300e317280 user: hypnotoad tags: fsar
Changes
Side-by-Side Diff Ignore Whitespace Patch
Changes to modules/taotk/core/baseclass.tcl.
︙
143
144
145
146
147
148
149

150
151

152
153
154
155
156


157
158
159

160
161
162
163
164

165
166
167



168
169
170
171
172
173
174
175
176
177
178
179







180
181
182
183
184
185
186

143
144
145
146
147
148
149
150
151

152


153


154
155
156


157





158



159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187








+

-
+
-
-

-
-
+
+

-
-
+
-
-
-
-
-
+
-
-
-
+
+
+












+
+
+
+
+
+
+








  #    the <Destroy> we are seeing is intended for us.
  ###
  method Hull_Destroy {} {
    ###
    # Destroy our Tk representation
    ###
    my variable tkalias
    set tkWidget {}
    if {[info exists tkalias]} {
      set alias $tkalias
      set tkWidget $tkalias
    } else {
      set alias {}
    }
    if {$alias ne {}} {
      my Hull_Unbind $alias
    if {$tkWidget eq {}} {
      set tkWidget [my widget hull]
    }
    catch {my action destroy}

    if {$tkWidget eq {}} {
    # Destroy an alias we may have created
    if { $alias ne {} && [winfo exists $alias] } {
      catch {rename [namespace current]::tkwidget {}}
    } else {
      set hull [my organ hull]
      set tkWidget [my organ hull]
      if { $hull ne "."} {
        catch {::destroy $hull}
      }
    }
    if {$tkWidget ne {}} {
      my Hull_Unbind $tkWidget
    }

    ###
    # Clean up children
    ###
    foreach subobj [info command [self]/*] {
      catch {$subobj destroy}
    }
    foreach subobj [info command [self].*] {
      if {[winfo exists $subobj]} continue
      catch {$subobj destroy}
    }

    catch {my action destroy}

    # Destroy an alias we may have created
    if { $tkWidget ni {. {}} && [winfo exists $tkWidget] } {
      ::destroy $tkWidget
    }
  }

  ###
  # topic: 180536da1664900f26270fd54346f984bf070e44
  # description:
  #    A private method that catches tk events and ensures
  #    the <Destroy> we are seeing is intended for us.
︙