[Gcblue-commits] gcb_wx/include/graphics tcChatBox.h, 1.3, 1.4 tcDatabaseInfoWindow.h, 1.7, 1.8 tcOOBView.h, 1.8, 1.9 tcXmlWindow.h, 1.9, 1.10

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

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

Modified Files:
	tcChatBox.h tcDatabaseInfoWindow.h tcOOBView.h tcXmlWindow.h 
Log Message:


Index: tcXmlWindow.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcXmlWindow.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** tcXmlWindow.h	6 Sep 2006 01:28:20 -0000	1.9
--- tcXmlWindow.h	2 Dec 2006 02:23:48 -0000	1.10
***************
*** 43,46 ****
--- 43,47 ----
  {
  public:
+ 	virtual void DestroyWindow();
      /// find first button with matching command and set force disable state
      void SetButtonDisable(long command, bool state);
***************
*** 50,53 ****
--- 51,55 ----
  	/// find first button with matching command and change caption
  	void SetButtonCaption(long command, const std::string& caption);
+     void SetDragable(bool state);
  	void SetRadioButtonState(long radioCommand, long buttonCommand);
  
***************
*** 58,68 ****
--- 60,85 ----
  		tc3DWindow* graphicsHost = 0);
      virtual ~tcXmlWindow();
+ 
  protected:
      TiXmlDocument* config; ///< XML auto-configuration file for window
  	static int windowLayer;  ///< used to achieve some layering of GUI windows (last always on top)
  
+ 	// params for window drag
+     bool isLButtonDown;
+     bool windowDragOn;
+ 	wxPoint windowDragPoint;
+     bool isDragable; ///< true if window can be dragged (moved)
+ 
+     void UpdateWindowDrag(const wxPoint& pos);
+     bool FinishDestroy();
+ 
      virtual void OnButtonCommand(wxCommandEvent& event);
+     virtual void OnLButtonDown(wxMouseEvent& event);
+     virtual void OnLButtonUp(wxMouseEvent& event);
+ 	virtual void OnMouseMove(wxMouseEvent& event);
+ 
  private:
      static unsigned ref_count;
+ 	bool destroy; ///< flag to delay destruction of window to safe time
  
      void AddXMLControls(); ///< adds XML controls to window that can be added automatically

Index: tcOOBView.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcOOBView.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** tcOOBView.h	22 Mar 2006 01:23:29 -0000	1.8
--- tcOOBView.h	2 Dec 2006 02:23:48 -0000	1.9
***************
*** 75,79 ****
      tcSimState* mpSimState; ///< for retrieving platform info
      tcTacticalMapView *mpMapView;
-     int mnAlliance;  ///< alliance to display
  
      // own alliance
--- 75,78 ----

Index: tcDatabaseInfoWindow.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcDatabaseInfoWindow.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** tcDatabaseInfoWindow.h	20 Nov 2006 00:16:28 -0000	1.7
--- tcDatabaseInfoWindow.h	2 Dec 2006 02:23:48 -0000	1.8
***************
*** 49,53 ****
  {
  public:
- 	virtual void DestroyWindow();
      virtual void Draw();
  
--- 49,52 ----
***************
*** 66,76 ****
      /// set id of game object to display info for (must be classified if track)
  	void SetDatabaseObject(long id);
-    
-     void SetDragable(bool state);
  
  	static void SetParent(tc3DWindow* win);
  	
  
- 
      tcDatabaseInfoWindow(const wxPoint& pos,
  		const wxString& configFile = "xml/database_info.xml",
--- 65,72 ----
***************
*** 83,95 ****
      unsigned int drawCount;
  
- 	// params for window drag (move this function to base class?)
-     bool isLButtonDown;
-     bool windowDragOn;
- 	wxPoint windowDragPoint;
-     bool isDragable; ///< true if window can be dragged (moved)
- 
-     bool FinishDestroy();
-     void UpdateWindowDrag(const wxPoint& pos);
- 
  private:
      enum ViewMode
--- 79,82 ----
***************
*** 99,104 ****
      } viewMode;  ///< mode automatically selected based on hostParent argument to constructor
  
! 	bool destroy; ///< workaround to delay destruction of window to safe time
!     
      long objId; ///< id of obj or track to display info for
  	std::string databaseClassName; ///< class name of database object, empty if not looked up yet
--- 86,90 ----
      } viewMode;  ///< mode automatically selected based on hostParent argument to constructor
  
! 
      long objId; ///< id of obj or track to display info for
  	std::string databaseClassName; ///< class name of database object, empty if not looked up yet

Index: tcChatBox.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcChatBox.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tcChatBox.h	22 Mar 2006 01:23:28 -0000	1.3
--- tcChatBox.h	2 Dec 2006 02:23:48 -0000	1.4
***************
*** 44,48 ****
--- 44,50 ----
      void Draw();
      void OnLButtonDown(wxMouseEvent& event);
+     void OnRButtonDown(wxMouseEvent& event);
  	void OnChar(wxKeyEvent& event);
+     void OnCloseCommand(wxCommandEvent& event);
  	void OnKeyDown(wxKeyEvent& event);
      void SendChatText(wxCommandEvent& event);