summaryrefslogtreecommitdiffstats
path: root/src/ui/edit.h
diff options
context:
space:
mode:
authorPiotr Dziwinski <piotrdz@gmail.com>2012-06-13 22:48:35 +0200
committerPiotr Dziwinski <piotrdz@gmail.com>2012-06-13 22:48:35 +0200
commitb735913debff93c1a6444ec731cd4bf99ae2a5c2 (patch)
treeefa532d3b4231e5ffd6df8eddcb0ec8cf5d4b28b /src/ui/edit.h
parentb5d16ef340208bbe1a76f33f7498fb168f6405b6 (diff)
downloadcolobot-b735913debff93c1a6444ec731cd4bf99ae2a5c2.tar.gz
colobot-b735913debff93c1a6444ec731cd4bf99ae2a5c2.tar.bz2
colobot-b735913debff93c1a6444ec731cd4bf99ae2a5c2.zip
FPOINT -> Math::Point & other math functions
- changed FPOINT to Math::Point and some functions from math module to the new implementation - moved old function and FPOINT struct declarations to math3d.cpp - removed some unused functions in math module - fixed some #include dependencies - moved #define STRICT and #define D3D_OVERLOADS to compile options
Diffstat (limited to 'src/ui/edit.h')
-rw-r--r--src/ui/edit.h28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/ui/edit.h b/src/ui/edit.h
index 7ac6c53..cd3c5b9 100644
--- a/src/ui/edit.h
+++ b/src/ui/edit.h
@@ -88,10 +88,10 @@ public:
CEdit(CInstanceManager* iMan);
virtual ~CEdit();
- bool Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg);
+ bool Create(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg);
- void SetPos(FPOINT pos);
- void SetDim(FPOINT dim);
+ void SetPos(Math::Point pos);
+ void SetDim(Math::Point dim);
bool EventProcess(const Event &event);
void Draw();
@@ -155,20 +155,20 @@ public:
protected:
void SendModifEvent();
- bool IsLinkPos(FPOINT pos);
- void MouseDoubleClick(FPOINT mouse);
- void MouseClick(FPOINT mouse);
- void MouseMove(FPOINT mouse);
- void MouseRelease(FPOINT mouse);
- int MouseDetect(FPOINT mouse);
+ bool IsLinkPos(Math::Point pos);
+ void MouseDoubleClick(Math::Point mouse);
+ void MouseClick(Math::Point mouse);
+ void MouseMove(Math::Point mouse);
+ void MouseRelease(Math::Point mouse);
+ int MouseDetect(Math::Point mouse);
void MoveAdjust();
void HyperJump(char *name, char *marker);
bool HyperAdd(char *filename, int firstLine);
- void DrawImage(FPOINT pos, char *name, float width, float offset, float height, int nbLine);
- void DrawBack(FPOINT pos, FPOINT dim);
- void DrawPart(FPOINT pos, FPOINT dim, int icon);
+ void DrawImage(Math::Point pos, char *name, float width, float offset, float height, int nbLine);
+ void DrawBack(Math::Point pos, Math::Point dim);
+ void DrawPart(Math::Point pos, Math::Point dim, int icon);
void FreeImage();
void LoadImage(char *name);
@@ -234,8 +234,8 @@ protected:
float m_timeBlink;
float m_timeLastClick;
float m_timeLastScroll;
- FPOINT m_mouseFirstPos;
- FPOINT m_mouseLastPos;
+ Math::Point m_mouseFirstPos;
+ Math::Point m_mouseLastPos;
float m_column;
bool m_bCapture;