Menu
▾
▴
wxdevcenter-cvs — cvs/svn commits for wxDevCenter and StdPlugin
You can subscribe to this list here.
| 2005 |
Jan
(98) |
Feb
(101) |
Mar
(60) |
Apr
(38) |
May
(26) |
Jun
|
Jul
|
Aug
(159) |
Sep
(78) |
Oct
(31) |
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(4) |
Sep
(6) |
Oct
|
Nov
(1) |
Dec
(3) |
| 2010 |
Jan
|
Feb
|
Mar
|
Apr
(3) |
May
(5) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2011 |
Jan
(8) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Emilien K. <cur...@us...> - 2005-01-06 14:56:01
|
Update of /cvsroot/wxdevcenter/StdPlugin/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20128/src Added Files: Controls.cpp Log Message: Import initial --- NEW FILE: Controls.cpp --- (This appears to be a binary file; contents omitted.) |
|
From: Emilien K. <cur...@us...> - 2005-01-06 14:56:00
|
Update of /cvsroot/wxdevcenter/StdPlugin/include/wxDevCenter/StdPlugin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20128/include/wxDevCenter/StdPlugin Added Files: Controls.h Log Message: Import initial --- NEW FILE: Controls.h --- (This appears to be a binary file; contents omitted.) |
|
From: Emilien K. <cur...@us...> - 2005-01-04 16:53:16
|
Update of /cvsroot/wxdevcenter/StdPlugin/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25675/src Modified Files: extmouse.cpp Log Message: Ajout du code de génération des évènements souris étendus. Index: extmouse.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/StdPlugin/src/extmouse.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** extmouse.cpp 4 Jan 2005 16:13:13 -0000 1.3 --- extmouse.cpp 4 Jan 2005 16:53:05 -0000 1.4 *************** *** 36,40 **** wxExtendedMouseInterface::wxExtendedMouseInterface(wxEvtHandler* pHandler): m_pHandler(pHandler), ! m_ptStart(wxDefaultPosition), m_usDrag(wxEMS_NONE) { --- 36,42 ---- wxExtendedMouseInterface::wxExtendedMouseInterface(wxEvtHandler* pHandler): m_pHandler(pHandler), ! m_ptLeft(wxDefaultPosition), ! m_ptRight(wxDefaultPosition), ! m_ptMiddle(wxDefaultPosition), m_usDrag(wxEMS_NONE) { *************** *** 75,86 **** usFlags |= wxExtendedMouseEvent::wxEME_SHIFT; ! wxExtendedMouseEvent evt(wxEVT_NULL, event.GetId(), wxDefaultPosition, wxDefaultPosition, usFlags); 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); } --- 77,88 ---- usFlags |= wxExtendedMouseEvent::wxEME_SHIFT; ! wxExtendedMouseEvent evt; + // Doubles clics if(event.LeftDClick()) { m_usDrag &= ~wxEMS_LEFT_MASK; ! m_ptLeft = wxDefaultPosition; ! evt = wxExtendedMouseEvent(wxEVT_EXTMOUSE_LEFT_DBLCLICK, event.GetId(), event.GetPosition(), wxDefaultPosition, usFlags); m_pHandler->ProcessEvent(evt); } *************** *** 88,94 **** { m_usDrag &= ~wxEMS_RIGHT_MASK; ! m_ptStart = wxDefaultPosition; ! evt.SetEventType(wxEVT_EXTMOUSE_RIGHT_DBLCLICK); ! evt.SetFromPos(event.GetPosition()); m_pHandler->ProcessEvent(evt); } --- 90,95 ---- { m_usDrag &= ~wxEMS_RIGHT_MASK; ! m_ptRight = wxDefaultPosition; ! evt = wxExtendedMouseEvent(wxEVT_EXTMOUSE_RIGHT_DBLCLICK, event.GetId(), event.GetPosition(), wxDefaultPosition, usFlags); m_pHandler->ProcessEvent(evt); } *************** *** 96,108 **** { m_usDrag &= ~wxEMS_MIDDLE_MASK; ! m_ptStart = wxDefaultPosition; ! evt.SetEventType(wxEVT_EXTMOUSE_MIDDLE_DBLCLICK); ! evt.SetFromPos(event.GetPosition()); m_pHandler->ProcessEvent(evt); } ! /** @todo.*/ } --- 97,210 ---- { m_usDrag &= ~wxEMS_MIDDLE_MASK; ! m_ptMiddle = wxDefaultPosition; ! evt = wxExtendedMouseEvent(wxEVT_EXTMOUSE_MIDDLE_DBLCLICK, event.GetId(), event.GetPosition(), wxDefaultPosition, usFlags); m_pHandler->ProcessEvent(evt); } + // Abaissement d'un bouton. + else if(event.LeftDown()) + { + m_usDrag = m_usDrag&(wxEMS_RIGHT_MASK|wxEMS_MIDDLE_MASK) | wxEMS_LEFT_DOWN; + m_ptLeft = event.GetPosition(); + evt = wxExtendedMouseEvent(wxEVT_EXTMOUSE_LEFT_DOWN, event.GetId(), m_ptLeft, wxDefaultPosition, usFlags); + m_pHandler->ProcessEvent(evt); + } + else if(event.RightDown()) + { + m_usDrag = m_usDrag&(wxEMS_LEFT_MASK|wxEMS_MIDDLE_MASK) | wxEMS_RIGHT_DOWN; + m_ptRight = event.GetPosition(); + evt = wxExtendedMouseEvent(wxEVT_EXTMOUSE_RIGHT_DOWN, event.GetId(), m_ptRight, wxDefaultPosition, usFlags); + m_pHandler->ProcessEvent(evt); + } + else if(event.MiddleDown()) + { + m_usDrag = m_usDrag&(wxEMS_LEFT_MASK|wxEMS_RIGHT_MASK) | wxEMS_MIDDLE_DOWN; + m_ptMiddle = event.GetPosition(); + evt = wxExtendedMouseEvent(wxEVT_EXTMOUSE_MIDDLE_DOWN, event.GetId(), m_ptMiddle, wxDefaultPosition, usFlags); + } + // Relève d'un bouton + else if(event.LeftUp()) + { + if(m_usDrag&wxEMS_LEFT_DRAG) + { + evt = wxExtendedMouseEvent(wxEVT_EXTMOUSE_LEFT_END_DRAG, event.GetId(), m_ptLeft, event.GetPosition(), usFlags); + m_pHandler->ProcessEvent(evt); + } + evt = wxExtendedMouseEvent(wxEVT_EXTMOUSE_LEFT_UP, event.GetId(), event.GetPosition(), wxDefaultPosition, usFlags); + m_pHandler->ProcessEvent(evt); + m_ptLeft = wxDefaultPosition; + m_usDrag = m_usDrag&(wxEMS_RIGHT_MASK|wxEMS_MIDDLE_MASK); + } + else if(event.RightUp()) + { + if(m_usDrag&wxEMS_RIGHT_DRAG) + { + evt = wxExtendedMouseEvent(wxEVT_EXTMOUSE_RIGHT_END_DRAG, event.GetId(), m_ptRight, event.GetPosition(), usFlags); + m_pHandler->ProcessEvent(evt); + } + evt = wxExtendedMouseEvent(wxEVT_EXTMOUSE_RIGHT_UP, event.GetId(), event.GetPosition(), wxDefaultPosition, usFlags); + m_pHandler->ProcessEvent(evt); + m_ptRight = wxDefaultPosition; + m_usDrag = m_usDrag&(wxEMS_LEFT_MASK|wxEMS_MIDDLE_MASK); + } + else if(event.MiddleUp()) + { + if(m_usDrag&wxEMS_MIDDLE_DRAG) + { + evt = wxExtendedMouseEvent(wxEVT_EXTMOUSE_MIDDLE_END_DRAG, event.GetId(), m_ptMiddle, event.GetPosition(), usFlags); + m_pHandler->ProcessEvent(evt); + } + evt = wxExtendedMouseEvent(wxEVT_EXTMOUSE_MIDDLE_UP, event.GetId(), event.GetPosition(), wxDefaultPosition, usFlags); + m_pHandler->ProcessEvent(evt); + m_ptMiddle = wxDefaultPosition; + m_usDrag = m_usDrag&(wxEMS_LEFT_MASK|wxEMS_RIGHT_MASK); + } ! // Déplacement ! else if(event.GetEventType()==wxEVT_MOTION) ! { ! // Début de glissade ! if((m_usDrag&wxEMS_LEFT_MASK) == wxEMS_LEFT_DOWN) ! { ! evt = wxExtendedMouseEvent(wxEVT_EXTMOUSE_LEFT_BEGIN_DRAG, event.GetId(), m_ptLeft, event.GetPosition(), usFlags); ! m_pHandler->ProcessEvent(evt); ! m_usDrag |= wxEMS_LEFT_DRAG; ! } ! if((m_usDrag&wxEMS_RIGHT_MASK) == wxEMS_RIGHT_DOWN) ! { ! evt = wxExtendedMouseEvent(wxEVT_EXTMOUSE_RIGHT_BEGIN_DRAG, event.GetId(), m_ptRight, event.GetPosition(), usFlags); ! m_pHandler->ProcessEvent(evt); ! m_usDrag |= wxEMS_RIGHT_DRAG; ! } ! if((m_usDrag&wxEMS_MIDDLE_MASK) == wxEMS_MIDDLE_DOWN) ! { ! evt = wxExtendedMouseEvent(wxEVT_EXTMOUSE_MIDDLE_BEGIN_DRAG, event.GetId(), m_ptMiddle, event.GetPosition(), usFlags); ! m_pHandler->ProcessEvent(evt); ! m_usDrag |= wxEMS_RIGHT_DRAG; ! } ! // Glissade ! if(m_usDrag&wxEMS_LEFT_DRAG) ! { ! evt = wxExtendedMouseEvent(wxEVT_EXTMOUSE_LEFT_MOVE_DRAG, event.GetId(), m_ptLeft, event.GetPosition(), usFlags); ! m_pHandler->ProcessEvent(evt); ! } ! if(m_usDrag&wxEMS_RIGHT_DRAG) ! { ! evt = wxExtendedMouseEvent(wxEVT_EXTMOUSE_RIGHT_MOVE_DRAG, event.GetId(), m_ptRight, event.GetPosition(), usFlags); ! m_pHandler->ProcessEvent(evt); ! } ! if(m_usDrag&wxEMS_MIDDLE_DRAG) ! { ! evt = wxExtendedMouseEvent(wxEVT_EXTMOUSE_MIDDLE_MOVE_DRAG, event.GetId(), m_ptMiddle, event.GetPosition(), usFlags); ! m_pHandler->ProcessEvent(evt); ! } ! // Mouvement sans glissade ! if((m_usDrag&(wxEMS_LEFT_DRAG|wxEMS_RIGHT_DRAG|wxEMS_MIDDLE_DRAG)) == 0) ! { ! evt = wxExtendedMouseEvent(wxEVT_EXTMOUSE_MOVE, event.GetId(), event.GetPosition(), wxDefaultPosition, usFlags); ! m_pHandler->ProcessEvent(evt); ! } ! } } *************** *** 145,148 **** --- 247,269 ---- } + wxExtendedMouseEvent::wxExtendedMouseEvent(wxExtendedMouseEvent& event): + wxCommandEvent(event.GetEventType(), event.GetId()), + m_pt1(event.GetFromPos()), + m_pt2(event.GetToPos()), + m_usFlag(event.GetState()) + { + } + + wxExtendedMouseEvent& wxExtendedMouseEvent::operator=(const wxExtendedMouseEvent& event) + { + SetEventType(event.GetEventType()); + SetId(event.GetId()); + m_pt1 = event.GetFromPos(); + m_pt2 = event.GetToPos(); + m_usFlag = event.GetState(); + return *this; + } + + wxEvent* wxExtendedMouseEvent::Clone(void) const { |
|
From: Emilien K. <cur...@us...> - 2005-01-04 16:53:15
|
Update of /cvsroot/wxdevcenter/StdPlugin/include/wxDevCenter/StdPlugin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25675/include/wxDevCenter/StdPlugin Modified Files: extmouse.h Log Message: Ajout du code de génération des évènements souris étendus. Index: extmouse.h =================================================================== RCS file: /cvsroot/wxdevcenter/StdPlugin/include/wxDevCenter/StdPlugin/extmouse.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** extmouse.h 4 Jan 2005 16:13:12 -0000 1.3 --- extmouse.h 4 Jan 2005 16:53:05 -0000 1.4 *************** *** 58,63 **** wxEvtHandler* m_pHandler; ! /** Position de départ.*/ ! wxPoint m_ptStart; /** Etat de glissade.*/ unsigned short m_usDrag; --- 58,67 ---- wxEvtHandler* m_pHandler; ! /** Position de départ gauche.*/ ! wxPoint m_ptLeft; ! /** Position de départ droit.*/ ! wxPoint m_ptRight; ! /** Position de départ milieu.*/ ! wxPoint m_ptMiddle; /** Etat de glissade.*/ unsigned short m_usDrag; *************** *** 123,126 **** --- 127,132 ---- public: wxExtendedMouseEvent(wxEventType commandType = wxEVT_NULL, wxWindowID id=-1, wxPoint ptFrom = wxDefaultPosition, wxPoint ptTo = wxDefaultPosition, unsigned short usFlags = 0); + wxExtendedMouseEvent(wxExtendedMouseEvent& event); + wxExtendedMouseEvent& operator=(const wxExtendedMouseEvent& event); wxEvent* Clone(void) const; *************** *** 152,165 **** void SetState(unsigned short usState=0){m_usFlag = usState;} ! bool LeftIsDown()const{return m_usFlag&wxEME_LEFT;} ! bool RightIsDown()const{return m_usFlag&wxEME_RIGHT;} ! bool MiddleIsDown()const{return m_usFlag&wxEME_MIDDLE;} ! bool AltIsDown()const{return m_usFlag&wxEME_ALT;} ! bool CtrlIsDown()const{return m_usFlag&wxEME_CTRL;} ! bool MetaIsDown()const{return m_usFlag&wxEME_META;} ! bool ShiftIsDown()const{return m_usFlag&wxEME_SHIFT;} private: - wxExtendedMouseEvent& operator=(const wxExtendedMouseEvent& event); wxPoint m_pt1, m_pt2; --- 158,170 ---- void SetState(unsigned short usState=0){m_usFlag = usState;} ! bool LeftIsDown()const{return (m_usFlag&wxEME_LEFT)!=0;} ! bool RightIsDown()const{return (m_usFlag&wxEME_RIGHT)!=0;} ! bool MiddleIsDown()const{return (m_usFlag&wxEME_MIDDLE)!=0;} ! bool AltIsDown()const{return (m_usFlag&wxEME_ALT)!=0;} ! bool CtrlIsDown()const{return (m_usFlag&wxEME_CTRL)!=0;} ! bool MetaIsDown()const{return (m_usFlag&wxEME_META)!=0;} ! bool ShiftIsDown()const{return (m_usFlag&wxEME_SHIFT)!=0;} private: wxPoint m_pt1, m_pt2; |
|
From: Emilien K. <cur...@us...> - 2005-01-04 16:13:46
|
Update of /cvsroot/wxdevcenter/StdPlugin/include/wxDevCenter/StdPlugin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16013/include/wxDevCenter/StdPlugin Modified Files: extmouse.h Log Message: Etat des touches et des boutons indépendament des évènements. Index: extmouse.h =================================================================== RCS file: /cvsroot/wxdevcenter/StdPlugin/include/wxDevCenter/StdPlugin/extmouse.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** extmouse.h 4 Jan 2005 15:59:16 -0000 1.2 --- extmouse.h 4 Jan 2005 16:13:12 -0000 1.3 *************** *** 121,130 **** class STD_DLL_PLUGIN wxExtendedMouseEvent : public wxCommandEvent { - private: - wxExtendedMouseEvent& operator=(const wxExtendedMouseEvent& event); - - wxPoint m_pt1, m_pt2; public: ! wxExtendedMouseEvent(wxEventType commandType = wxEVT_NULL, wxWindowID id=-1, wxPoint ptFrom = wxDefaultPosition, wxPoint ptTo = wxDefaultPosition); wxEvent* Clone(void) const; --- 121,126 ---- class STD_DLL_PLUGIN wxExtendedMouseEvent : public wxCommandEvent { public: ! wxExtendedMouseEvent(wxEventType commandType = wxEVT_NULL, wxWindowID id=-1, wxPoint ptFrom = wxDefaultPosition, wxPoint ptTo = wxDefaultPosition, unsigned short usFlags = 0); wxEvent* Clone(void) const; *************** *** 133,136 **** --- 129,169 ---- wxPoint GetToPos()const {return m_pt2;} void SetToPos(wxPoint pt){m_pt2 = pt;} + + enum wxEME_FLAGS + { + wxEME_NULL = 0x0000, + + wxEME_LEFT = 0x0001, + wxEME_RIGHT = 0x0002, + wxEME_MIDDLE= 0x0004, + + wxEME_ALT = 0x0010, + wxEME_CTRL = 0x0020, + wxEME_META = 0x0040, + wxEME_SHIFT = 0x0080, + + wxEME_BUTTON_MASK = 0x000F, + wxEME_KEY_MASK = 0x00F0, + wxEME_ALL_MASK = 0x00FF + }; + + + unsigned short GetState()const {return m_usFlag;} + void SetState(unsigned short usState=0){m_usFlag = usState;} + + bool LeftIsDown()const{return m_usFlag&wxEME_LEFT;} + bool RightIsDown()const{return m_usFlag&wxEME_RIGHT;} + bool MiddleIsDown()const{return m_usFlag&wxEME_MIDDLE;} + bool AltIsDown()const{return m_usFlag&wxEME_ALT;} + bool CtrlIsDown()const{return m_usFlag&wxEME_CTRL;} + bool MetaIsDown()const{return m_usFlag&wxEME_META;} + bool ShiftIsDown()const{return m_usFlag&wxEME_SHIFT;} + + private: + wxExtendedMouseEvent& operator=(const wxExtendedMouseEvent& event); + + wxPoint m_pt1, m_pt2; + + unsigned short m_usFlag; }; |
|
From: Emilien K. <cur...@us...> - 2005-01-04 16:13:39
|
Update of /cvsroot/wxdevcenter/StdPlugin/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16013/src Modified Files: extmouse.cpp Log Message: Etat des touches et des boutons indépendament des évènements. Index: extmouse.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/StdPlugin/src/extmouse.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** extmouse.cpp 4 Jan 2005 15:59:23 -0000 1.2 --- extmouse.cpp 4 Jan 2005 16:13:13 -0000 1.3 *************** *** 59,63 **** return; ! wxExtendedMouseEvent evt(wxEVT_NULL, event.GetId()); if(event.LeftDClick()) --- 59,79 ---- return; ! unsigned short usFlags = wxExtendedMouseEvent::wxEME_NULL; ! if(event.LeftIsDown()) ! usFlags |= wxExtendedMouseEvent::wxEME_LEFT; ! if(event.RightIsDown()) ! usFlags |= wxExtendedMouseEvent::wxEME_RIGHT; ! if(event.MiddleIsDown()) ! usFlags |= wxExtendedMouseEvent::wxEME_MIDDLE; ! if(event.AltDown()) ! usFlags |= wxExtendedMouseEvent::wxEME_ALT; ! if(event.ControlDown()) ! usFlags |= wxExtendedMouseEvent::wxEME_CTRL; ! if(event.MetaDown()) ! usFlags |= wxExtendedMouseEvent::wxEME_META; ! if(event.ShiftDown()) ! usFlags |= wxExtendedMouseEvent::wxEME_SHIFT; ! ! wxExtendedMouseEvent evt(wxEVT_NULL, event.GetId(), wxDefaultPosition, wxDefaultPosition, usFlags); if(event.LeftDClick()) *************** *** 121,128 **** DEFINE_EVENT_TYPE(wxEVT_EXTMOUSE_MOVE ) ! wxExtendedMouseEvent::wxExtendedMouseEvent(wxEventType commandType, wxWindowID id, wxPoint ptFrom, wxPoint ptTo): wxCommandEvent(commandType, id), m_pt1(ptFrom), ! m_pt2(ptTo) { } --- 137,145 ---- DEFINE_EVENT_TYPE(wxEVT_EXTMOUSE_MOVE ) ! wxExtendedMouseEvent::wxExtendedMouseEvent(wxEventType commandType, wxWindowID id, wxPoint ptFrom, wxPoint ptTo, unsigned short usFlags): wxCommandEvent(commandType, id), m_pt1(ptFrom), ! m_pt2(ptTo), ! m_usFlag(usFlags) { } |
|
From: Emilien K. <cur...@us...> - 2005-01-04 15:59:36
|
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): |
|
From: Emilien K. <cur...@us...> - 2005-01-04 15:59:33
|
Update of /cvsroot/wxdevcenter/StdPlugin/include/wxDevCenter/StdPlugin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12699/include/wxDevCenter/StdPlugin Modified Files: extmouse.h Log Message: Complément des évènements au troisieme bouton Index: extmouse.h =================================================================== RCS file: /cvsroot/wxdevcenter/StdPlugin/include/wxDevCenter/StdPlugin/extmouse.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** extmouse.h 4 Jan 2005 15:31:55 -0000 1.1 --- extmouse.h 4 Jan 2005 15:59:16 -0000 1.2 *************** *** 55,59 **** --- 55,85 ---- virtual void OnMouseEvent(wxMouseEvent& event); private: + /** Table d'évènements où exécuter les évènements étendus.*/ wxEvtHandler* m_pHandler; + + /** Position de départ.*/ + wxPoint m_ptStart; + /** Etat de glissade.*/ + unsigned short m_usDrag; + + /** Etats de glissade.*/ + enum wxExtendedMouseState + { + wxEMS_NONE = 0, + wxEMS_LEFT_DOWN = 0x0001, + wxEMS_LEFT_MOVE = 0x0002, + wxEMS_LEFT_DRAG = 0x0003, + wxEMS_LEFT_MASK = 0x000F, + + wxEMS_RIGHT_DOWN = 0x0010, + wxEMS_RIGHT_MOVE = 0x0020, + wxEMS_RIGHT_DRAG = 0x0030, + wxEMS_RIGHT_MASK = 0x00F0, + + wxEMS_MIDDLE_DOWN = 0x0100, + wxEMS_MIDDLE_MOVE = 0x0200, + wxEMS_MIDDLE_DRAG = 0x0300, + wxEMS_MIDDLE_MASK = 0x0F00, + }; }; *************** *** 62,79 **** /** Déclaration des évènements étendus de souris.*/ BEGIN_DECLARE_EVENT_TYPES() ! DECLARE_EVENT_TYPE(wxEVT_EXTMOUSE_LEFT_CLICK, 22001) ! DECLARE_EVENT_TYPE(wxEVT_EXTMOUSE_RIGHT_CLICK, 22002) ! DECLARE_EVENT_TYPE(wxEVT_EXTMOUSE_LEFT_DBLCLICK, 22003) ! DECLARE_EVENT_TYPE(wxEVT_EXTMOUSE_RIGHT_DBLCLICK, 22004) ! DECLARE_EVENT_TYPE(wxEVT_EXTMOUSE_LEFT_DOWN, 22005) ! DECLARE_EVENT_TYPE(wxEVT_EXTMOUSE_RIGHT_DOWN, 22006) ! DECLARE_EVENT_TYPE(wxEVT_EXTMOUSE_LEFT_UP, 22007) ! DECLARE_EVENT_TYPE(wxEVT_EXTMOUSE_RIGHT_UP, 22008) ! DECLARE_EVENT_TYPE(wxEVT_EXTMOUSE_LEFT_BEGIN_DRAG, 22009) ! DECLARE_EVENT_TYPE(wxEVT_EXTMOUSE_RIGHT_BEGIN_DRAG, 22010) ! DECLARE_EVENT_TYPE(wxEVT_EXTMOUSE_LEFT_END_DRAG, 22011) ! DECLARE_EVENT_TYPE(wxEVT_EXTMOUSE_RIGHT_END_DRAG, 22012) ! DECLARE_EVENT_TYPE(wxEVT_EXTMOUSE_LEFT_MOVE_DRAG, 22013) ! DECLARE_EVENT_TYPE(wxEVT_EXTMOUSE_RIGHT_MOVE_DRAG, 22014) END_DECLARE_EVENT_TYPES() --- 88,116 ---- /** Déclaration des évènements étendus de souris.*/ BEGIN_DECLARE_EVENT_TYPES() ! DECLARE_EVENT_TYPE(wxEVT_EXTMOUSE_LEFT_CLICK , 22001) ! DECLARE_EVENT_TYPE(wxEVT_EXTMOUSE_LEFT_DBLCLICK , 22002) ! DECLARE_EVENT_TYPE(wxEVT_EXTMOUSE_LEFT_DOWN , 22003) ! DECLARE_EVENT_TYPE(wxEVT_EXTMOUSE_LEFT_UP , 22004) ! DECLARE_EVENT_TYPE(wxEVT_EXTMOUSE_LEFT_BEGIN_DRAG , 22005) ! DECLARE_EVENT_TYPE(wxEVT_EXTMOUSE_LEFT_END_DRAG , 22006) ! DECLARE_EVENT_TYPE(wxEVT_EXTMOUSE_LEFT_MOVE_DRAG , 22007) ! ! DECLARE_EVENT_TYPE(wxEVT_EXTMOUSE_RIGHT_CLICK , 22011) ! DECLARE_EVENT_TYPE(wxEVT_EXTMOUSE_RIGHT_DBLCLICK , 22012) ! DECLARE_EVENT_TYPE(wxEVT_EXTMOUSE_RIGHT_DOWN , 22013) ! DECLARE_EVENT_TYPE(wxEVT_EXTMOUSE_RIGHT_UP , 22014) ! DECLARE_EVENT_TYPE(wxEVT_EXTMOUSE_RIGHT_BEGIN_DRAG , 22015) ! DECLARE_EVENT_TYPE(wxEVT_EXTMOUSE_RIGHT_END_DRAG , 22016) ! DECLARE_EVENT_TYPE(wxEVT_EXTMOUSE_RIGHT_MOVE_DRAG , 22017) ! ! DECLARE_EVENT_TYPE(wxEVT_EXTMOUSE_MIDDLE_CLICK , 22021) ! DECLARE_EVENT_TYPE(wxEVT_EXTMOUSE_MIDDLE_DBLCLICK , 22022) ! DECLARE_EVENT_TYPE(wxEVT_EXTMOUSE_MIDDLE_DOWN , 22023) ! DECLARE_EVENT_TYPE(wxEVT_EXTMOUSE_MIDDLE_UP , 22024) ! DECLARE_EVENT_TYPE(wxEVT_EXTMOUSE_MIDDLE_BEGIN_DRAG , 22025) ! DECLARE_EVENT_TYPE(wxEVT_EXTMOUSE_MIDDLE_END_DRAG , 22026) ! DECLARE_EVENT_TYPE(wxEVT_EXTMOUSE_MIDDLE_MOVE_DRAG , 22027) ! ! DECLARE_EVENT_TYPE(wxEVT_EXTMOUSE_MOVE , 22000) END_DECLARE_EVENT_TYPES() *************** *** 111,114 **** --- 148,157 ---- (wxObjectEventFunction)(wxCommandEventFunction)(wxExtendedMouseEventFunction)&fn, (wxObject *) NULL ), + /** Macro d'entrée d'interception de clic milieu. */ + #define EVT_EXTMOUSE_MIDDLE_CLICK(id, fn) \ + DECLARE_EVENT_TABLE_ENTRY( wxEVT_EXTMOUSE_MIDDLE_CLICK, id, -1, \ + (wxObjectEventFunction)(wxCommandEventFunction)(wxExtendedMouseEventFunction)&fn, (wxObject *) NULL ), + + /** Macro d'entrée d'interception de double clic gauche. */ #define EVT_EXTMOUSE_LEFT_DBLCLICK(id, fn) \ *************** *** 121,124 **** --- 164,173 ---- (wxObjectEventFunction)(wxCommandEventFunction)(wxExtendedMouseEventFunction)&fn, (wxObject *) NULL ), + /** Macro d'entrée d'interception de double clic milieu. */ + #define EVT_EXTMOUSE_MIDDLE_DBLCLICK(id, fn) \ + DECLARE_EVENT_TABLE_ENTRY( wxEVT_EXTMOUSE_MIDDLE_DBLCLICK, id, -1, \ + (wxObjectEventFunction)(wxCommandEventFunction)(wxExtendedMouseEventFunction)&fn, (wxObject *) NULL ), + + /** Macro d'entrée d'interception de baisser bouton gauche. */ #define EVT_EXTMOUSE_LEFT_DOWN(id, fn) \ *************** *** 131,134 **** --- 180,189 ---- (wxObjectEventFunction)(wxCommandEventFunction)(wxExtendedMouseEventFunction)&fn, (wxObject *) NULL ), + /** Macro d'entrée d'interception de baisser bouton milieu. */ + #define EVT_EXTMOUSE_MIDDLE_DOWN(id, fn) \ + DECLARE_EVENT_TABLE_ENTRY( wxEVT_EXTMOUSE_MIDDLE_DOWN, id, -1, \ + (wxObjectEventFunction)(wxCommandEventFunction)(wxExtendedMouseEventFunction)&fn, (wxObject *) NULL ), + + /** Macro d'entrée d'interception de lever bouton gauche. */ #define EVT_EXTMOUSE_LEFT_UP(id, fn) \ *************** *** 141,144 **** --- 196,205 ---- (wxObjectEventFunction)(wxCommandEventFunction)(wxExtendedMouseEventFunction)&fn, (wxObject *) NULL ), + /** Macro d'entrée d'interception de lever bouton milieu. */ + #define EVT_EXTMOUSE_MIDDLE_UP(id, fn) \ + DECLARE_EVENT_TABLE_ENTRY( wxEVT_EXTMOUSE_MIDDLE_UP, id, -1, \ + (wxObjectEventFunction)(wxCommandEventFunction)(wxExtendedMouseEventFunction)&fn, (wxObject *) NULL ), + + /** Macro d'entrée d'interception de début de glissée gauche. */ #define EVT_EXTMOUSE_LEFT_BEGIN_DRAG(id, fn) \ *************** *** 151,154 **** --- 212,221 ---- (wxObjectEventFunction)(wxCommandEventFunction)(wxExtendedMouseEventFunction)&fn, (wxObject *) NULL ), + /** Macro d'entrée d'interception de début de glissée milieu. */ + #define EVT_EXTMOUSE_MIDDLE_BEGIN_DRAG(id, fn) \ + DECLARE_EVENT_TABLE_ENTRY( wxEVT_EXTMOUSE_MIDDLE_BEGIN_DRAG, id, -1, \ + (wxObjectEventFunction)(wxCommandEventFunction)(wxExtendedMouseEventFunction)&fn, (wxObject *) NULL ), + + /** Macro d'entrée d'interception de fin de glissée gauche. */ #define EVT_EXTMOUSE_LEFT_END_DRAG(id, fn) \ *************** *** 161,164 **** --- 228,237 ---- (wxObjectEventFunction)(wxCommandEventFunction)(wxExtendedMouseEventFunction)&fn, (wxObject *) NULL ), + /** Macro d'entrée d'interception de fin de glissée milieu. */ + #define EVT_EXTMOUSE_MIDDLE_END_DRAG(id, fn) \ + DECLARE_EVENT_TABLE_ENTRY( wxEVT_EXTMOUSE_MIDDLE_END_DRAG, id, -1, \ + (wxObjectEventFunction)(wxCommandEventFunction)(wxExtendedMouseEventFunction)&fn, (wxObject *) NULL ), + + /** Macro d'entrée d'interception de glissée gauche. */ #define EVT_EXTMOUSE_LEFT_MOVE_DRAG(id, fn) \ *************** *** 171,175 **** --- 244,257 ---- (wxObjectEventFunction)(wxCommandEventFunction)(wxExtendedMouseEventFunction)&fn, (wxObject *) NULL ), + /** Macro d'entrée d'interception de glissée milieu. */ + #define EVT_EXTMOUSE_MIDDLE_MOVE_DRAG(id, fn) \ + DECLARE_EVENT_TABLE_ENTRY( wxEVT_EXTMOUSE_MIDDLE_MOVE_DRAG, id, -1, \ + (wxObjectEventFunction)(wxCommandEventFunction)(wxExtendedMouseEventFunction)&fn, (wxObject *) NULL ), + + /** Macro d'entrée d'interception de mouvement libre. */ + #define EVT_EXTMOUSE_MOVE(id, fn) \ + DECLARE_EVENT_TABLE_ENTRY( wxEVT_EXTMOUSE_MOVE, id, -1, \ + (wxObjectEventFunction)(wxCommandEventFunction)(wxExtendedMouseEventFunction)&fn, (wxObject *) NULL ), #endif |
|
From: Emilien K. <cur...@us...> - 2005-01-04 15:32:11
|
Update of /cvsroot/wxdevcenter/StdPlugin/include/wxDevCenter/StdPlugin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6125/include/wxDevCenter/StdPlugin Modified Files: BitmapCtrl.h Added Files: extmouse.h Log Message: Création et utilisation d'une classe séparée pour la gestion avancée de la souris Index: BitmapCtrl.h =================================================================== RCS file: /cvsroot/wxdevcenter/StdPlugin/include/wxDevCenter/StdPlugin/BitmapCtrl.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** BitmapCtrl.h 3 Jan 2005 16:59:44 -0000 1.2 --- BitmapCtrl.h 4 Jan 2005 15:31:55 -0000 1.3 *************** *** 32,35 **** --- 32,37 ---- #include <wx/dcmemory.h> + #include <wxDevCenter/StdPlugin/extmouse.h> + /** Controle d'affichage de bitmap. *************** *** 37,41 **** * Gère en standard l'affichage d'un bitmap avec scrolling et zoom. */ ! class STD_DLL_PLUGIN BitmapCtrl : public wxControl { protected: --- 39,43 ---- * Gère en standard l'affichage d'un bitmap avec scrolling et zoom. */ ! class STD_DLL_PLUGIN BitmapCtrl : public wxControl, public wxExtendedMouseInterface { protected: *************** *** 60,63 **** --- 62,69 ---- wxPoint m_ptOrigin; + /** Position à retenir de la souris. + * Utilisée pour un glissement. + */ + wxPoint m_ptMouse; public: /** Constructeur standard des controles.*/ *************** *** 140,258 **** /** Interception des évenements de scroll.*/ void OnScroll(wxScrollWinEvent& event); - }; - ! ! BEGIN_DECLARE_EVENT_TYPES() ! DECLARE_EVENT_TYPE(WXDCEVT_BITMAP_LEFT_CLICK, 22001) ! DECLARE_EVENT_TYPE(WXDCEVT_BITMAP_RIGHT_CLICK, 22002) ! DECLARE_EVENT_TYPE(WXDCEVT_BITMAP_LEFT_DBLCLICK, 22003) ! DECLARE_EVENT_TYPE(WXDCEVT_BITMAP_RIGHT_DBLCLICK, 22004) ! DECLARE_EVENT_TYPE(WXDCEVT_BITMAP_LEFT_DOWN, 22005) ! DECLARE_EVENT_TYPE(WXDCEVT_BITMAP_RIGHT_DOWN, 22006) ! DECLARE_EVENT_TYPE(WXDCEVT_BITMAP_LEFT_UP, 22007) ! DECLARE_EVENT_TYPE(WXDCEVT_BITMAP_RIGHT_UP, 22008) ! DECLARE_EVENT_TYPE(WXDCEVT_BITMAP_LEFT_BEGIN_DRAG, 22009) ! DECLARE_EVENT_TYPE(WXDCEVT_BITMAP_RIGHT_BEGIN_DRAG, 22010) ! DECLARE_EVENT_TYPE(WXDCEVT_BITMAP_LEFT_END_DRAG, 22011) ! DECLARE_EVENT_TYPE(WXDCEVT_BITMAP_RIGHT_END_DRAG, 22012) ! DECLARE_EVENT_TYPE(WXDCEVT_BITMAP_LEFT_MOVE_DRAG, 22013) ! DECLARE_EVENT_TYPE(WXDCEVT_BITMAP_RIGHT_MOVE_DRAG, 22014) ! END_DECLARE_EVENT_TYPES() ! ! ! /** ! * Classe d'évènement généré par un BitmapCtrl. ! */ ! class STD_DLL_PLUGIN BitmapEvent : public wxCommandEvent ! { ! private: ! BitmapEvent& operator=(const BitmapEvent& event); ! ! wxPoint m_pt1, m_pt2; ! public: ! BitmapEvent(wxEventType commandType = wxEVT_NULL, wxWindowID id=-1, wxPoint ptFrom = wxDefaultPosition, wxPoint ptTo = wxDefaultPosition); ! wxEvent* Clone(void) const; ! ! wxPoint GetFromPos()const {return m_pt1;} ! void SetFromPos(wxPoint pt){m_pt1 = pt;} ! wxPoint GetToPos()const {return m_pt2;} ! void SetToPos(wxPoint pt){m_pt2 = pt;} }; - /** Type des fonctions d'interception des évènements BitmapEvent.*/ - typedef void (wxEvtHandler::*BitmapEventFunction)(BitmapEvent&); - - /** Macro d'entrée d'interception de clic gauche. */ - #define EVT_WXDC_BITMAP_LEFT_CLICK(id, fn) \ - DECLARE_EVENT_TABLE_ENTRY( WXDCEVT_BITMAP_LEFT_CLICK, id, -1, \ - (wxObjectEventFunction)(wxCommandEventFunction)(BitmapEventFunction)&fn, (wxObject *) NULL ), - - /** Macro d'entrée d'interception de clic droit. */ - #define EVT_WXDC_BITMAP_RIGHT_CLICK(id, fn) \ - DECLARE_EVENT_TABLE_ENTRY( WXDCEVT_BITMAP_RIGHT_CLICK, id, -1, \ - (wxObjectEventFunction)(wxCommandEventFunction)(BitmapEventFunction)&fn, (wxObject *) NULL ), - - /** Macro d'entrée d'interception de double clic gauche. */ - #define EVT_WXDC_BITMAP_LEFT_DBLCLICK(id, fn) \ - DECLARE_EVENT_TABLE_ENTRY( WXDCEVT_BITMAP_LEFT_DBLCLICK, id, -1, \ - (wxObjectEventFunction)(wxCommandEventFunction)(BitmapEventFunction)&fn, (wxObject *) NULL ), - - /** Macro d'entrée d'interception de double clic droit. */ - #define EVT_WXDC_BITMAP_RIGHT_DBLCLICK(id, fn) \ - DECLARE_EVENT_TABLE_ENTRY( WXDCEVT_BITMAP_RIGHT_DBLCLICK, id, -1, \ - (wxObjectEventFunction)(wxCommandEventFunction)(BitmapEventFunction)&fn, (wxObject *) NULL ), - - /** Macro d'entrée d'interception de baisser bouton gauche. */ - #define EVT_WXDC_BITMAP_LEFT_DOWN(id, fn) \ - DECLARE_EVENT_TABLE_ENTRY( WXDCEVT_BITMAP_LEFT_DOWN, id, -1, \ - (wxObjectEventFunction)(wxCommandEventFunction)(BitmapEventFunction)&fn, (wxObject *) NULL ), - - /** Macro d'entrée d'interception de baisser bouton droit. */ - #define EVT_WXDC_BITMAP_RIGHT_DOWN(id, fn) \ - DECLARE_EVENT_TABLE_ENTRY( WXDCEVT_BITMAP_RIGHT_DOWN, id, -1, \ - (wxObjectEventFunction)(wxCommandEventFunction)(BitmapEventFunction)&fn, (wxObject *) NULL ), - - /** Macro d'entrée d'interception de lever bouton gauche. */ - #define EVT_WXDC_BITMAP_LEFT_UP(id, fn) \ - DECLARE_EVENT_TABLE_ENTRY( WXDCEVT_BITMAP_LEFT_UP, id, -1, \ - (wxObjectEventFunction)(wxCommandEventFunction)(BitmapEventFunction)&fn, (wxObject *) NULL ), - - /** Macro d'entrée d'interception de lever bouton droit. */ - #define EVT_WXDC_BITMAP_RIGHT_UP(id, fn) \ - DECLARE_EVENT_TABLE_ENTRY( WXDCEVT_BITMAP_RIGHT_UP, id, -1, \ - (wxObjectEventFunction)(wxCommandEventFunction)(BitmapEventFunction)&fn, (wxObject *) NULL ), - - /** Macro d'entrée d'interception de début de glissée gauche. */ - #define EVT_WXDC_BITMAP_LEFT_BEGIN_DRAG(id, fn) \ - DECLARE_EVENT_TABLE_ENTRY( WXDCEVT_BITMAP_LEFT_BEGIN_DRAG, id, -1, \ - (wxObjectEventFunction)(wxCommandEventFunction)(BitmapEventFunction)&fn, (wxObject *) NULL ), - - /** Macro d'entrée d'interception de début de glissée droit. */ - #define EVT_WXDC_BITMAP_RIGHT_BEGIN_DRAG(id, fn) \ - DECLARE_EVENT_TABLE_ENTRY( WXDCEVT_BITMAP_RIGHT_BEGIN_DRAG, id, -1, \ - (wxObjectEventFunction)(wxCommandEventFunction)(BitmapEventFunction)&fn, (wxObject *) NULL ), - - /** Macro d'entrée d'interception de fin de glissée gauche. */ - #define EVT_WXDC_BITMAP_LEFT_END_DRAG(id, fn) \ - DECLARE_EVENT_TABLE_ENTRY( WXDCEVT_BITMAP_LEFT_END_DRAG, id, -1, \ - (wxObjectEventFunction)(wxCommandEventFunction)(BitmapEventFunction)&fn, (wxObject *) NULL ), - - /** Macro d'entrée d'interception de fin de glissée droit. */ - #define EVT_WXDC_BITMAP_RIGHT_END_DRAG(id, fn) \ - DECLARE_EVENT_TABLE_ENTRY( WXDCEVT_BITMAP_RIGHT_END_DRAG, id, -1, \ - (wxObjectEventFunction)(wxCommandEventFunction)(BitmapEventFunction)&fn, (wxObject *) NULL ), - - /** Macro d'entrée d'interception de glissée gauche. */ - #define EVT_WXDC_BITMAP_LEFT_MOVE_DRAG(id, fn) \ - DECLARE_EVENT_TABLE_ENTRY( WXDCEVT_BITMAP_LEFT_MOVE_DRAG, id, -1, \ - (wxObjectEventFunction)(wxCommandEventFunction)(BitmapEventFunction)&fn, (wxObject *) NULL ), - - /** Macro d'entrée d'interception de glissée droit. */ - #define EVT_WXDC_BITMAP_RIGHT_MOVE_DRAG(id, fn) \ - DECLARE_EVENT_TABLE_ENTRY( WXDCEVT_BITMAP_RIGHT_MOVE_DRAG, id, -1, \ - (wxObjectEventFunction)(wxCommandEventFunction)(BitmapEventFunction)&fn, (wxObject *) NULL ), - - #endif --- 146,154 ---- /** Interception des évenements de scroll.*/ void OnScroll(wxScrollWinEvent& event); ! /** Interception des évènements de la souris.*/ ! void OnMouseEvent(wxMouseEvent& event); }; #endif --- NEW FILE: extmouse.h --- (This appears to be a binary file; contents omitted.) |
|
From: Emilien K. <cur...@us...> - 2005-01-04 15:32:07
|
Update of /cvsroot/wxdevcenter/StdPlugin/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6125/src Modified Files: BitmapCtrl.cpp Added Files: extmouse.cpp Log Message: Création et utilisation d'une classe séparée pour la gestion avancée de la souris Index: BitmapCtrl.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/StdPlugin/src/BitmapCtrl.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** BitmapCtrl.cpp 3 Jan 2005 16:59:44 -0000 1.2 --- BitmapCtrl.cpp 4 Jan 2005 15:31:56 -0000 1.3 *************** *** 37,40 **** --- 37,41 ---- EVT_SCROLLWIN(BitmapCtrl::OnScroll) EVT_ERASE_BACKGROUND(BitmapCtrl::OnEraseBackground) + EVT_MOUSE_EVENTS(BitmapCtrl::OnMouseEvent) END_EVENT_TABLE() *************** *** 42,52 **** BitmapCtrl::BitmapCtrl(wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style): wxControl(parent, id, pos, size, style), m_Image(48,48), m_iZoom(0), m_bExtraScroll(false), ! m_ptOrigin(0,0) { SetScrollPos(wxHORIZONTAL, 0); SetScrollPos(wxVERTICAL, 0); } --- 43,56 ---- BitmapCtrl::BitmapCtrl(wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style): wxControl(parent, id, pos, size, style), + wxExtendedMouseInterface(), m_Image(48,48), m_iZoom(0), m_bExtraScroll(false), ! m_ptOrigin(0,0), ! m_ptMouse(-1, -1) { SetScrollPos(wxHORIZONTAL, 0); SetScrollPos(wxVERTICAL, 0); + wxExtendedMouseInterface::SetEventHandler(wxControl::GetEventHandler()); } *************** *** 321,352 **** } - /** - * Implémentation des évènements BitmapEvent. - */ - DEFINE_EVENT_TYPE(WXDCEVT_BITMAP_LEFT_CLICK ) - DEFINE_EVENT_TYPE(WXDCEVT_BITMAP_RIGHT_CLICK ) - DEFINE_EVENT_TYPE(WXDCEVT_BITMAP_LEFT_DBLCLICK ) - DEFINE_EVENT_TYPE(WXDCEVT_BITMAP_RIGHT_DBLCLICK ) - DEFINE_EVENT_TYPE(WXDCEVT_BITMAP_LEFT_DOWN ) - DEFINE_EVENT_TYPE(WXDCEVT_BITMAP_RIGHT_DOWN ) - DEFINE_EVENT_TYPE(WXDCEVT_BITMAP_LEFT_UP ) - DEFINE_EVENT_TYPE(WXDCEVT_BITMAP_RIGHT_UP ) - DEFINE_EVENT_TYPE(WXDCEVT_BITMAP_LEFT_BEGIN_DRAG ) - DEFINE_EVENT_TYPE(WXDCEVT_BITMAP_RIGHT_BEGIN_DRAG) - DEFINE_EVENT_TYPE(WXDCEVT_BITMAP_LEFT_END_DRAG ) - DEFINE_EVENT_TYPE(WXDCEVT_BITMAP_RIGHT_END_DRAG ) - DEFINE_EVENT_TYPE(WXDCEVT_BITMAP_LEFT_MOVE_DRAG ) - DEFINE_EVENT_TYPE(WXDCEVT_BITMAP_RIGHT_MOVE_DRAG ) ! BitmapEvent::BitmapEvent(wxEventType commandType, wxWindowID id, wxPoint ptFrom, wxPoint ptTo): ! wxCommandEvent(commandType, id), ! m_pt1(ptFrom), ! m_pt2(ptTo) { } ! wxEvent* BitmapEvent::Clone(void) const ! { ! BitmapEvent *pEvt = new BitmapEvent(GetEventType(), GetId(), m_pt1, m_pt2); ! return pEvt; ! } --- 325,336 ---- } ! // Interception des évènements de la souris. ! void BitmapCtrl::OnMouseEvent(wxMouseEvent& event) { + wxExtendedMouseInterface::OnMouseEvent(event); } ! ! ! --- NEW FILE: extmouse.cpp --- (This appears to be a binary file; contents omitted.) |
|
From: Emilien K. <cur...@us...> - 2005-01-03 18:09:55
|
Update of /cvsroot/wxdevcenter/wxDevCenter/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13717/src Modified Files: FileSystemStandard.cpp Log Message: Fix des erreurs sous nunux Index: FileSystemStandard.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/FileSystemStandard.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** FileSystemStandard.cpp 3 Jan 2005 18:00:47 -0000 1.5 --- FileSystemStandard.cpp 3 Jan 2005 18:09:46 -0000 1.6 *************** *** 391,395 **** Archive* FileSystemStandardUnix::GetFileArchive(FilePath strPath, unsigned int nMode) { ! return new ArchiveFile(strPath.GetFilePath(), Archive::nMode); } --- 391,395 ---- Archive* FileSystemStandardUnix::GetFileArchive(FilePath strPath, unsigned int nMode) { ! return new ArchiveFile(strPath.GetFilePath(), (Archive::ARCHIVE_OPEN_MODE)nMode); } |
|
From: Emilien K. <cur...@us...> - 2005-01-03 18:01:04
|
Update of /cvsroot/wxdevcenter/wxDevCenter/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11593/src Modified Files: FileSystemStandard.cpp Log Message: Fix des erreurs sous nunux Index: FileSystemStandard.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/FileSystemStandard.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** FileSystemStandard.cpp 3 Jan 2005 17:47:57 -0000 1.4 --- FileSystemStandard.cpp 3 Jan 2005 18:00:47 -0000 1.5 *************** *** 394,405 **** } ! wxString FileSystemStandardUnix::FindFirst(wxString strWildcard, int iFlags) { wxString str; ! m_strFindPath = strWildcard; m_iFindFlags = iFlags; ! if(!m_Dir.Open(strWildcard)) return ""; m_Dir.GetFirst(&str, wxEmptyString, m_iFindFlags); --- 394,405 ---- } ! wxString FileSystemStandardUnix::FindFirst(FilePath strPath, int iFlags) { wxString str; ! m_strFindPath = strPath; m_iFindFlags = iFlags; ! if(!m_Dir.Open(strPath)) return ""; m_Dir.GetFirst(&str, wxEmptyString, m_iFindFlags); |
|
From: Emilien K. <cur...@us...> - 2005-01-03 18:00:55
|
Update of /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11593/include/wxDevCenter Modified Files: FileSystemStandard.h Log Message: Fix des erreurs sous nunux Index: FileSystemStandard.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/FileSystemStandard.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** FileSystemStandard.h 3 Jan 2005 17:47:57 -0000 1.4 --- FileSystemStandard.h 3 Jan 2005 18:00:46 -0000 1.5 *************** *** 125,129 **** wxString GetRoot()const{return wxT("/");} FilePath GetRootPath()const{return wxT("file:/");} ! wxString FindFirst(wxString strWildcard, int iFlags); wxString FindNext(); FilePath GetCurrentFilePath(); --- 125,129 ---- wxString GetRoot()const{return wxT("/");} FilePath GetRootPath()const{return wxT("file:/");} ! wxString FindFirst(FilePath strPath, int iFlags); wxString FindNext(); FilePath GetCurrentFilePath(); |
|
From: Emilien K. <cur...@us...> - 2005-01-03 17:48:20
|
Update of /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8287/include/wxDevCenter Modified Files: FileSystemStandard.h Log Message: Fix des erreurs sous nunux Index: FileSystemStandard.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/FileSystemStandard.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** FileSystemStandard.h 3 Jan 2005 17:40:36 -0000 1.3 --- FileSystemStandard.h 3 Jan 2005 17:47:57 -0000 1.4 *************** *** 125,130 **** wxString GetRoot()const{return wxT("/");} FilePath GetRootPath()const{return wxT("file:/");} ! FilePath FindFirst(wxString strWildcard, int iFlags); ! FilePath FindNext(); FilePath GetCurrentFilePath(); --- 125,130 ---- wxString GetRoot()const{return wxT("/");} FilePath GetRootPath()const{return wxT("file:/");} ! wxString FindFirst(wxString strWildcard, int iFlags); ! wxString FindNext(); FilePath GetCurrentFilePath(); |
|
From: Emilien K. <cur...@us...> - 2005-01-03 17:48:06
|
Update of /cvsroot/wxdevcenter/wxDevCenter/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8287/src Modified Files: FileSystemStandard.cpp Log Message: Fix des erreurs sous nunux Index: FileSystemStandard.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/FileSystemStandard.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** FileSystemStandard.cpp 3 Jan 2005 17:40:36 -0000 1.3 --- FileSystemStandard.cpp 3 Jan 2005 17:47:57 -0000 1.4 *************** *** 394,400 **** } ! FilePath FileSystemStandardUnix::FindFirst(wxString strWildcard, int iFlags) { ! FilePath str; m_strFindPath = strWildcard; m_iFindFlags = iFlags; --- 394,400 ---- } ! wxString FileSystemStandardUnix::FindFirst(wxString strWildcard, int iFlags) { ! wxString str; m_strFindPath = strWildcard; m_iFindFlags = iFlags; *************** *** 408,414 **** } ! FilePath FileSystemStandardUnix::FindNext() { ! FilePath str; m_Dir.GetNext(&str); m_strCurrentFile = m_strFindPath + "/" + str; --- 408,414 ---- } ! wxString FileSystemStandardUnix::FindNext() { ! wxString str; m_Dir.GetNext(&str); m_strCurrentFile = m_strFindPath + "/" + str; |
|
From: Emilien K. <cur...@us...> - 2005-01-03 17:40:55
|
Update of /cvsroot/wxdevcenter/wxDevCenter/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6481/src Modified Files: FileSystemStandard.cpp Log Message: Fix des erreurs sous nunux Index: FileSystemStandard.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/FileSystemStandard.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FileSystemStandard.cpp 3 Jan 2005 14:56:22 -0000 1.2 --- FileSystemStandard.cpp 3 Jan 2005 17:40:36 -0000 1.3 *************** *** 391,400 **** Archive* FileSystemStandardUnix::GetFileArchive(FilePath strPath, unsigned int nMode) { ! return new ArchiveFile(strPath.GetFilePath(), (ARCHIVE_OPEN_MODE)nMode); } FilePath FileSystemStandardUnix::FindFirst(wxString strWildcard, int iFlags) { ! wxString str; m_strFindPath = strWildcard; m_iFindFlags = iFlags; --- 391,400 ---- Archive* FileSystemStandardUnix::GetFileArchive(FilePath strPath, unsigned int nMode) { ! return new ArchiveFile(strPath.GetFilePath(), Archive::nMode); } FilePath FileSystemStandardUnix::FindFirst(wxString strWildcard, int iFlags) { ! FilePath str; m_strFindPath = strWildcard; m_iFindFlags = iFlags; *************** *** 410,414 **** FilePath FileSystemStandardUnix::FindNext() { ! wxString str; m_Dir.GetNext(&str); m_strCurrentFile = m_strFindPath + "/" + str; --- 410,414 ---- FilePath FileSystemStandardUnix::FindNext() { ! FilePath str; m_Dir.GetNext(&str); m_strCurrentFile = m_strFindPath + "/" + str; |
|
From: Emilien K. <cur...@us...> - 2005-01-03 17:40:55
|
Update of /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6481/include/wxDevCenter Modified Files: FileSystemStandard.h Log Message: Fix des erreurs sous nunux Index: FileSystemStandard.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/FileSystemStandard.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FileSystemStandard.h 3 Jan 2005 14:56:22 -0000 1.2 --- FileSystemStandard.h 3 Jan 2005 17:40:36 -0000 1.3 *************** *** 135,139 **** }; ! typedef FileSystemStandardUnix StandardFileSystem; #endif // Fin des définitions spécifiques --- 135,139 ---- }; ! typedef FileSystemStandardUnix FileSystemStandard; #endif // Fin des définitions spécifiques |
|
From: Emilien K. <cur...@us...> - 2005-01-03 16:59:56
|
Update of /cvsroot/wxdevcenter/StdPlugin/include/wxDevCenter/StdPlugin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29447/include/wxDevCenter/StdPlugin Modified Files: BitmapCtrl.h Log Message: GPL. Ajout de la classe des évènements du controle de bitmap. Index: BitmapCtrl.h =================================================================== RCS file: /cvsroot/wxdevcenter/StdPlugin/include/wxDevCenter/StdPlugin/BitmapCtrl.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BitmapCtrl.h 3 Dec 2004 16:51:28 -0000 1.1 --- BitmapCtrl.h 3 Jan 2005 16:59:44 -0000 1.2 *************** *** 143,145 **** --- 143,258 ---- + + BEGIN_DECLARE_EVENT_TYPES() + DECLARE_EVENT_TYPE(WXDCEVT_BITMAP_LEFT_CLICK, 22001) + DECLARE_EVENT_TYPE(WXDCEVT_BITMAP_RIGHT_CLICK, 22002) + DECLARE_EVENT_TYPE(WXDCEVT_BITMAP_LEFT_DBLCLICK, 22003) + DECLARE_EVENT_TYPE(WXDCEVT_BITMAP_RIGHT_DBLCLICK, 22004) + DECLARE_EVENT_TYPE(WXDCEVT_BITMAP_LEFT_DOWN, 22005) + DECLARE_EVENT_TYPE(WXDCEVT_BITMAP_RIGHT_DOWN, 22006) + DECLARE_EVENT_TYPE(WXDCEVT_BITMAP_LEFT_UP, 22007) + DECLARE_EVENT_TYPE(WXDCEVT_BITMAP_RIGHT_UP, 22008) + DECLARE_EVENT_TYPE(WXDCEVT_BITMAP_LEFT_BEGIN_DRAG, 22009) + DECLARE_EVENT_TYPE(WXDCEVT_BITMAP_RIGHT_BEGIN_DRAG, 22010) + DECLARE_EVENT_TYPE(WXDCEVT_BITMAP_LEFT_END_DRAG, 22011) + DECLARE_EVENT_TYPE(WXDCEVT_BITMAP_RIGHT_END_DRAG, 22012) + DECLARE_EVENT_TYPE(WXDCEVT_BITMAP_LEFT_MOVE_DRAG, 22013) + DECLARE_EVENT_TYPE(WXDCEVT_BITMAP_RIGHT_MOVE_DRAG, 22014) + END_DECLARE_EVENT_TYPES() + + + /** + * Classe d'évènement généré par un BitmapCtrl. + */ + class STD_DLL_PLUGIN BitmapEvent : public wxCommandEvent + { + private: + BitmapEvent& operator=(const BitmapEvent& event); + + wxPoint m_pt1, m_pt2; + public: + BitmapEvent(wxEventType commandType = wxEVT_NULL, wxWindowID id=-1, wxPoint ptFrom = wxDefaultPosition, wxPoint ptTo = wxDefaultPosition); + wxEvent* Clone(void) const; + + wxPoint GetFromPos()const {return m_pt1;} + void SetFromPos(wxPoint pt){m_pt1 = pt;} + wxPoint GetToPos()const {return m_pt2;} + void SetToPos(wxPoint pt){m_pt2 = pt;} + }; + + /** Type des fonctions d'interception des évènements BitmapEvent.*/ + typedef void (wxEvtHandler::*BitmapEventFunction)(BitmapEvent&); + + /** Macro d'entrée d'interception de clic gauche. */ + #define EVT_WXDC_BITMAP_LEFT_CLICK(id, fn) \ + DECLARE_EVENT_TABLE_ENTRY( WXDCEVT_BITMAP_LEFT_CLICK, id, -1, \ + (wxObjectEventFunction)(wxCommandEventFunction)(BitmapEventFunction)&fn, (wxObject *) NULL ), + + /** Macro d'entrée d'interception de clic droit. */ + #define EVT_WXDC_BITMAP_RIGHT_CLICK(id, fn) \ + DECLARE_EVENT_TABLE_ENTRY( WXDCEVT_BITMAP_RIGHT_CLICK, id, -1, \ + (wxObjectEventFunction)(wxCommandEventFunction)(BitmapEventFunction)&fn, (wxObject *) NULL ), + + /** Macro d'entrée d'interception de double clic gauche. */ + #define EVT_WXDC_BITMAP_LEFT_DBLCLICK(id, fn) \ + DECLARE_EVENT_TABLE_ENTRY( WXDCEVT_BITMAP_LEFT_DBLCLICK, id, -1, \ + (wxObjectEventFunction)(wxCommandEventFunction)(BitmapEventFunction)&fn, (wxObject *) NULL ), + + /** Macro d'entrée d'interception de double clic droit. */ + #define EVT_WXDC_BITMAP_RIGHT_DBLCLICK(id, fn) \ + DECLARE_EVENT_TABLE_ENTRY( WXDCEVT_BITMAP_RIGHT_DBLCLICK, id, -1, \ + (wxObjectEventFunction)(wxCommandEventFunction)(BitmapEventFunction)&fn, (wxObject *) NULL ), + + /** Macro d'entrée d'interception de baisser bouton gauche. */ + #define EVT_WXDC_BITMAP_LEFT_DOWN(id, fn) \ + DECLARE_EVENT_TABLE_ENTRY( WXDCEVT_BITMAP_LEFT_DOWN, id, -1, \ + (wxObjectEventFunction)(wxCommandEventFunction)(BitmapEventFunction)&fn, (wxObject *) NULL ), + + /** Macro d'entrée d'interception de baisser bouton droit. */ + #define EVT_WXDC_BITMAP_RIGHT_DOWN(id, fn) \ + DECLARE_EVENT_TABLE_ENTRY( WXDCEVT_BITMAP_RIGHT_DOWN, id, -1, \ + (wxObjectEventFunction)(wxCommandEventFunction)(BitmapEventFunction)&fn, (wxObject *) NULL ), + + /** Macro d'entrée d'interception de lever bouton gauche. */ + #define EVT_WXDC_BITMAP_LEFT_UP(id, fn) \ + DECLARE_EVENT_TABLE_ENTRY( WXDCEVT_BITMAP_LEFT_UP, id, -1, \ + (wxObjectEventFunction)(wxCommandEventFunction)(BitmapEventFunction)&fn, (wxObject *) NULL ), + + /** Macro d'entrée d'interception de lever bouton droit. */ + #define EVT_WXDC_BITMAP_RIGHT_UP(id, fn) \ + DECLARE_EVENT_TABLE_ENTRY( WXDCEVT_BITMAP_RIGHT_UP, id, -1, \ + (wxObjectEventFunction)(wxCommandEventFunction)(BitmapEventFunction)&fn, (wxObject *) NULL ), + + /** Macro d'entrée d'interception de début de glissée gauche. */ + #define EVT_WXDC_BITMAP_LEFT_BEGIN_DRAG(id, fn) \ + DECLARE_EVENT_TABLE_ENTRY( WXDCEVT_BITMAP_LEFT_BEGIN_DRAG, id, -1, \ + (wxObjectEventFunction)(wxCommandEventFunction)(BitmapEventFunction)&fn, (wxObject *) NULL ), + + /** Macro d'entrée d'interception de début de glissée droit. */ + #define EVT_WXDC_BITMAP_RIGHT_BEGIN_DRAG(id, fn) \ + DECLARE_EVENT_TABLE_ENTRY( WXDCEVT_BITMAP_RIGHT_BEGIN_DRAG, id, -1, \ + (wxObjectEventFunction)(wxCommandEventFunction)(BitmapEventFunction)&fn, (wxObject *) NULL ), + + /** Macro d'entrée d'interception de fin de glissée gauche. */ + #define EVT_WXDC_BITMAP_LEFT_END_DRAG(id, fn) \ + DECLARE_EVENT_TABLE_ENTRY( WXDCEVT_BITMAP_LEFT_END_DRAG, id, -1, \ + (wxObjectEventFunction)(wxCommandEventFunction)(BitmapEventFunction)&fn, (wxObject *) NULL ), + + /** Macro d'entrée d'interception de fin de glissée droit. */ + #define EVT_WXDC_BITMAP_RIGHT_END_DRAG(id, fn) \ + DECLARE_EVENT_TABLE_ENTRY( WXDCEVT_BITMAP_RIGHT_END_DRAG, id, -1, \ + (wxObjectEventFunction)(wxCommandEventFunction)(BitmapEventFunction)&fn, (wxObject *) NULL ), + + /** Macro d'entrée d'interception de glissée gauche. */ + #define EVT_WXDC_BITMAP_LEFT_MOVE_DRAG(id, fn) \ + DECLARE_EVENT_TABLE_ENTRY( WXDCEVT_BITMAP_LEFT_MOVE_DRAG, id, -1, \ + (wxObjectEventFunction)(wxCommandEventFunction)(BitmapEventFunction)&fn, (wxObject *) NULL ), + + /** Macro d'entrée d'interception de glissée droit. */ + #define EVT_WXDC_BITMAP_RIGHT_MOVE_DRAG(id, fn) \ + DECLARE_EVENT_TABLE_ENTRY( WXDCEVT_BITMAP_RIGHT_MOVE_DRAG, id, -1, \ + (wxObjectEventFunction)(wxCommandEventFunction)(BitmapEventFunction)&fn, (wxObject *) NULL ), + + + #endif |
|
From: Emilien K. <cur...@us...> - 2005-01-03 16:59:54
|
Update of /cvsroot/wxdevcenter/StdPlugin/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29447/src Modified Files: BitmapCtrl.cpp Log Message: GPL. Ajout de la classe des évènements du controle de bitmap. Index: BitmapCtrl.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/StdPlugin/src/BitmapCtrl.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BitmapCtrl.cpp 3 Dec 2004 16:51:29 -0000 1.1 --- BitmapCtrl.cpp 3 Jan 2005 16:59:44 -0000 1.2 *************** *** 321,322 **** --- 321,352 ---- } + /** + * Implémentation des évènements BitmapEvent. + */ + DEFINE_EVENT_TYPE(WXDCEVT_BITMAP_LEFT_CLICK ) + DEFINE_EVENT_TYPE(WXDCEVT_BITMAP_RIGHT_CLICK ) + DEFINE_EVENT_TYPE(WXDCEVT_BITMAP_LEFT_DBLCLICK ) + DEFINE_EVENT_TYPE(WXDCEVT_BITMAP_RIGHT_DBLCLICK ) + DEFINE_EVENT_TYPE(WXDCEVT_BITMAP_LEFT_DOWN ) + DEFINE_EVENT_TYPE(WXDCEVT_BITMAP_RIGHT_DOWN ) + DEFINE_EVENT_TYPE(WXDCEVT_BITMAP_LEFT_UP ) + DEFINE_EVENT_TYPE(WXDCEVT_BITMAP_RIGHT_UP ) + DEFINE_EVENT_TYPE(WXDCEVT_BITMAP_LEFT_BEGIN_DRAG ) + DEFINE_EVENT_TYPE(WXDCEVT_BITMAP_RIGHT_BEGIN_DRAG) + DEFINE_EVENT_TYPE(WXDCEVT_BITMAP_LEFT_END_DRAG ) + DEFINE_EVENT_TYPE(WXDCEVT_BITMAP_RIGHT_END_DRAG ) + DEFINE_EVENT_TYPE(WXDCEVT_BITMAP_LEFT_MOVE_DRAG ) + DEFINE_EVENT_TYPE(WXDCEVT_BITMAP_RIGHT_MOVE_DRAG ) + + BitmapEvent::BitmapEvent(wxEventType commandType, wxWindowID id, wxPoint ptFrom, wxPoint ptTo): + wxCommandEvent(commandType, id), + m_pt1(ptFrom), + m_pt2(ptTo) + { + } + + wxEvent* BitmapEvent::Clone(void) const + { + BitmapEvent *pEvt = new BitmapEvent(GetEventType(), GetId(), m_pt1, m_pt2); + return pEvt; + } |
|
From: Emilien K. <cur...@us...> - 2005-01-03 15:08:19
|
Update of /cvsroot/wxdevcenter/wxDevCenter/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4409/src Modified Files: Application.cpp Log Message: Transfert de documentation du .cpp vers .h. Index: Application.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/Application.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Application.cpp 3 Jan 2005 14:56:22 -0000 1.3 --- Application.cpp 3 Jan 2005 15:07:38 -0000 1.4 *************** *** 190,200 **** // Crée un document et une vue de type demandé. - // Répertorie (enregistre) le document et affiche la vue. - // Force la demande via boite de dialogue si demandé (nDocType=-1 ou nDocView=-1) - // nDocType = -1 et nDocView = -1 demande le document et la vue correspondante. - // nDocType = -1 et nDocView = 0 demande le document et affiche la vue par défaut du document. - // nDocType !=-1 et nDocView = -1 demande la vue type du document spécifié. - // Les demandes explicites de vues ne sont effectives que si plusieurs vues sont disponible pour un type de document. - // Retourne vrai si le document et la vue sont crés et initialisés correctement. bool Application::CreateNewDocument(int nDocType, int nDocView) { --- 190,193 ---- |
|
From: Emilien K. <cur...@us...> - 2005-01-03 15:07:59
|
Update of /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4409/include/wxDevCenter Modified Files: Application.h Log Message: Transfert de documentation du .cpp vers .h. Index: Application.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/Application.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Application.h 19 Dec 2004 16:58:36 -0000 1.2 --- Application.h 3 Jan 2005 15:07:38 -0000 1.3 *************** *** 175,181 **** DocManager& GetDocManager(){return m_DocManager;} /** Crée un nouveau document. * @param nDocType Identifiant du type de document (-1 pour afficher la boite de dialogue de sélection). * @param nDocView Identifiant du type de vue (-1 pour afficher la boite de dialogue de sélection). ! * @return True si OK. */ bool CreateNewDocument(int nDocType = -1, int nDocView = -1); --- 175,187 ---- DocManager& GetDocManager(){return m_DocManager;} /** Crée un nouveau document. + * Répertorie (enregistre) le document et affiche la vue. + * Force la demande via boite de dialogue si demandé (nDocType=-1 ou nDocView=-1) + * nDocType = -1 et nDocView = -1 demande le document et la vue correspondante. + * nDocType = -1 et nDocView = 0 demande le document et affiche la vue par défaut du document. + * nDocType !=-1 et nDocView = -1 demande la vue type du document spécifié. + * Les demandes explicites de vues ne sont effectives que si plusieurs vues sont disponible pour un type de document. * @param nDocType Identifiant du type de document (-1 pour afficher la boite de dialogue de sélection). * @param nDocView Identifiant du type de vue (-1 pour afficher la boite de dialogue de sélection). ! * @return True si le document et la vue sont crés et initialisés correctement.K. */ bool CreateNewDocument(int nDocType = -1, int nDocView = -1); |
