diff options
| author | erihel <erihel@gmail.com> | 2012-08-31 22:28:07 +0200 |
|---|---|---|
| committer | erihel <erihel@gmail.com> | 2012-08-31 22:28:07 +0200 |
| commit | 6ba0f42f22a170625f15879e01b4653a4ac153a1 (patch) | |
| tree | 129478ed8c5e4fd167c7c77c8ce00b88c5a4f83b /src/ui/interface.h | |
| parent | 5408fe92527a4df01e4d66a2cdfdbbbea5738afc (diff) | |
| download | colobot-6ba0f42f22a170625f15879e01b4653a4ac153a1.tar.gz colobot-6ba0f42f22a170625f15879e01b4653a4ac153a1.tar.bz2 colobot-6ba0f42f22a170625f15879e01b4653a4ac153a1.zip | |
latest changes; few more classes should compile now
Diffstat (limited to 'src/ui/interface.h')
| -rw-r--r-- | src/ui/interface.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/ui/interface.h b/src/ui/interface.h index 43f2698..7123c05 100644 --- a/src/ui/interface.h +++ b/src/ui/interface.h @@ -19,6 +19,7 @@ #pragma once +#include <string> #include <common/event.h> #include <common/struct.h> @@ -61,7 +62,7 @@ class CInterface ~CInterface(); bool EventProcess(const Event &event); - bool GetTooltip(Math::Point pos, const char* name); + bool GetTooltip(Math::Point pos, std::string &name); void Flush(); CButton* CreateButton(Math::Point pos, Math::Point dim, int icon, EventType eventMsg); @@ -81,7 +82,7 @@ class CInterface CWindow* CreateWindows(Math::Point pos, Math::Point dim, int icon, EventType eventMsg); CList* CreateList(Math::Point pos, Math::Point dim, int icon, EventType eventMsg, float expand=1.2f); - CLabel* CreateLabel(Math::Point pos, Math::Point dim, int icon, EventType eventMsg, const char *name); + CLabel* CreateLabel(Math::Point pos, Math::Point dim, int icon, EventType eventMsg, std::string name); bool DeleteControl(EventType eventMsg); CControl* SearchControl(EventType eventMsg); |