[Gcblue-commits] gcb_wx/include/common simmath.h,1.21,1.22 tcSoundConsole.h,1.9,1.10

[Dewitt C. <ddc...@us...>]

Update of /cvsroot/gcblue/gcb_wx/include/common
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17989/include/common

Modified Files:
	simmath.h tcSoundConsole.h 
Log Message:
A few more changes related to GDI+ replacement

Index: tcSoundConsole.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/common/tcSoundConsole.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** tcSoundConsole.h	7 Oct 2004 22:01:11 -0000	1.9
--- tcSoundConsole.h	29 Oct 2004 02:50:42 -0000	1.10
***************
*** 53,56 ****
--- 53,57 ----
  	tcConsoleBox* textBox;
      int mnSoundEffect; ///< sound effect to use when printing text
+ 	unsigned int lastEffect; ///< counter value when last sound effect was played
  };
  

Index: simmath.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/common/simmath.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** simmath.h	2 Oct 2004 22:41:32 -0000	1.21
--- simmath.h	29 Oct 2004 02:50:41 -0000	1.22
***************
*** 59,62 ****
--- 59,68 ----
  public:
      float left,right,top,bottom;
+ 
+     virtual bool ContainsPoint(float x, float y);
+ 	virtual float GetLeft() const {return left;}
+ 	virtual float GetRight() const {return right;}
+ 	virtual float GetTop() const {return top;}
+ 	virtual float GetBottom() const {return bottom;}
      virtual float Width() const {return right-left;}
      virtual float Height() const {return top-bottom;}
***************
*** 73,78 ****
      void ApplyBounds(tcGeoRect& r);
      void Offset(float dx, float dy);
!     bool ContainsPoint(float lon, float lat);
!     void Set(float x1,float x2,float y1,float y2);
      void SetDegrees(float lon1_deg, float lon2_deg, float lat1_deg, float lat2_deg);
      float Width();
--- 79,84 ----
      void ApplyBounds(tcGeoRect& r);
      void Offset(float dx, float dy);
!     virtual bool ContainsPoint(float x, float y);
!     void Set(float x1, float x2, float y1, float y2);
      void SetDegrees(float lon1_deg, float lon2_deg, float lat1_deg, float lat2_deg);
      float Width();