From 1bcca5aae2fca73b227bda44f21f5509a03b17b9 Mon Sep 17 00:00:00 2001 From: peter1138 Date: Mon, 14 Jan 2008 20:52:43 +0000 Subject: (svn r11854) -Fix (r11848): Nightly build farm showed up more compiler warnings... c++ is fun --- src/widgets/dropdown_type.h | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/widgets/dropdown_type.h b/src/widgets/dropdown_type.h index 07390fb02..0928804ee 100644 --- a/src/widgets/dropdown_type.h +++ b/src/widgets/dropdown_type.h @@ -15,6 +15,8 @@ public: int result; ///< Result code to return to window on selection bool masked; ///< Masked and unselectable item + DropDownListItem(int result, bool masked) : result(result), masked(masked) {} + virtual ~DropDownListItem() {} virtual StringID String() const; }; @@ -25,12 +27,7 @@ class DropDownListStringItem : public DropDownListItem { public: StringID string; ///< String ID of item - DropDownListStringItem(StringID string, uint result, bool masked) - { - this->string = string; - this->result = result; - this->masked = masked; - } + DropDownListStringItem(StringID string, int result, bool masked) : DropDownListItem(result, masked), string(string) {} StringID String() const; }; @@ -42,7 +39,7 @@ class DropDownListParamStringItem : public DropDownListStringItem { public: uint64 decode_params[10]; ///< Parameters of the string - DropDownListParamStringItem(StringID string, uint result, bool masked) : DropDownListStringItem(string, result, masked) {} + DropDownListParamStringItem(StringID string, int result, bool masked) : DropDownListStringItem(string, result, masked) {} StringID String() const; void SetParam(uint index, uint64 value) { decode_params[index] = value; } -- cgit v1.2.3-70-g09d2