Skip to content

Commit

Permalink
fixed bug in GList.addItemFromPool.
Browse files Browse the repository at this point in the history
  • Loading branch information
xiaoguzhu committed Oct 17, 2018
1 parent 3095239 commit 52ce108
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 2 additions & 0 deletions libfairygui/Classes/GComboBox.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ class GComboBox : public GComponent
std::vector<std::string>& getItems() { return _items; }
std::vector<std::string>& getIcons() { return _icons; }
std::vector<std::string>& getValues() { return _values; }

GObject* getDropdown() const { return _dropdown; }

void refresh();

Expand Down
2 changes: 1 addition & 1 deletion libfairygui/Classes/GList.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down

0 comments on commit 52ce108

Please sign in to comment.