Merge pull request #45 from Erihel/dev-ui

Changes from dev-ui in erihel's fork

1 files changed, 23 insertions, 25 deletions

diff --git a/src/ui/button.h b/src/ui/button.h
index 0a05b11..ffaf220 100644
--- a/src/ui/button.h
+++ b/src/ui/button.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
@@ -18,39 +19,36 @@
 
 #pragma once
 
+#include "control.h"
 
-#include "ui/control.h"
+namespace Ui {
 
 
-class CD3DEngine;
+    class CButton : public CControl
+    {
+    public:
+        CButton();
+        virtual ~CButton();
 
+        bool    Create(Math::Point pos, Math::Point dim, int icon, EventType eventType);
 
+        bool    EventProcess(const Event &event);
 
-class CButton : public CControl
-{
-public:
-    CButton(CInstanceManager* iMan);
-    virtual ~CButton();
+        void    Draw();
 
-    bool    Create(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg);
+        void    SetImmediat(bool bRepeat);
+        bool    GetImmediat();
 
-    bool    EventProcess(const Event &event);
+        void    SetRepeat(bool bRepeat);
+        bool    GetRepeat();
 
-    void    Draw();
-
-    void    SetImmediat(bool bRepeat);
-    bool    RetImmediat();
-
-    void    SetRepeat(bool bRepeat);
-    bool    RetRepeat();
-
-protected:
-
-protected:
-    bool    m_bCapture;
-    bool    m_bImmediat;
-    bool    m_bRepeat;
-    float   m_repeat;
-};
+    protected:
 
+    protected:
+        bool    m_bCapture;
+        bool    m_bImmediat;
+        bool    m_bRepeat;
+        float   m_repeat;
+    };
 
+}