[Gcblue-commits] gcb_wx/include/sim Game.h,1.46,1.47 tcDirector.h,1.8,1.9 tcDirectorEvent.h,1.10,1.11

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

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

Modified Files:
	Game.h tcDirector.h tcDirectorEvent.h 
Log Message:
Changes related to GDI+ replacement

Index: tcDirector.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcDirector.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** tcDirector.h	17 Aug 2004 02:22:56 -0000	1.8
--- tcDirector.h	7 Oct 2004 22:01:12 -0000	1.9
***************
*** 29,37 ****
  
  #include "wx/wx.h"
! #include "wx/msw/private.h" // for MS Windows specific definitions
  #include <vector>
  
  class tcDirectorEvent;
! class tcConsole;
  class tc3DViewer;
  
--- 29,37 ----
  
  #include "wx/wx.h"
! 
  #include <vector>
  
  class tcDirectorEvent;
! class tcConsoleBox;
  class tc3DViewer;
  
***************
*** 70,74 ****
  	static void AttachMapViews(tcTacticalMapView* tmv, tcWorldMapView* wmv);
  
!     tcDirector(tc3DViewer *view3D, tcConsole *console, wxWindow *win);
      ~tcDirector();
  private:
--- 70,74 ----
  	static void AttachMapViews(tcTacticalMapView* tmv, tcWorldMapView* wmv);
  
!     tcDirector(tc3DViewer *view3D, tcConsoleBox *console, wxWindow *win);
      ~tcDirector();
  private:

Index: Game.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/Game.h,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** Game.h	14 Sep 2004 02:01:45 -0000	1.46
--- Game.h	7 Oct 2004 22:01:12 -0000	1.47
***************
*** 1,20 ****
! /**  
!  *  Copyright (C) 2003 Dewitt Colclough (de...@tw...)
!  *  All rights reserved.
!  *
!  *  This file is part of the Global Conflict Blue (GCB) program.
!  *  GCB is free software; you can redistribute it and/or modify
!  *  it under the terms of version 2 of the GNU General Public License as 
!  *  published by the Free Software Foundation.
!  *
!  *  GCB is distributed in the hope that it will be useful,
!  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
!  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
!  *  GNU General Public License for more details.
!  *
!  *  You should have received a copy of the GNU General Public License
!  *  along with GCB; if not, write to the Free Software
!  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
!  */
  
  #if !defined _GAME_H_
--- 1,22 ----
! /** 
! ** @file Game.h
! */
! /*  Copyright (C) 2003-2004 Dewitt Colclough (de...@tw...)
! **  All rights reserved.
! 
! **  This file is part of the Global Conflict Blue (GCB) program.
! **  GCB is free software; you can redistribute it and/or modify
! **  it under the terms of version 2 of the GNU General Public License as 
! **  published by the Free Software Foundation.
! 
! **  GCB is distributed in the hope that it will be useful,
! **  but WITHOUT ANY WARRANTY; without even the implied warranty of
! **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
! **  GNU General Public License for more details.
! 
! **  You should have received a copy of the GNU General Public License
! **  along with GCB; if not, write to the Free Software
! **  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
! */
  
  #if !defined _GAME_H_
***************
*** 28,32 ****
  #include "tcMapView.h"
  #include "tcSoundConsole.h"
- #include "tcButtonConsole.h"
  #include "commandlist.h"
  #include "tcDatabase.h"
--- 30,33 ----
***************
*** 147,151 ****
      wxGLCanvas* glCanvas; 
      tcSoundConsole* infoConsole; ///< console object for info messages
!     tcButtonConsole* briefingConsoleLeft; ///< console object for briefing text
      tcSoundConsole* briefingConsoleBottom; ///< to fill space at bottom for now
      tcTacticalMapView* tacticalMap; ///< tactical map object
--- 148,152 ----
      wxGLCanvas* glCanvas; 
      tcSoundConsole* infoConsole; ///< console object for info messages
!     tcSoundConsole* briefingConsoleLeft; ///< console object for briefing text
      tcSoundConsole* briefingConsoleBottom; ///< to fill space at bottom for now
      tcTacticalMapView* tacticalMap; ///< tactical map object

Index: tcDirectorEvent.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcDirectorEvent.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** tcDirectorEvent.h	14 Sep 2004 02:01:45 -0000	1.10
--- tcDirectorEvent.h	7 Oct 2004 22:01:12 -0000	1.11
***************
*** 29,36 ****
  
  #include "wx/wx.h"
! #include "wx/msw/private.h" // for MS Windows specific definitions
  #include <string>
  #include <osg/ref_ptr>
! //#include <osgText/Text>  // for tc3DTextEvent
  
  class tcMapObject;
--- 29,36 ----
  
  #include "wx/wx.h"
! 
  #include <string>
  #include <osg/ref_ptr>
! 
  
  class tcMapObject;
***************
*** 42,46 ****
  }
  
! class tcConsole;
  class tc3DViewer;
  
--- 42,46 ----
  }
  
! class tcConsoleBox;
  class tc3DViewer;
  
***************
*** 175,182 ****
  {
  public:
!     static tcConsole * console; ///< all event go to the same console, mult consoles not supported with this
      std::string text;
  
!     static void AttachConsole(tcConsole *c) {console = c;}
      virtual void Update(double t);
  
--- 175,182 ----
  {
  public:
!     static tcConsoleBox * console; ///< all event go to the same console, mult consoles not supported with this
      std::string text;
  
!     static void AttachConsole(tcConsoleBox *c) {console = c;}
      virtual void Update(double t);