From 10b2c562fb7635f9850f1441f08ba8b1a71e31e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Konopacki?= Date: Wed, 15 Aug 2012 01:48:49 +0200 Subject: First approach to port 2D UI Interface - changes in src/ui ; be CAREFUL, not every file is changed in a proper way -> bugs - necessary changes in object/robotmain.h and common/misc.h/.cpp in order to compile --- src/ui/check.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/ui/check.h') diff --git a/src/ui/check.h b/src/ui/check.h index 24c58f3..3af6849 100644 --- a/src/ui/check.h +++ b/src/ui/check.h @@ -32,7 +32,7 @@ public: CCheck(CInstanceManager* iMan); virtual ~CCheck(); - bool Create(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg); + bool Create(Math::Point pos, Math::Point dim, int icon, EventType eventType); bool EventProcess(const Event &event); -- cgit v1.2.3-1-g7c22 From 574c07e388dfd902b6565bc4a5ac9b915c73074e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Konopacki?= Date: Sat, 18 Aug 2012 22:56:42 +0200 Subject: Further improvements in UI porting --- src/ui/check.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'src/ui/check.h') diff --git a/src/ui/check.h b/src/ui/check.h index 3af6849..0b6a1f2 100644 --- a/src/ui/check.h +++ b/src/ui/check.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 @@ -21,15 +22,15 @@ #include "ui/control.h" +namespace Gfx{ +class CEngine; +} -class CD3DEngine; - - - +namespace Ui { class CCheck : public CControl { public: - CCheck(CInstanceManager* iMan); + CCheck(); virtual ~CCheck(); bool Create(Math::Point pos, Math::Point dim, int icon, EventType eventType); @@ -43,4 +44,5 @@ protected: protected: }; +} -- cgit v1.2.3-1-g7c22 From 01cc0fbc49696a19a56dfdd8359d4bb77e868925 Mon Sep 17 00:00:00 2001 From: erihel Date: Tue, 11 Sep 2012 12:49:41 +0200 Subject: * latest changes * all files except studio, map and maindialog should compile * did some code cleanup --- src/ui/check.h | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'src/ui/check.h') diff --git a/src/ui/check.h b/src/ui/check.h index 0b6a1f2..1ad8a3a 100644 --- a/src/ui/check.h +++ b/src/ui/check.h @@ -19,30 +19,30 @@ #pragma once +#include "control.h" -#include "ui/control.h" namespace Gfx{ -class CEngine; + class CEngine; } namespace Ui { -class CCheck : public CControl -{ -public: - CCheck(); - virtual ~CCheck(); + class CCheck : public CControl + { + public: + CCheck(); + virtual ~CCheck(); - bool Create(Math::Point pos, Math::Point dim, int icon, EventType eventType); + bool Create(Math::Point pos, Math::Point dim, int icon, EventType eventType); - bool EventProcess(const Event &event); + bool EventProcess(const Event &event); - void Draw(); + void Draw(); -protected: + protected: -protected: -}; + protected: + }; } -- cgit v1.2.3-1-g7c22