diff options
author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-06-13 22:48:35 +0200 |
---|---|---|
committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-06-13 22:48:35 +0200 |
commit | b735913debff93c1a6444ec731cd4bf99ae2a5c2 (patch) | |
tree | efa532d3b4231e5ffd6df8eddcb0ec8cf5d4b28b /src/ui/editvalue.cpp | |
parent | b5d16ef340208bbe1a76f33f7498fb168f6405b6 (diff) | |
download | colobot-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/editvalue.cpp')
-rw-r--r-- | src/ui/editvalue.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/ui/editvalue.cpp b/src/ui/editvalue.cpp index dfbd65a..285094b 100644 --- a/src/ui/editvalue.cpp +++ b/src/ui/editvalue.cpp @@ -16,8 +16,6 @@ // editvalue.cpp
-#define STRICT
-#define D3D_OVERLOADS
#include <windows.h>
#include <stdio.h>
@@ -62,7 +60,7 @@ CEditValue::~CEditValue() // Creates a new button.
-bool CEditValue::Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg)
+bool CEditValue::Create(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg)
{
CEdit* pe;
CButton* pc;
@@ -92,13 +90,13 @@ bool CEditValue::Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg) }
-void CEditValue::SetPos(FPOINT pos)
+void CEditValue::SetPos(Math::Point pos)
{
CControl::SetPos(pos);
MoveAdjust();
}
-void CEditValue::SetDim(FPOINT dim)
+void CEditValue::SetDim(Math::Point dim)
{
CControl::SetDim(dim);
MoveAdjust();
@@ -106,7 +104,7 @@ void CEditValue::SetDim(FPOINT dim) void CEditValue::MoveAdjust()
{
- FPOINT pos, dim;
+ Math::Point pos, dim;
if ( m_edit != 0 )
{
|