[Gcblue-commits] gcb_wx/src/graphics tcwindow.cpp,1.14,1.14.2.1

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

Update of /cvsroot/gcblue/gcb_wx/src/graphics
In directory sc8-pr-cvs1:/tmp/cvs-serv29520/src/graphics

Modified Files:
      Tag: v0_5_0
	tcwindow.cpp 
Log Message:
Fixed some bugs: popup menu loc, briefing view symbol placement, block artifacts

Index: tcwindow.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tcwindow.cpp,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -C2 -d -r1.14 -r1.14.2.1
*** tcwindow.cpp	3 Jan 2004 00:45:12 -0000	1.14
--- tcwindow.cpp	19 Jan 2004 21:20:58 -0000	1.14.2.1
***************
*** 51,56 ****
--- 51,64 ----
  EVT_LEAVE_WINDOW(tcWindow::OnLeaveWindow)
  EVT_SIZE(tcWindow::OnSize)
+ EVT_SHOW(tcWindow::OnShow)
  END_EVENT_TABLE()
  
+ 
+ void tcWindow::OnShow(wxShowEvent& event)
+ {
+     fprintf(stdout, "Show event: [%s]\n",GetName());
+     return;
+ }
+ 
  /**
  * This override along with use of Freeze() Thaw() prevents 
***************
*** 107,116 ****
  void tcWindow::OnLButtonDown(wxMouseEvent& event)
  {
!     event.Skip();
  }
  
  void tcWindow::OnLButtonUp(wxMouseEvent& event)
  {
!     event.Skip();
  }
  
--- 115,124 ----
  void tcWindow::OnLButtonDown(wxMouseEvent& event)
  {
!     SkipMouseEvent(event);
  }
  
  void tcWindow::OnLButtonUp(wxMouseEvent& event)
  {
!     SkipMouseEvent(event);
  }
  
***************
*** 137,141 ****
  void tcWindow::OnRButtonDown(wxMouseEvent& event)
  {
!     event.Skip();
  }
  
--- 145,149 ----
  void tcWindow::OnRButtonDown(wxMouseEvent& event)
  {
!     SkipMouseEvent(event);
  }
  
***************
*** 231,241 ****
      if (abActive)
      {
!         wxWindow::Enable(true);
!         //wxWindow::Move(wxPoint(mrectWindow.left,mrectWindow.top));
      }
      else
      {
          wxWindow::Enable(false);
-         //wxWindow::Move(wxPoint(10000,10000));
      }
      mbActive=abActive;
--- 239,251 ----
      if (abActive)
      {
!         wxWindow::Enable(true); 
!         if (!wxWindow::IsShown())
!         {
!             wxWindow::Show(true);
!         }
      }
      else
      {
          wxWindow::Enable(false);
      }
      mbActive=abActive;
***************
*** 568,574 ****
  tcWindow::tcWindow(wxWindow *parent, const wxPoint& pos, const wxSize& size, 
          const wxString& name) :
!         wxWindow(parent, -1, pos, size, wxTRANSPARENT_WINDOW , name),   //| wxNO_FULL_REPAINT_ON_RESIZE |wxCLIP_CHILDREN
          mnHeight(size.GetHeight()), mnWidth(size.GetWidth())
  {
  
      mbCloned = false;
--- 578,586 ----
  tcWindow::tcWindow(wxWindow *parent, const wxPoint& pos, const wxSize& size, 
          const wxString& name) :
!         wxWindow(parent, -1, pos, size, wxTRANSPARENT_WINDOW | wxNO_FULL_REPAINT_ON_RESIZE , name),   //| wxNO_FULL_REPAINT_ON_RESIZE |wxCLIP_CHILDREN
          mnHeight(size.GetHeight()), mnWidth(size.GetWidth())
  {
+     wxWindow::Show(false);
+     SetBackgroundColour(*wxBLACK);
  
      mbCloned = false;