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.cpp | |
| 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.cpp')
| -rw-r--r-- | src/ui/interface.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ui/interface.cpp b/src/ui/interface.cpp index 6c96501..a042899 100644 --- a/src/ui/interface.cpp +++ b/src/ui/interface.cpp @@ -162,7 +162,7 @@ CImage* CInterface::CreateImage(Math::Point pos, Math::Point dim, int icon, Even // Creates a new label. -CLabel* CInterface::CreateLabel(Math::Point pos, Math::Point dim, int icon, EventType eventMsg, const char *name) +CLabel* CInterface::CreateLabel(Math::Point pos, Math::Point dim, int icon, EventType eventMsg, std::string name) { CLabel* pc = CreateControl<CLabel>(pos, dim, icon, eventMsg); if (pc != nullptr) @@ -297,7 +297,7 @@ bool CInterface::EventProcess(const Event &event) // Gives the tooltip binding to the window. -bool CInterface::GetTooltip(Math::Point pos, const char* name) +bool CInterface::GetTooltip(Math::Point pos, std::string &name) { for (int i = MAXCONTROL-1; i >= 0; i--) { if (m_table[i] != nullptr) { |