D Haley 3a37b3c
diff -r 6b379ae667ab src/basics.cpp
D Haley 3a37b3c
--- src/basics.cpp	Sun Dec 18 21:00:25 2011 +0000
D Haley 3a37b3c
+++ src/basics.cpp	Sun Dec 18 21:00:47 2011 +0000
D Haley 3a37b3c
@@ -719,15 +719,12 @@
D Haley 3a37b3c
 #else
D Haley 3a37b3c
 	const unsigned int NUM_FUZZY_ENTRIES=16;
D Haley 3a37b3c
 #endif
D Haley 3a37b3c
-	//Sorted sequence of fuzzy times, from biggest to smallest
D Haley 3a37b3c
+	//Sorted sequence of fuzzy, approximate times, from biggest to smallest
D Haley 3a37b3c
 	const time_t TIMESTOPS[] = {
D Haley 3a37b3c
-#ifndef WIN32
D Haley 3a37b3c
-					(100*365.25*24*60*60), //One century
D Haley 3a37b3c
-#endif			
D Haley 3a37b3c
-					(10*365.25*24*60*60), //One decade
D Haley 3a37b3c
-					(365.25*24*60*60), // One year
D Haley 3a37b3c
-					(365.25/12.0*24*60*60), // One month
D Haley 3a37b3c
-					(7.0*24*60*60), //One week
D Haley 3a37b3c
+					(10*36525*24*6*6), //One decade (factor of 100 taken to prevent invalid C++11 narrowing double)
D Haley 3a37b3c
+					(36525*24*6*6), // One year
D Haley 3a37b3c
+					(36525/12*24*6*6), // One month (factor of 100 taken from minutes and hrs to prevent invalid C++11 narrowing double code)
D Haley 3a37b3c
+					(7*24*60*60), //One week
D Haley 3a37b3c
 					(24*60*60), //One day
D Haley 3a37b3c
 					(60*60), //One hour
D Haley 3a37b3c
 					(45*60),// 45 minutes
D Haley 3a37b3c
@@ -744,9 +741,6 @@
D Haley 3a37b3c
 
D Haley 3a37b3c
 	//Do these have a meaningful plural?
D Haley 3a37b3c
 	bool HAVE_PLURALS[] = { 
D Haley 3a37b3c
-#ifndef WIN32	
D Haley 3a37b3c
-					true,//Century
D Haley 3a37b3c
-#endif
D Haley 3a37b3c
 					true,	//decade	
D Haley 3a37b3c
 					true,	//year
D Haley 3a37b3c
 					true,	//month
D Haley 3a37b3c
@@ -767,9 +761,6 @@
D Haley 3a37b3c
 		
D Haley 3a37b3c
 	//Singular version
D Haley 3a37b3c
 	const char *SINGLE_FUZZY_STRING[] = {
D Haley 3a37b3c
-#ifndef WIN32
D Haley 3a37b3c
-			 NTRANS("a century ago"),
D Haley 3a37b3c
-#endif
D Haley 3a37b3c
 			 NTRANS("a decade ago"),
D Haley 3a37b3c
 			 NTRANS("a year ago"),
D Haley 3a37b3c
 			 NTRANS("a month ago"),
D Haley 3a37b3c
diff -r 6b379ae667ab src/effect.h
D Haley 3a37b3c
--- src/effect.h	Sun Dec 18 21:00:25 2011 +0000
D Haley 3a37b3c
+++ src/effect.h	Sun Dec 18 21:00:47 2011 +0000
D Haley 3a37b3c
@@ -70,6 +70,8 @@
D Haley 3a37b3c
 		static BoundCube bc;
D Haley 3a37b3c
 		unsigned int effectType;
D Haley 3a37b3c
 	public:
D Haley 3a37b3c
+		Effect(){};
D Haley 3a37b3c
+		virtual ~Effect() {};
D Haley 3a37b3c
 		virtual void enable(unsigned int pass=0) const =0;
D Haley 3a37b3c
 		virtual void disable() const=0;
D Haley 3a37b3c
 		std::string getName() const;
D Haley 3a37b3c
@@ -112,7 +114,7 @@
D Haley 3a37b3c
 		void doClip(const Point3D &origin, const Point3D & normal,unsigned int glOffset) const;
D Haley 3a37b3c
 	public:
D Haley 3a37b3c
 		BoxCropEffect(){useCamCoordinates=false;effectType=EFFECT_BOX_CROP;openGLIdStart=0; }
D Haley 3a37b3c
-		~BoxCropEffect(){}; 
D Haley 3a37b3c
+		virtual ~BoxCropEffect(){}; 
D Haley 3a37b3c
 
D Haley 3a37b3c
 		//!Enable the clipping plane. Values *must* be set before calling
D Haley 3a37b3c
 		void enable(unsigned int pass) const;
D Haley 3a37b3c
diff -r 6b379ae667ab src/glPane.cpp
D Haley 3a37b3c
--- src/glPane.cpp	Sun Dec 18 21:00:25 2011 +0000
D Haley 3a37b3c
+++ src/glPane.cpp	Sun Dec 18 21:00:47 2011 +0000
D Haley 3a37b3c
@@ -517,7 +517,6 @@
D Haley 3a37b3c
 	{
D Haley 3a37b3c
 		if(currentScene.haveTempCam())
D Haley 3a37b3c
 		{
D Haley 3a37b3c
-			wxPoint draggingCurrent = event.GetPosition();
D Haley 3a37b3c
 			currentScene.commitTempCam();
D Haley 3a37b3c
 			dragging=false;
D Haley 3a37b3c
 		}
D Haley 3a37b3c
diff -r 6b379ae667ab src/mathglPane.cpp
D Haley 3a37b3c
--- src/mathglPane.cpp	Sun Dec 18 21:00:25 2011 +0000
D Haley 3a37b3c
+++ src/mathglPane.cpp	Sun Dec 18 21:00:47 2011 +0000
D Haley 3a37b3c
@@ -807,7 +807,6 @@
D Haley 3a37b3c
 {
D Haley 3a37b3c
 	if(mouseDragMode == MOUSE_MODE_DRAG_PAN)
D Haley 3a37b3c
 	{
D Haley 3a37b3c
-		wxPoint draggingEnd = event.GetPosition();
D Haley 3a37b3c
 		mouseDragMode=MOUSE_MODE_ENUM_END;
D Haley 3a37b3c
 		//Repaint
D Haley 3a37b3c
 		Refresh();
D Haley 3a37b3c
diff -r 6b379ae667ab src/plot.h
D Haley 3a37b3c
--- src/plot.h	Sun Dec 18 21:00:25 2011 +0000
D Haley 3a37b3c
+++ src/plot.h	Sun Dec 18 21:00:47 2011 +0000
D Haley 3a37b3c
@@ -122,6 +122,8 @@
D Haley 3a37b3c
 class PlotBase
D Haley 3a37b3c
 {
D Haley 3a37b3c
 	public:
D Haley 3a37b3c
+		PlotBase(){};
D Haley 3a37b3c
+		virtual ~PlotBase(){};
D Haley 3a37b3c
 		//The type of plot (ie what class is it?)	
D Haley 3a37b3c
 		unsigned int plotType;
D Haley 3a37b3c
 		
D Haley 3a37b3c
diff -r 6b379ae667ab src/xmlHelper.h
D Haley 3a37b3c
--- src/xmlHelper.h	Sun Dec 18 21:00:25 2011 +0000
D Haley 3a37b3c
+++ src/xmlHelper.h	Sun Dec 18 21:00:47 2011 +0000
D Haley 3a37b3c
@@ -27,6 +27,7 @@
D Haley 3a37b3c
 #include <string>
D Haley 3a37b3c
 using std::string;
D Haley 3a37b3c
 
D Haley 3a37b3c
+#include "basics.h"
D Haley 3a37b3c
 
D Haley 3a37b3c
 //These functions return nonzero on failure,
D Haley 3a37b3c
 //zero on success