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/shortcut.h | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

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

diff --git a/src/ui/shortcut.h b/src/ui/shortcut.h
index b918ccc..d819bf2 100644
--- a/src/ui/shortcut.h
+++ b/src/ui/shortcut.h
@@ -18,31 +18,28 @@
 
 #pragma once
 
+#include <ui/control.h>
 
-#include "ui/control.h"
-
-
-class CD3DEngine;
-
+#include <common/event.h>
 
 
 class CShortcut : public CControl
 {
-public:
-    CShortcut(CInstanceManager* iMan);
-    ~CShortcut();
+    public:
+        CShortcut();
+        ~CShortcut();
 
-    bool    Create(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg);
+        bool    Create(Math::Point pos, Math::Point dim, int icon, EventType eventMsg);
 
-    bool    EventProcess(const Event &event);
+        bool    EventProcess(const Event &event);
 
-    void    Draw();
+        void    Draw();
 
-protected:
-    void    DrawVertex(int icon, float zoom);
+    protected:
+        void    DrawVertex(int icon, float zoom);
 
-protected:
-    float   m_time;
+    protected:
+        float   m_time;
 };
 
 
-- 
cgit v1.2.3-1-g7c22


From 199768280816d56a3356a6c3d137df0a73dba62b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Konopacki?= <konopacki.m@gmail.com>
Date: Tue, 21 Aug 2012 15:23:59 +0200
Subject: added ui/shortcut.*

---
 src/ui/shortcut.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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

diff --git a/src/ui/shortcut.h b/src/ui/shortcut.h
index d819bf2..9ee97e0 100644
--- a/src/ui/shortcut.h
+++ b/src/ui/shortcut.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
@@ -22,6 +23,7 @@
 
 #include <common/event.h>
 
+namespace Ui {
 
 class CShortcut : public CControl
 {
@@ -29,7 +31,7 @@ class CShortcut : public CControl
         CShortcut();
         ~CShortcut();
 
-        bool    Create(Math::Point pos, Math::Point dim, int icon, EventType eventMsg);
+        bool    Create(Math::Point pos, Math::Point dim, int icon, EventType eventType);
 
         bool    EventProcess(const Event &event);
 
@@ -43,3 +45,4 @@ class CShortcut : public CControl
 };
 
 
+}
-- 
cgit v1.2.3-1-g7c22