[Gcblue-commits] gcb_wx/include/graphics tcButton.h,1.15,1.16 tcDatabaseInfoWindow.h,1.3,1.4

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

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

Modified Files:
	tcButton.h tcDatabaseInfoWindow.h 
Log Message:


Index: tcDatabaseInfoWindow.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcDatabaseInfoWindow.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tcDatabaseInfoWindow.h	28 Mar 2006 02:44:45 -0000	1.3
--- tcDatabaseInfoWindow.h	28 Mar 2006 23:58:03 -0000	1.4
***************
*** 82,90 ****
      bool isDragable; ///< true if window can be dragged (moved)
  
- 	void DrawDatabaseInfo();
      bool FinishDestroy();
      void UpdateWindowDrag(const wxPoint& pos);
  
  private:
  	bool destroy; ///< workaround to delay destruction of window to safe time
      
--- 82,95 ----
      bool isDragable; ///< true if window can be dragged (moved)
  
      bool FinishDestroy();
      void UpdateWindowDrag(const wxPoint& pos);
  
  private:
+     enum ViewMode
+     {
+         POPUP = 0, ///< compact view for popups
+         EMBED = 1 ///< mode for database viewer screen
+     } viewMode;  ///< mode automatically selected based on hostParent argument to constructor
+ 
  	bool destroy; ///< workaround to delay destruction of window to safe time
      
***************
*** 97,102 ****
--- 102,112 ----
  	static tc3DWindow* parent;
  
+ 	void DrawDatabaseInfo();
+     void DrawDatabaseImages();
  	database::tcDatabaseObject* GetDatabaseObject();
      void LoadImageList();
+     bool IsEmbedded() const;
+     bool IsPopup() const;
+     
  
      DECLARE_EVENT_TABLE()

Index: tcButton.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcButton.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** tcButton.h	27 Mar 2006 01:08:30 -0000	1.15
--- tcButton.h	28 Mar 2006 23:58:03 -0000	1.16
***************
*** 60,63 ****
--- 60,65 ----
      void SetFontSize(float val);
      void SetForceDisable(bool state);
+     void SetMouseOverCaption(const std::string& s);
+     void SetMouseOverCaptionPosition(const wxPoint& pos);
      void SetOn(bool state) {isButtonOn = state;}
      void SetSendRedraw(bool state) {sendRedraw = state;}
***************
*** 79,82 ****
--- 81,87 ----
      float backgroundAlpha;  ///< transparency value for solid color background
      bool forceDisable; ///< if true then do not enable button
+     std::string mouseOverCaption; ///< additional caption to draw when mouse is over button
+     wxPoint mouseOverCaptionPosition; ///< location to draw mouse over caption at
+ 
  
      osg::Vec4 offColor;
***************
*** 96,99 ****
--- 101,105 ----
      static unsigned ref_count;
  
+     void DrawMouseOverCaption();
      virtual void OnEnterWindow(wxMouseEvent& event);
      virtual void OnLButtonDown(wxMouseEvent& event);