From b735913debff93c1a6444ec731cd4bf99ae2a5c2 Mon Sep 17 00:00:00 2001 From: Piotr Dziwinski Date: Wed, 13 Jun 2012 22:48:35 +0200 Subject: 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 --- src/ui/button.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/ui/button.cpp') diff --git a/src/ui/button.cpp b/src/ui/button.cpp index 701971c..4f9e9cd 100644 --- a/src/ui/button.cpp +++ b/src/ui/button.cpp @@ -14,8 +14,6 @@ // * You should have received a copy of the GNU General Public License // * along with this program. If not, see http://www.gnu.org/licenses/. -#define STRICT -#define D3D_OVERLOADS #include #include @@ -57,7 +55,7 @@ CButton::~CButton() // Creates a new button. -bool CButton::Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg) +bool CButton::Create(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg) { if ( eventMsg == EVENT_NULL ) eventMsg = GetUniqueEventMsg(); @@ -151,7 +149,7 @@ bool CButton::EventProcess(const Event &event) void CButton::Draw() { - FPOINT pos, dim, uv1, uv2; + Math::Point pos, dim, uv1, uv2; #if !_NEWLOOK float dp; #endif -- cgit v1.2.3-1-g7c22