Skip to content

[6.40] [gui] fix crash when pictures missing in TGButton classes #22051

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
root-project-bot wants to merge 1 commit into from
+15 −14
Closed

[6.40] [gui] fix crash when pictures missing in TGButton classes #22051

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 15 additions & 14 deletions gui/gui/src/TGButton.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1183,15 +1183,9 @@ void TGCheckButton::Init()

Resize();

if (!fOn) {
Error("TGCheckButton", "checked_t.xpm not found or the file format is not supported.");
} else if (!fOff) {
Error("TGCheckButton", "unchecked_t.xpm not found or the file format is not supported.");
} else if (!fDisOn) {
Error("TGCheckButton", "checked_dis_t.xpm not found or the file format is not supported.");
} else if (!fDisOff) {
Error("TGCheckButton", "unchecked_dis_t.xpm not found or the file format is not supported.");
}
if (!fOn || !fOff || !fDisOn || !fDisOff)
Error("Init", "checked*_t.xpm not found or the file format is not supported.");

int hotchar;

if ((hotchar = fLabel->GetHotChar()) != 0) {
Expand Down Expand Up @@ -1229,8 +1223,11 @@ TGCheckButton::~TGCheckButton()

TGDimension TGCheckButton::GetDefaultSize() const
{
UInt_t w = !fTWidth ? fOff->GetWidth() : fTWidth + fOff->GetWidth() + 9;
UInt_t h = !fTHeight ? fOff->GetHeight() : fTHeight + 2;
UInt_t pic_width = fOff ? fOff->GetWidth() : 10;
UInt_t pic_height = fOff ? fOff->GetHeight() : 2;

UInt_t w = !fTWidth ? pic_width : fTWidth + pic_width + 9;
UInt_t h = !fTHeight ? pic_height : fTHeight + 2;

w = GetOptions() & kFixedWidth ? fWidth : w;
h = GetOptions() & kFixedHeight ? fHeight : h;
Expand Down Expand Up @@ -1548,7 +1545,7 @@ void TGRadioButton::Init()
fDisOff = fClient->GetPicture("rbutton_dis_off.xpm");

if (!fOn || !fOff || !fDisOn || !fDisOff)
Error("TGRadioButton", "rbutton_*.xpm not found or the file format is not supported.");
Error("Init", "rbutton_*.xpm not found or the file format is not supported.");

Resize();

Expand Down Expand Up @@ -1593,14 +1590,18 @@ TGRadioButton::~TGRadioButton()

TGDimension TGRadioButton::GetDefaultSize() const
{
UInt_t w = !fTWidth ? ( fOff?fOff->GetWidth():10) : fTWidth + fOff->GetWidth() + 10;
UInt_t h = !fTHeight ? ( fOff?fOff->GetHeight():2) : fTHeight + 2;
UInt_t pic_width = fOff ? fOff->GetWidth() : 10;
UInt_t pic_height = fOff ? fOff->GetHeight() : 2;

UInt_t w = !fTWidth ? pic_width : fTWidth + pic_width + 10;
UInt_t h = !fTHeight ? pic_height : fTHeight + 2;

w = GetOptions() & kFixedWidth ? fWidth : w;
h = GetOptions() & kFixedHeight ? fHeight : h;

return TGDimension(w, h);
}

////////////////////////////////////////////////////////////////////////////////
/// Set radio button state.

Expand Down