From 52ce1083007976a81dc4d2489b64d1feb1238099 Mon Sep 17 00:00:00 2001 From: "guzhu@fairygui.com" Date: Wed, 17 Oct 2018 22:14:16 +0800 Subject: [PATCH] fixed bug in GList.addItemFromPool. --- libfairygui/Classes/GComboBox.h | 2 ++ libfairygui/Classes/GList.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/libfairygui/Classes/GComboBox.h b/libfairygui/Classes/GComboBox.h index b15ffdd..6cddc3b 100644 --- a/libfairygui/Classes/GComboBox.h +++ b/libfairygui/Classes/GComboBox.h @@ -45,6 +45,8 @@ class GComboBox : public GComponent std::vector& getItems() { return _items; } std::vector& getIcons() { return _icons; } std::vector& getValues() { return _values; } + + GObject* getDropdown() const { return _dropdown; } void refresh(); diff --git a/libfairygui/Classes/GList.cpp b/libfairygui/Classes/GList.cpp index 93fa439..751e074 100644 --- a/libfairygui/Classes/GList.cpp +++ b/libfairygui/Classes/GList.cpp @@ -170,7 +170,7 @@ void GList::returnToPool(GObject * obj) GObject * GList::addItemFromPool(const std::string & url) { - GObject* obj = getFromPool(); + GObject* obj = getFromPool(url); return addChild(obj); }