From 011d86ed668cbbff5c7bfc5f7e88086acb849921 Mon Sep 17 00:00:00 2001 From: Piotr Dziwinski Date: Sun, 15 Apr 2012 00:50:13 +0200 Subject: Pulled changes from test mingw branch * include fixes * syntax fixes for MinGW * fixed encoding of restext.cpp * temporary fix for MinGW in joystick.cpp Successfully compiles under MinGW :) --- src/slider.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src/slider.cpp') diff --git a/src/slider.cpp b/src/slider.cpp index 727f794..95bd3a4 100644 --- a/src/slider.cpp +++ b/src/slider.cpp @@ -24,7 +24,7 @@ #include #include "struct.h" -#include "D3DEngine.h" +#include "d3dengine.h" #include "math3d.h" #include "event.h" #include "misc.h" @@ -45,8 +45,6 @@ CSlider::CSlider(CInstanceManager* iMan) : CControl(iMan) { - CControl::CControl(iMan); - m_buttonLeft = 0; m_buttonRight = 0; @@ -70,8 +68,6 @@ CSlider::~CSlider() { delete m_buttonLeft; delete m_buttonRight; - - CControl::~CControl(); } -- cgit v1.2.3-1-g7c22