Update of /cvsroot/gcblue/gcb_wx/include/sim
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21272/include/sim
Modified Files:
Game.h tcObjectControl.h
Log Message:
Game windows use common window as parent
Index: tcObjectControl.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcObjectControl.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** tcObjectControl.h 7 Jul 2005 01:13:23 -0000 1.19
--- tcObjectControl.h 2 Jan 2006 15:40:52 -0000 1.20
***************
*** 176,180 ****
tcObjectControl(wxWindow *parent,
const wxPoint& pos, const wxSize& size,
! const wxString& name = "ObjectControl");
virtual ~tcObjectControl();
private:
--- 176,181 ----
tcObjectControl(wxWindow *parent,
const wxPoint& pos, const wxSize& size,
! const wxString& name = "ObjectControl",
! tc3DWindow* graphicsHost = 0);
virtual ~tcObjectControl();
private:
Index: Game.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/Game.h,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -d -r1.63 -r1.64
*** Game.h 12 Dec 2005 02:37:01 -0000 1.63
--- Game.h 2 Jan 2006 15:40:52 -0000 1.64
***************
*** 153,157 ****
int mnLeftMargin; // width of left auxiliary windows
int mnBottomMargin; // height of bottom aux windows
! wxGLCanvas* glCanvas;
tcSoundConsole* infoConsole; ///< console object for info messages
tcSoundConsole* briefingConsoleLeft; ///< console object for briefing text
--- 153,158 ----
int mnLeftMargin; // width of left auxiliary windows
int mnBottomMargin; // height of bottom aux windows
! wxGLCanvas* glCanvas;
! tc3DWindow* gameWindow; ///< main window for game windows (refactor this)
tcSoundConsole* infoConsole; ///< console object for info messages
tcSoundConsole* briefingConsoleLeft; ///< console object for briefing text
***************
*** 300,303 ****
--- 301,305 ----
void InitializeDirector();
void InitializeDisplaySettingsView();
+ void InitializeGameWindow();
void InitializeMessageCenter();
void InitializeNetworkView();
|
