[Gcblue-commits] gcb_wx/include/sim Game.h,1.22,1.22.2.1 tcMapView.h,1.12,1.12.2.1 tcObjectControl.h,1.4,1.4.2.1 tcStartView.h,1.4,1.4.2.1

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

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

Modified Files:
      Tag: v0_5_0
	Game.h tcMapView.h tcObjectControl.h tcStartView.h 
Log Message:


Index: Game.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/Game.h,v
retrieving revision 1.22
retrieving revision 1.22.2.1
diff -C2 -d -r1.22 -r1.22.2.1
*** Game.h	5 Jan 2004 02:48:02 -0000	1.22
--- Game.h	17 Feb 2004 14:27:01 -0000	1.22.2.1
***************
*** 138,141 ****
--- 138,142 ----
      int mnBriefingWidth; // dimensions of briefing window
      int mnLeftMargin;    // width of left auxiliary windows
+     int mnLeftMargin2;   // width of aux window in second column (hookinfo)
      int mnBottomMargin;  // height of bottom aux windows
      tcSoundConsole *infoConsole; ///< console object for info messages
***************
*** 250,253 ****
--- 251,255 ----
      void InitializeOptionsView();
      void InitializeScenarioSelectView();
+     void InitializeScreenSizeParams(const wxSize& screenSize);
      void InitializeStartView();    
      void InitializeTacticalMap();

Index: tcMapView.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcMapView.h,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -C2 -d -r1.12 -r1.12.2.1
*** tcMapView.h	5 Jan 2004 02:48:02 -0000	1.12
--- tcMapView.h	17 Feb 2004 14:27:01 -0000	1.12.2.1
***************
*** 156,161 ****
          float mfGridSize_rad;
          float mfGridBaseLon_rad,mfGridBaseLat_rad;
!         float mfScale_pelprad;	///< map scale, pixels per radian
!         float mfScale_radppel;  ///< map scale, radians per pixel
          std::vector<tcMapObject*> specialGraphics; ///< mission graphics display for now
  
--- 156,163 ----
          float mfGridSize_rad;
          float mfGridBaseLon_rad,mfGridBaseLat_rad;
!         float mfScaleX_pelprad;	///< map scale in X, pixels per radian
!         float mfScaleX_radppel;  ///< map scale in X, radians per pixel
!         float mfScaleY_pelprad;	///< map scale in Y, pixels per radian
!         float mfScaleY_radppel;  ///< map scale in Y, radians per pixel
          std::vector<tcMapObject*> specialGraphics; ///< mission graphics display for now
  
***************
*** 192,195 ****
--- 194,198 ----
          tcPoint ScreenToGeo(float x, float y);
          void SetActive(bool abActive); ///< overrides base class
+         void SetSize(const wxRect& rect);
          void SetView(tcPoint center, float afLonSpan);
          void SetViewCenterZoom(wxPoint pscreen, float afZoom);

Index: tcObjectControl.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcObjectControl.h,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -d -r1.4 -r1.4.2.1
*** tcObjectControl.h	8 Dec 2003 03:06:36 -0000	1.4
--- tcObjectControl.h	17 Feb 2004 14:27:01 -0000	1.4.2.1
***************
*** 100,104 ****
     teButtonState maButtonState[MAX_PANELROWS][N_PANELBUTTONS];
  
!    void Init(int anPanelType);
     void Draw(Gdiplus::Graphics *apGraphics);
     void DrawButton(Gdiplus::Graphics *apGraphics, const Gdiplus::RectF& rectf, 
--- 100,104 ----
     teButtonState maButtonState[MAX_PANELROWS][N_PANELBUTTONS];
  
!    void Init(int anPanelType, int windowWidth);
     void Draw(Gdiplus::Graphics *apGraphics);
     void DrawButton(Gdiplus::Graphics *apGraphics, const Gdiplus::RectF& rectf, 

Index: tcStartView.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcStartView.h,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -d -r1.4 -r1.4.2.1
*** tcStartView.h	3 Dec 2003 05:50:19 -0000	1.4
--- tcStartView.h	17 Feb 2004 14:27:01 -0000	1.4.2.1
***************
*** 47,50 ****
--- 47,51 ----
        int mnButtonWidth;
        int mnButtonHeight;
+       
        Gdiplus::Image *mpiButtonOn;
        Gdiplus::Image *mpiButtonOver;
***************
*** 82,85 ****
--- 83,87 ----
     tsButtonInfo maButton[N_START_BUTTONS];
     int mnXStart,mnYStart;
+    int mnButtonSpacing;
     tcSound *mpSound;
  };