@@ -240,7 +240,7 @@ TGTextEditor::TGTextEditor(const char *filename, const TGWindow *p, UInt_t w,
240240 fToolBar ->RemoveFrame (fComboCmd );
241241 fLabel ->UnmapWindow ();
242242 fToolBar ->RemoveFrame (fLabel );
243- fToolBar ->GetButton (kM_FILE_EXIT )->SetState (kButtonDisabled );
243+ if ( auto btn = fToolBar ->GetButton (kM_FILE_EXIT ); btn) btn ->SetState (kButtonDisabled );
244244 fToolBar ->Layout ();
245245 }
246246 if (filename) {
@@ -412,10 +412,10 @@ void TGTextEditor::Build()
412412 AddFrame (new TGHorizontal3DLine (this ),
413413 new TGLayoutHints (kLHintsTop | kLHintsExpandX , 0 ,0 ,2 ,2 ));
414414
415- fToolBar ->GetButton (kM_EDIT_CUT )->SetState (kButtonDisabled );
416- fToolBar ->GetButton (kM_EDIT_COPY )->SetState (kButtonDisabled );
417- fToolBar ->GetButton (kM_EDIT_DELETE )->SetState (kButtonDisabled );
418- fToolBar ->GetButton (kM_EDIT_PASTE )->SetState (kButtonDisabled );
415+ if ( auto btn = fToolBar ->GetButton (kM_EDIT_CUT ); btn) btn ->SetState (kButtonDisabled );
416+ if ( auto btn = fToolBar ->GetButton (kM_EDIT_COPY ); btn) btn ->SetState (kButtonDisabled );
417+ if ( auto btn = fToolBar ->GetButton (kM_EDIT_DELETE ); btn) btn ->SetState (kButtonDisabled );
418+ if ( auto btn = fToolBar ->GetButton (kM_EDIT_PASTE ); btn) btn ->SetState (kButtonDisabled );
419419
420420 fTextEdit = new TGTextEdit (this , 10 , 10 , 1 );
421421 if (gClient ->GetStyle () < 2 ) {
@@ -866,7 +866,7 @@ Bool_t TGTextEditor::HandleTimer(TTimer *t)
866866 }
867867 else {
868868 fMenuEdit ->EnableEntry (kM_EDIT_PASTE );
869- if (fToolBar ->GetButton (kM_EDIT_PASTE )->GetState () == kButtonDisabled )
869+ if (auto btn = fToolBar ->GetButton (kM_EDIT_PASTE ); btn && btn ->GetState () == kButtonDisabled )
870870 fToolBar ->GetButton (kM_EDIT_PASTE )->SetState (kButtonUp );
871871 }
872872 // check if text is selected in the editor
@@ -884,7 +884,7 @@ Bool_t TGTextEditor::HandleTimer(TTimer *t)
884884 fMenuEdit ->DisableEntry (kM_EDIT_CUT );
885885 fMenuEdit ->DisableEntry (kM_EDIT_COPY );
886886 fMenuEdit ->DisableEntry (kM_EDIT_DELETE );
887- if (fToolBar ->GetButton (kM_EDIT_CUT )->GetState () == kButtonUp ) {
887+ if (auto btn = fToolBar ->GetButton (kM_EDIT_CUT ); btn && btn ->GetState () == kButtonUp ) {
888888 fToolBar ->GetButton (kM_EDIT_CUT )->SetState (kButtonDisabled );
889889 fToolBar ->GetButton (kM_EDIT_COPY )->SetState (kButtonDisabled );
890890 fToolBar ->GetButton (kM_EDIT_DELETE )->SetState (kButtonDisabled );
0 commit comments