Update of /cvsroot/gcblue/gcb_wx/include/sim
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18469/include/sim
Modified Files:
Game.h gcb.h tcMapData.h
Removed Files:
tcCustomControl.h tcEditControl.h
Log Message:
Final GDI+ removal
Index: Game.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/Game.h,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** Game.h 10 Jan 2005 00:30:20 -0000 1.53
--- Game.h 20 Feb 2005 21:54:32 -0000 1.54
***************
*** 24,28 ****
--- 24,32 ----
#include "wx/wx.h"
+
+ #ifdef WIN32
#include "wx/msw/private.h" // for MS Windows specific definitions
+ #endif
+
#include "wx/glcanvas.h"
#include "wx/datetime.h"
***************
*** 40,44 ****
#include "tcObjectControl.h"
#include "tcGraphicsEngine.h"
- #include "tcEditControl.h"
#include "tcTime.h"
#include "tcStartView.h"
--- 44,47 ----
***************
*** 153,157 ****
tcTacticalMapView* tacticalMap; ///< tactical map object
tcWorldMapView* worldMap; ///< world map object
! tcEditControl* editControl;
tcOptionsView* optionsView;
tcHookInfo* hookInfo; ///< window displaying info on hooked object
--- 156,160 ----
tcTacticalMapView* tacticalMap; ///< tactical map object
tcWorldMapView* worldMap; ///< world map object
! //tcEditControl* editControl;
tcOptionsView* optionsView;
tcHookInfo* hookInfo; ///< window displaying info on hooked object
--- tcEditControl.h DELETED ---
Index: tcMapData.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcMapData.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** tcMapData.h 24 Jun 2004 21:35:40 -0000 1.8
--- tcMapData.h 20 Feb 2005 21:54:32 -0000 1.9
***************
*** 5,10 ****
** Documentation http://www.ngdc.noaa.gov/seg/topo/report/
** Georeferencing info: http://www.ngdc.noaa.gov/seg/topo/report/s5/s5Biii.html
! **
! ** Copyright (C) 2003-2004 Dewitt Colclough (de...@tw...)
** All rights reserved.
--- 5,10 ----
** Documentation http://www.ngdc.noaa.gov/seg/topo/report/
** Georeferencing info: http://www.ngdc.noaa.gov/seg/topo/report/s5/s5Biii.html
! */
! /* Copyright (C) 2003-2004 Dewitt Colclough (de...@tw...)
** All rights reserved.
***************
*** 25,33 ****
! #if !defined _TCMAPDATA_H_
#define _TCMAPDATA_H_
#include "wx/wx.h"
! #include "wx/msw/private.h" // for MS Windows specific definitions
#include "simmath.h"
#include "tcOptions.h"
--- 25,37 ----
! #ifndef _TCMAPDATA_H_
#define _TCMAPDATA_H_
#include "wx/wx.h"
!
! #ifdef WIN32
! #include "wx/msw/private.h" //for MS Windows specific definitions
! #endif
!
#include "simmath.h"
#include "tcOptions.h"
***************
*** 50,55 ****
#define M_TILE 60
#define N_TILE 60
- //#define M_DEMTILE 1200
- //#define N_DEMTILE 1200
#define NULL_TILE 0xFFFF
#define TILE_AGEOUT (double)30.0
--- 54,57 ----
***************
*** 113,118 ****
void CreateHighResMapImage(int anMode, UINT32 *apData);
void CreateMapImage(int anMode, int anMapID, UINT32 *apData);
! float GetHRLatSpan(void) {return 0.5f*mrTheaterView.Height();}
! float GetHRLonSpan(void) {return 0.5f*mrTheaterView.Width();}
void GetMapDataInfo(tsMapDataInfo *pMDI);
tsGeoPoint GetRandomPointNear(float lon, float lat, float r,
--- 115,120 ----
void CreateHighResMapImage(int anMode, UINT32 *apData);
void CreateMapImage(int anMode, int anMapID, UINT32 *apData);
! float GetHRLatSpan() {return 0.5f*mrTheaterView.Height();}
! float GetHRLonSpan() {return 0.5f*mrTheaterView.Width();}
void GetMapDataInfo(tsMapDataInfo *pMDI);
tsGeoPoint GetRandomPointNear(float lon, float lat, float r,
***************
*** 137,141 ****
unsigned anWidth, unsigned anHeight);
tcMapData();
! virtual ~tcMapData();
private:
tcOptions *mpOptions;
--- 139,143 ----
unsigned anWidth, unsigned anHeight);
tcMapData();
! ~tcMapData();
private:
tcOptions *mpOptions;
--- tcCustomControl.h DELETED ---
Index: gcb.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/gcb.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** gcb.h 8 Aug 2004 00:31:33 -0000 1.7
--- gcb.h 20 Feb 2005 21:54:32 -0000 1.8
***************
*** 21,29 ****
*/
! #if !defined _GCB_H_
#define _GCB_H_
#include "wx/wx.h"
#include "wx/msw/private.h" // for MS Windows specific definitions
class tcGame;
--- 21,32 ----
*/
! #ifndef _GCB_H_
#define _GCB_H_
#include "wx/wx.h"
+
+ #ifdef WIN32
#include "wx/msw/private.h" // for MS Windows specific definitions
+ #endif
class tcGame;
***************
*** 45,49 ****
private:
- ULONG_PTR mgdiplusToken; ///< for GDI+
WXMSG *current_msg;
tcGame *gameFrame; ///< main game frame object with game loop, holds all subwindows
--- 48,51 ----
***************
*** 55,59 ****
bool OnInit();
void SetWorkingDirectory(); ///< sets working directory to level above bin/ dir if necessary
- void InitializeGdiPlus();
void InitializeGameFrame();
--- 57,60 ----
|
