@@ -742,7 +742,7 @@ struct MyFrame : wxFrame {
742
742
743
743
TSCanvas *NewTab (Document *doc, bool append = false ) {
744
744
TSCanvas *sw = new TSCanvas (this , nb);
745
- sw->doc = doc;
745
+ sw->doc . reset ( doc) ;
746
746
doc->sw = sw;
747
747
sw->SetScrollRate (1 , 1 );
748
748
if (append)
@@ -773,7 +773,7 @@ struct MyFrame : wxFrame {
773
773
TSCanvas *sw = (TSCanvas *)nb->GetPage (nbe.GetSelection ());
774
774
sw->Status ();
775
775
SetSearchTextBoxBackgroundColour (false );
776
- sys->TabChange (sw->doc );
776
+ sys->TabChange (sw->doc . get () );
777
777
}
778
778
779
779
void TabsReset () {
@@ -1082,7 +1082,7 @@ struct MyFrame : wxFrame {
1082
1082
sys->darkennonmatchingcells = searchstring.Len () != 0 ;
1083
1083
sys->searchstring = (sys->casesensitivesearch ) ? searchstring : searchstring.Lower ();
1084
1084
SetSearchTextBoxBackgroundColour (false );
1085
- Document *doc = GetCurTab ()->doc ;
1085
+ Document *doc = GetCurTab ()->doc . get () ;
1086
1086
TSCanvas *sw = GetCurTab ();
1087
1087
wxClientDC dc (sw);
1088
1088
doc->SearchNext (dc, false , false , false );
@@ -1275,7 +1275,7 @@ struct MyFrame : wxFrame {
1275
1275
if ((event.GetChangeType () & 0xF ) == 0 || watcherwaitingforuser || !nb) return ;
1276
1276
const wxString &modfile = event.GetPath ().GetFullPath ();
1277
1277
loop (i, nb->GetPageCount ()) {
1278
- Document *doc = ((TSCanvas *)nb->GetPage (i))->doc ;
1278
+ Document *doc = ((TSCanvas *)nb->GetPage (i))->doc . get () ;
1279
1279
if (modfile == doc->filename ) {
1280
1280
wxDateTime modtime = wxFileName (modfile).GetModificationTime ();
1281
1281
// Compare with last modified to trigger multiple times.
@@ -1307,7 +1307,7 @@ struct MyFrame : wxFrame {
1307
1307
if (*msg) {
1308
1308
GetCurTab ()->Status (msg);
1309
1309
} else {
1310
- loop (j, nb->GetPageCount ()) if (((TSCanvas *)nb->GetPage (j))->doc == doc)
1310
+ loop (j, nb->GetPageCount ()) if (((TSCanvas *)nb->GetPage (j))->doc . get () == doc)
1311
1311
nb->DeletePage (j);
1312
1312
::wxRemoveFile (sys->TmpName (modfile));
1313
1313
GetCurTab ()->Status(
0 commit comments