GUI: Make PredictiveDialog::_btns a fixed size array.

scummvm · Jan 24, 2016 · 7c687a0 · 7c687a0
1 parent c72d95c
commit 7c687a0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/gui/predictivedialog.cpp b/gui/predictivedialog.cpp
@@ -70,8 +70,6 @@ enum {
 PredictiveDialog::PredictiveDialog() : Dialog("Predictive") {
 	new StaticTextWidget(this, "Predictive.Headline", "Enter Text");
 
-	_btns = (ButtonWidget **)calloc(16, sizeof(ButtonWidget *));
-
 	_btns[kCancelAct] = new ButtonWidget(this, "Predictive.Cancel",  _("Cancel")   , 0, kCancelCmd);
 	_btns[kOkAct] =     new ButtonWidget(this, "Predictive.OK",      _("Ok")       , 0, kOkCmd);
 	_btns[kBtn1Act] =   new ButtonWidget(this, "Predictive.Button1", "1  `-.&"     , 0, kBut1Cmd);
@@ -153,8 +151,6 @@ PredictiveDialog::~PredictiveDialog() {
 	free(_userDict.dictLine);
 	free(_predictiveDict.dictLine);
 	free(_unitedDict.dictLine);
-
-	free(_btns);
 }
 
 void PredictiveDialog::reflowLayout() {

diff --git a/gui/predictivedialog.h b/gui/predictivedialog.h
@@ -53,6 +53,10 @@ enum ButtonId {
 	kNoAct     = -1
 };
 
+enum {
+	kButtonCount = kBtn0Act + 1
+};
+
 enum {
 	kRepeatDelay = 500
 };
@@ -140,7 +144,7 @@ class PredictiveDialog : public GUI::Dialog {
 	bool _needRefresh;
 private:
 	EditTextWidget *_edittext;
-	ButtonWidget   **_btns;
+	ButtonWidget   *_btns[kButtonCount];
 };
 
 } // namespace GUI