[Gcblue-commits] gcb_wx/include/graphics tcContainerGui.h,1.2,1.3 tcMapView.h,1.24,1.25
Status: Alpha
Brought to you by:
ddcforge
|
From: Dewitt C. <ddc...@us...> - 2005-12-24 07:41:27
|
Update of /cvsroot/gcblue/gcb_wx/include/graphics In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9801/include/graphics Modified Files: tcContainerGui.h tcMapView.h Log Message: minor gui updates Index: tcMapView.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcMapView.h,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** tcMapView.h 18 Dec 2005 18:48:16 -0000 1.24 --- tcMapView.h 24 Dec 2005 07:41:19 -0000 1.25 *************** *** 228,238 **** tcTerrainView *terrainView; - /* - Gdiplus::Pen *mpPen; ///< GDI+ objects - Gdiplus::Pen *mpPenThin; - Gdiplus::SolidBrush *mpBrush; - Gdiplus::Font *mpFont; - Gdiplus::Font *mpFontSmall; - */ osg::Vec4 ConvertColor(unsigned int nColor); --- 228,231 ---- *************** *** 258,263 **** bool mbShowTrackID; float mfFrameRate; ! int mnScrollState; ! float mfScrollDirection; std::vector<long> hookedId; ///< vector of hooked obj ids --- 251,259 ---- bool mbShowTrackID; float mfFrameRate; ! ! // auto-scroll params ! bool scrollActive; ! unsigned int lastScrollTime; ! float scrollDirection; std::vector<long> hookedId; ///< vector of hooked obj ids Index: tcContainerGui.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcContainerGui.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** tcContainerGui.h 18 Dec 2005 18:48:16 -0000 1.2 --- tcContainerGui.h 24 Dec 2005 07:41:19 -0000 1.3 *************** *** 114,117 **** --- 114,118 ---- tcContainerItem* parentItem; ///< item that was clicked to popup this gui (if applicable) static tc3DWindow* parent; + static int windowLayer; ///< used to achieve some layering of GUI windows (last always on top) DECLARE_EVENT_TABLE() |