From c2464d4c71bbc0154287f0b0441aef05e27cf084 Mon Sep 17 00:00:00 2001
From: erihel <erihel@gmail.com>
Date: Fri, 17 Aug 2012 22:43:07 +0200
Subject: * changes to ui classes

---
 src/ui/label.h | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

(limited to 'src/ui/label.h')

diff --git a/src/ui/label.h b/src/ui/label.h
index d3cb915..f65e1dd 100644
--- a/src/ui/label.h
+++ b/src/ui/label.h
@@ -1,5 +1,6 @@
 // * This file is part of the COLOBOT source code
 // * Copyright (C) 2001-2008, Daniel ROUX & EPSITEC SA, www.epsitec.ch
+// * Copyright (C) 2012 Polish Portal of Colobot (PPC)
 // *
 // * This program is free software: you can redistribute it and/or modify
 // * it under the terms of the GNU General Public License as published by
@@ -19,28 +20,21 @@
 #pragma once
 
 
-#include "ui/control.h"
-
-
-class CD3DEngine;
+#include <ui/control.h>
 
+#include <common/event.h>
 
 
 class CLabel : public CControl
 {
-public:
-    CLabel(CInstanceManager* iMan);
-    virtual ~CLabel();
-
-    bool    Create(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg);
-
-    bool    EventProcess(const Event &event);
-
-    void    Draw();
+    public:
+        CLabel();
+        virtual ~CLabel();
 
-protected:
+        bool    Create(Math::Point pos, Math::Point dim, int icon, EventType eventMsg);
+        bool    EventProcess(const Event &event);
 
-protected:
+        void    Draw();
 };
 
 
-- 
cgit v1.2.3-1-g7c22


From c02ac93379287fd83b134c34aa925c85fcda8e26 Mon Sep 17 00:00:00 2001
From: erihel <erihel@gmail.com>
Date: Fri, 17 Aug 2012 23:56:29 +0200
Subject: * list.cpp compiles

---
 src/ui/label.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/ui/label.h')

diff --git a/src/ui/label.h b/src/ui/label.h
index f65e1dd..303b698 100644
--- a/src/ui/label.h
+++ b/src/ui/label.h
@@ -24,6 +24,7 @@
 
 #include <common/event.h>
 
+namespace Ui {
 
 class CLabel : public CControl
 {
@@ -38,3 +39,4 @@ class CLabel : public CControl
 };
 
 
+}
-- 
cgit v1.2.3-1-g7c22


From 8d4a3ed57915af2acf8b3dcd9a8aec5a75806ca6 Mon Sep 17 00:00:00 2001
From: erihel <erihel@gmail.com>
Date: Sat, 18 Aug 2012 21:04:51 +0200
Subject: * wrong enum used for text alignment * wrong event function used

---
 src/ui/label.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/ui/label.h')

diff --git a/src/ui/label.h b/src/ui/label.h
index 303b698..6fe2e31 100644
--- a/src/ui/label.h
+++ b/src/ui/label.h
@@ -23,6 +23,7 @@
 #include <ui/control.h>
 
 #include <common/event.h>
+#include <common/misc.h>
 
 namespace Ui {
 
-- 
cgit v1.2.3-1-g7c22