X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FGUI%2Fdialog.hxx;h=10739280d075fd74abc654fb3366966970641ce2;hb=39bc2d53ff27949ee01a840360c33bfe232baf0a;hp=e08dbe75ae2c414d3d5edc5b927dda34ea3f2f35;hpb=2bd897df8e32e360d83f0255b8dbce18bf714528;p=flightgear.git diff --git a/src/GUI/dialog.hxx b/src/GUI/dialog.hxx index e08dbe75a..10739280d 100644 --- a/src/GUI/dialog.hxx +++ b/src/GUI/dialog.hxx @@ -161,7 +161,7 @@ private: bool _needsRelayout; // Nasal module. - string _module; + std::string _module; SGPropertyNode_ptr _nasal_close; // PUI provides no way for userdata to be deleted automatically @@ -173,7 +173,7 @@ private: PropertyObject (const char * name, puObject * object, SGPropertyNode_ptr node); - string name; + std::string name; puObject * object; SGPropertyNode_ptr node; }; @@ -259,9 +259,17 @@ public: class fgComboBox : public fgValueList, public puaComboBox { public: fgComboBox(int x1, int y1, int x2, int y2, SGPropertyNode *p, bool editable) : - fgValueList(p), puaComboBox(x1, y1, x2, y2, _list, editable) {} + fgValueList(p), + puaComboBox(x1, y1, x2, y2, _list, editable), + _inHit(false) + {} void update(); + + virtual int checkHit(int b, int up, int x, int y); + +private: + bool _inHit; }; class fgSelectBox : public fgValueList, public puaSelectBox {