[Frontierproject-cvs] frontierproject/include widget_painter.h, 1.16, 1.17

[Brandon B. <bdr...@us...>]

Update of /cvsroot/frontierproject/frontierproject/include
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv27271/include

Modified Files:
	widget_painter.h 
Log Message:
Wormholes!

Index: widget_painter.h
===================================================================
RCS file: /cvsroot/frontierproject/frontierproject/include/widget_painter.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** widget_painter.h	31 May 2006 22:31:30 -0000	1.16
--- widget_painter.h	1 Jun 2006 05:23:19 -0000	1.17
***************
*** 48,52 ****
      ID_ZOOMIN,
      ID_ZOOMOUT,
!     ID_TOGGLE_SHOWPLANETNAMES,
      ID_TOGGLE_PLANETVALUEVIEW,
      ID_SWITCHMODE,
--- 48,52 ----
      ID_ZOOMIN,
      ID_ZOOMOUT,
!     //ID_TOGGLE_SHOWPLANETNAMES,
      ID_TOGGLE_PLANETVALUEVIEW,
      ID_SWITCHMODE,
***************
*** 95,98 ****
--- 95,99 ----
    void layout();
    void setZoom(FXfloat zoom);
+   void setScanEffectiveness(FXfloat eff);
    
    //Message Handlers
***************
*** 130,135 ****
    FXPixel bgcol;
    
    FXbool *simulateShift;
!   FXbool *d_drawFlags;
    
    //Disable default and copy ctors.
--- 131,146 ----
    FXPixel bgcol;
    
+   FXint  *mode;
    FXbool *simulateShift;
!   FXbool *overlayFlags;
!   FXbool *overlayPlanetNames;
!   FXbool *overlayMineFields;
!   FXbool *overlayFleetPaths;
!   FXbool *overlayShipCounts;
!   FXbool *overlayScanners;
!   
!   FXfloat scanner_effectiveness;
!   
!   FXIcon *wh;
    
    //Disable default and copy ctors.
***************
*** 144,147 ****
--- 155,160 ----
    FXFont* tinyFont;  //@@@ Move these to some global thing?
    
+   FXFont* planetFont;
+   
    int viewMode;
  
***************
*** 165,172 ****
    FXshort uMaxY;
  
!   FXbool flag_showplanetnames;
    FXbool flag_planetvalueview;
  
!   void calcFont(FXDCWindow &dc);
  
    //From the department of *EWWWW* comes...
--- 178,185 ----
    FXshort uMaxY;
  
!   //FXbool flag_showplanetnames;
    FXbool flag_planetvalueview;
  
!   void calcFont();
  
    //From the department of *EWWWW* comes...