Update of /cvsroot/gcblue/gcb_wx/include/graphics
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11821/include/graphics
Modified Files:
tcLauncherPopup.h tcMapView.h tcMessageChannel.h
tcNumberWidget.h
Log Message:
Better sensor ageout behavior, more ai work, misc cleanup
Index: tcMessageChannel.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcMessageChannel.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** tcMessageChannel.h 14 Nov 2004 22:52:20 -0000 1.1
--- tcMessageChannel.h 4 Mar 2005 00:46:15 -0000 1.2
***************
*** 56,60 ****
void SetTextRect(tcRect r);
! tcMessageChannel(std::string name);
virtual ~tcMessageChannel();
--- 56,60 ----
void SetTextRect(tcRect r);
! tcMessageChannel(const std::string& name);
virtual ~tcMessageChannel();
Index: tcLauncherPopup.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcLauncherPopup.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tcLauncherPopup.h 21 Dec 2004 02:26:17 -0000 1.3
--- tcLauncherPopup.h 4 Mar 2005 00:46:15 -0000 1.4
***************
*** 68,74 ****
--- 68,76 ----
virtual void OnLaunchCommand(wxCommandEvent& event);
+ virtual void OnChar(wxKeyEvent& event);
virtual void OnLButtonDown(wxMouseEvent& event);
virtual void OnLButtonUp(wxMouseEvent& event);
virtual void OnMouseMove(wxMouseEvent& event);
+ virtual void OnRButtonDown(wxMouseEvent& event);
Index: tcMapView.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcMapView.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** tcMapView.h 2 Mar 2005 22:28:37 -0000 1.13
--- tcMapView.h 4 Mar 2005 00:46:15 -0000 1.14
***************
*** 326,330 ****
void ClearMapObjects();
void Init();
! void SetDateTime(std::string s) {dateTime = s;}
void SetHookID(long id);
void SetGroupHook(std::vector<long>& hookedUnits);
--- 326,330 ----
void ClearMapObjects();
void Init();
! void SetDateTime(const std::string& s) {dateTime = s;}
void SetHookID(long id);
void SetGroupHook(std::vector<long>& hookedUnits);
Index: tcNumberWidget.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcNumberWidget.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tcNumberWidget.h 31 Jan 2005 01:32:36 -0000 1.2
--- tcNumberWidget.h 4 Mar 2005 00:46:15 -0000 1.3
***************
*** 76,79 ****
--- 76,80 ----
unsigned int buttonDownTime;
+ virtual void OnChar(wxKeyEvent& event);
virtual void OnEnterWindow(wxMouseEvent& event);
virtual void OnLButtonDown(wxMouseEvent& event);
***************
*** 84,87 ****
--- 85,92 ----
void SendRedraw();
void UpdateAutoChange();
+ private:
+ const unsigned int keyboardTimeout;
+ bool keyboardWait; ///< true to update value with keyboard
+ unsigned int lastKeypressTime;
};
|
