[Wxdevcenter-cvs] StdPlugin/src extmouse.cpp,1.1,1.2

[Emilien K. <cur...@us...>]

Update of /cvsroot/wxdevcenter/StdPlugin/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12699/src

Modified Files:
	extmouse.cpp 
Log Message:
Complément des évènements au troisieme bouton

Index: extmouse.cpp
===================================================================
RCS file: /cvsroot/wxdevcenter/StdPlugin/src/extmouse.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** extmouse.cpp	4 Jan 2005 15:31:56 -0000	1.1
--- extmouse.cpp	4 Jan 2005 15:59:23 -0000	1.2
***************
*** 35,39 ****
  // Constructeur.
  wxExtendedMouseInterface::wxExtendedMouseInterface(wxEvtHandler* pHandler):
!     m_pHandler(pHandler)
  {
  }
--- 35,41 ----
  // Constructeur.
  wxExtendedMouseInterface::wxExtendedMouseInterface(wxEvtHandler* pHandler):
!     m_pHandler(pHandler),
!     m_ptStart(wxDefaultPosition),
!     m_usDrag(wxEMS_NONE)
  {
  }
***************
*** 54,57 ****
--- 56,91 ----
  void wxExtendedMouseInterface::OnMouseEvent(wxMouseEvent& event)
  {
+     if(m_pHandler==NULL)
+         return;
+ 
+     wxExtendedMouseEvent evt(wxEVT_NULL, event.GetId());
+ 
+     if(event.LeftDClick())
+     {
+         m_usDrag  &= ~wxEMS_LEFT_MASK;
+         m_ptStart = wxDefaultPosition;
+         evt.SetEventType(wxEVT_EXTMOUSE_LEFT_DBLCLICK);
+         evt.SetFromPos(event.GetPosition());
+         m_pHandler->ProcessEvent(evt);
+     }
+     else if(event.RightDClick())
+     {
+         m_usDrag  &= ~wxEMS_RIGHT_MASK;
+         m_ptStart = wxDefaultPosition;
+         evt.SetEventType(wxEVT_EXTMOUSE_RIGHT_DBLCLICK);
+         evt.SetFromPos(event.GetPosition());
+         m_pHandler->ProcessEvent(evt);
+     }
+     else if(event.MiddleDClick())
+     {
+         m_usDrag  &= ~wxEMS_MIDDLE_MASK;
+         m_ptStart = wxDefaultPosition;
+         evt.SetEventType(wxEVT_EXTMOUSE_MIDDLE_DBLCLICK);
+         evt.SetFromPos(event.GetPosition());
+         m_pHandler->ProcessEvent(evt);
+     }
+ 
+ 
+ 
      /** @todo.*/
  }
***************
*** 61,78 ****
   * Implémentation des évènements wxExtendedMouseEvent.
   */
! DEFINE_EVENT_TYPE(wxEVT_EXTMOUSE_LEFT_CLICK      )
! DEFINE_EVENT_TYPE(wxEVT_EXTMOUSE_RIGHT_CLICK     )
! DEFINE_EVENT_TYPE(wxEVT_EXTMOUSE_LEFT_DBLCLICK   )
! DEFINE_EVENT_TYPE(wxEVT_EXTMOUSE_RIGHT_DBLCLICK  )
! DEFINE_EVENT_TYPE(wxEVT_EXTMOUSE_LEFT_DOWN       )
! DEFINE_EVENT_TYPE(wxEVT_EXTMOUSE_RIGHT_DOWN      )
! DEFINE_EVENT_TYPE(wxEVT_EXTMOUSE_LEFT_UP         )
! DEFINE_EVENT_TYPE(wxEVT_EXTMOUSE_RIGHT_UP        )
! DEFINE_EVENT_TYPE(wxEVT_EXTMOUSE_LEFT_BEGIN_DRAG )
! DEFINE_EVENT_TYPE(wxEVT_EXTMOUSE_RIGHT_BEGIN_DRAG)
! DEFINE_EVENT_TYPE(wxEVT_EXTMOUSE_LEFT_END_DRAG   )
! DEFINE_EVENT_TYPE(wxEVT_EXTMOUSE_RIGHT_END_DRAG  )
! DEFINE_EVENT_TYPE(wxEVT_EXTMOUSE_LEFT_MOVE_DRAG  )
! DEFINE_EVENT_TYPE(wxEVT_EXTMOUSE_RIGHT_MOVE_DRAG )
  
  wxExtendedMouseEvent::wxExtendedMouseEvent(wxEventType commandType, wxWindowID id, wxPoint ptFrom, wxPoint ptTo):
--- 95,123 ----
   * Implémentation des évènements wxExtendedMouseEvent.
   */
! DEFINE_EVENT_TYPE(wxEVT_EXTMOUSE_LEFT_CLICK       )
! DEFINE_EVENT_TYPE(wxEVT_EXTMOUSE_LEFT_DBLCLICK    )
! DEFINE_EVENT_TYPE(wxEVT_EXTMOUSE_LEFT_DOWN        )
! DEFINE_EVENT_TYPE(wxEVT_EXTMOUSE_LEFT_UP          )
! DEFINE_EVENT_TYPE(wxEVT_EXTMOUSE_LEFT_BEGIN_DRAG  )
! DEFINE_EVENT_TYPE(wxEVT_EXTMOUSE_LEFT_END_DRAG    )
! DEFINE_EVENT_TYPE(wxEVT_EXTMOUSE_LEFT_MOVE_DRAG   )
!                   
! DEFINE_EVENT_TYPE(wxEVT_EXTMOUSE_RIGHT_CLICK      )
! DEFINE_EVENT_TYPE(wxEVT_EXTMOUSE_RIGHT_DBLCLICK   )
! DEFINE_EVENT_TYPE(wxEVT_EXTMOUSE_RIGHT_DOWN       )
! DEFINE_EVENT_TYPE(wxEVT_EXTMOUSE_RIGHT_UP         )
! DEFINE_EVENT_TYPE(wxEVT_EXTMOUSE_RIGHT_BEGIN_DRAG )
! DEFINE_EVENT_TYPE(wxEVT_EXTMOUSE_RIGHT_END_DRAG   )
! DEFINE_EVENT_TYPE(wxEVT_EXTMOUSE_RIGHT_MOVE_DRAG  )
!                   
! DEFINE_EVENT_TYPE(wxEVT_EXTMOUSE_MIDDLE_CLICK     )
! DEFINE_EVENT_TYPE(wxEVT_EXTMOUSE_MIDDLE_DBLCLICK  )
! DEFINE_EVENT_TYPE(wxEVT_EXTMOUSE_MIDDLE_DOWN      )
! DEFINE_EVENT_TYPE(wxEVT_EXTMOUSE_MIDDLE_UP        )
! DEFINE_EVENT_TYPE(wxEVT_EXTMOUSE_MIDDLE_BEGIN_DRAG)
! DEFINE_EVENT_TYPE(wxEVT_EXTMOUSE_MIDDLE_END_DRAG  )
! DEFINE_EVENT_TYPE(wxEVT_EXTMOUSE_MIDDLE_MOVE_DRAG )
! 
! DEFINE_EVENT_TYPE(wxEVT_EXTMOUSE_MOVE             )
  
  wxExtendedMouseEvent::wxExtendedMouseEvent(wxEventType commandType, wxWindowID id, wxPoint ptFrom, wxPoint ptTo):