const wxEventType wxEVT_COMMAND_COMBOBOX_SELECTED = wxEVT_FIRST + 15;
const wxEventType wxEVT_COMMAND_TOOL_RCLICKED = wxEVT_FIRST + 16;
const wxEventType wxEVT_COMMAND_TOOL_ENTER = wxEVT_FIRST + 17;
+const wxEventType wxEVT_COMMAND_SPINCTRL_UPDATED = wxEVT_FIRST + 18;
/* Sockets send events, too */
const wxEventType wxEVT_SOCKET = wxEVT_FIRST + 50;
const wxEventType wxEVT_WIZARD_PAGE_CHANGING = wxEVT_FIRST + 901;
const wxEventType wxEVT_WIZARD_CANCEL = wxEVT_FIRST + 902;
-const wxEventType wxEVT_USER_FIRST = wxEVT_FIRST + 2000;
+/* Calendar events */
+const wxEventType wxEVT_CALENDAR_SEL_CHANGED = wxEVT_FIRST + 950;
+const wxEventType wxEVT_CALENDAR_DAY_CHANGED = wxEVT_FIRST + 951;
+const wxEventType wxEVT_CALENDAR_MONTH_CHANGED = wxEVT_FIRST + 952;
+const wxEventType wxEVT_CALENDAR_YEAR_CHANGED = wxEVT_FIRST + 953;
+const wxEventType wxEVT_CALENDAR_DOUBLECLICKED = wxEVT_FIRST + 954;
+const wxEventType wxEVT_CALENDAR_WEEKDAY_CLICKED = wxEVT_FIRST + 955;
+
+const wxEventType wxEVT_USER_FIRST = wxEVT_FIRST + 2000;
/* Compatibility */
// for implementation code only: is the operation allowed?
bool IsAllowed() const { return m_bAllow; }
+ // probably useless: CopyObject() is used for deferred event
+ // handling but wxNotifyEvent must be processed immediately
+ void CopyObject(wxObject& obj) const;
+
private:
bool m_bAllow;
int GetOrientation() const { return (int) m_extraLong ; }
int GetPosition() const { return m_commandInt ; }
+ bool IsScrolling() const { return m_isScrolling; }
void SetOrientation(int orient) { m_extraLong = (long) orient; }
void SetPosition(int pos) { m_commandInt = pos; }
+ void SetScrolling(bool isScrolling) { m_isScrolling = isScrolling; }
+
+ void CopyObject(wxObject& obj) const;
+public:
+ bool m_isScrolling;
};
// ScrollWin event class, derived fom wxEvent. wxScrollWinEvents
int GetOrientation() const { return (int) m_extraLong ; }
int GetPosition() const { return m_commandInt ; }
+ bool IsScrolling() const { return m_isScrolling; }
void SetOrientation(int orient) { m_extraLong = (long) orient; }
void SetPosition(int pos) { m_commandInt = pos; }
+ void SetScrolling(bool isScrolling) { m_isScrolling = isScrolling; }
void CopyObject(wxObject& object_dest) const;
public:
int m_commandInt; // Additional information
- long m_extraLong;
+ long m_extraLong;
+ bool m_isScrolling;
};
// Mouse event class
bool Leaving() const { return (m_eventType == wxEVT_LEAVE_WINDOW); }
// Find the position of the event
- void GetPosition(wxCoord *xpos, wxCoord *ypos) const
+ void GetPosition(wxCoord *xpos, wxCoord *ypos) const
{
if (xpos)
- *xpos = m_x;
+ *xpos = m_x;
if (ypos)
*ypos = m_y;
}
- void GetPosition(int *xpos, int *ypos) const
+#ifndef __WIN16__
+ void GetPosition(long *xpos, long *ypos) const
{
if (xpos)
- *xpos = (int)m_x;
+ *xpos = (long)m_x;
if (ypos)
- *ypos = (int)m_y;
+ *ypos = (long)m_y;
}
+#endif
// Find the position of the event
wxPoint GetPosition() const { return wxPoint(m_x, m_y); }
// Compatibility
#if WXWIN_COMPATIBILITY
- void Position(long *xpos, long *ypos) const
+ void Position(long *xpos, long *ypos) const
{
if (xpos)
- *xpos = (long)m_x;
+ *xpos = (long)m_x;
if (ypos)
*ypos = (long)m_y;
}
// Find the position of the event
void GetPosition(wxCoord *xpos, wxCoord *ypos) const
{
- if (xpos) *xpos = m_x;
+ if (xpos) *xpos = m_x;
if (ypos) *ypos = m_y;
}
- void GetPosition(int *xpos, int *ypos) const
+#ifndef __WIN16__
+ void GetPosition(long *xpos, long *ypos) const
{
- if (xpos) *xpos = (int)m_x;
- if (ypos) *ypos = (int)m_y;
+ if (xpos) *xpos = (long)m_x;
+ if (ypos) *ypos = (long)m_y;
}
+#endif
wxPoint GetPosition() const
{ return wxPoint(m_x, m_y); }
Event generated by dialog navigation keys
wxEVT_NAVIGATION_KEY
*/
-// must derive from command event to be propagated to the parent
-class WXDLLEXPORT wxNavigationKeyEvent : public wxCommandEvent
+// NB: don't derive from command event to avoid being propagated to the parent
+class WXDLLEXPORT wxNavigationKeyEvent : public wxEvent
{
- DECLARE_DYNAMIC_CLASS(wxNavigationKeyEvent)
-
public:
- wxNavigationKeyEvent() : wxCommandEvent(wxEVT_NAVIGATION_KEY) { }
+ wxNavigationKeyEvent()
+ {
+ SetEventType(wxEVT_NAVIGATION_KEY);
+
+ m_flags = IsForward | Propagate; // defaults are for TAB
+ m_focus = (wxWindow *)NULL;
+ }
// direction: forward (true) or backward (false)
- bool GetDirection() const { return m_commandInt == 1; }
- void SetDirection(bool bForward) { m_commandInt = bForward; }
+ bool GetDirection() const
+ { return (m_flags & IsForward) != 0; }
+ void SetDirection(bool bForward)
+ { if ( bForward ) m_flags |= IsForward; else m_flags &= ~IsForward; }
// it may be a window change event (MDI, notebook pages...) or a control
// change event
- bool IsWindowChange() const { return m_extraLong == 1; }
- void SetWindowChange(bool bIs) { m_extraLong = bIs; }
+ bool IsWindowChange() const
+ { return (m_flags & WinChange) != 0; }
+ void SetWindowChange(bool bIs)
+ { if ( bIs ) m_flags |= WinChange; else m_flags &= ~WinChange; }
+
+ // some navigation events are meant to be propagated upwards (Windows
+ // convention is to do this for TAB events) while others should always
+ // cycle inside the panel/radiobox/whatever we're current inside
+ bool ShouldPropagate() const
+ { return (m_flags & Propagate) != 0; }
+ void SetPropagate(bool bDoIt)
+ { if ( bDoIt ) m_flags |= Propagate; else m_flags &= ~Propagate; }
// the child which has the focus currently (may be NULL - use
// wxWindow::FindFocus then)
- wxWindow* GetCurrentFocus() const { return (wxWindow *)m_clientData; }
- void SetCurrentFocus(wxWindow *win) { m_clientData = (void *)win; }
+ wxWindow* GetCurrentFocus() const { return m_focus; }
+ void SetCurrentFocus(wxWindow *win) { m_focus = win; }
+
+private:
+ enum
+ {
+ IsForward = 0x0001,
+ WinChange = 0x0002,
+ Propagate = 0x0004
+ };
+
+ long m_flags;
+ wxWindow *m_focus;
+
+ DECLARE_DYNAMIC_CLASS(wxNavigationKeyEvent)
};
// Window creation/destruction events: the first is sent as soon as window is
// process all pending events
void ProcessPendingEvents();
- // add a
+ // add a
#if wxUSE_THREADS
bool ProcessThreadEvent(wxEvent& event);
#endif
wxObject *userData = (wxObject *) NULL )
{ Connect(id, -1, eventType, func, userData); }
+ bool Disconnect( int id, int lastId = -1, wxEventType eventType = wxEVT_NULL,
+ wxObjectEventFunction func = NULL,
+ wxObject *userData = (wxObject *) NULL );
+
+ // Convenience function: take just one id
+ bool Disconnect( int id, wxEventType eventType = wxEVT_NULL,
+ wxObjectEventFunction func = NULL,
+ wxObject *userData = (wxObject *) NULL )
+ { return Disconnect(id, -1, eventType, func, userData); }
+
// implementation from now on
virtual bool SearchEventTable(wxEventTable& table, wxEvent& event);
bool SearchDynamicEventTable( wxEvent& event );
#if wxUSE_THREADS
- void ClearEventLocker() { delete m_eventsLocker; m_eventsLocker = NULL; };
+ void ClearEventLocker()
+ {
+# if !defined(__VISAGECPP__)
+ delete m_eventsLocker;
+ m_eventsLocker = NULL;
+#endif
+ };
#endif
// old stuff
wxList* m_dynamicEvents;
wxList* m_pendingEvents;
#if wxUSE_THREADS
+#if defined (__VISAGECPP__)
+ wxCriticalSection m_eventsLocker;
+# else
wxCriticalSection* m_eventsLocker;
+# endif
#endif
// optimization: instead of using costly IsKindOf() to decide whether we're
projects / wxWidgets.git / blobdiff