added wxSashEventFunction macro
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34116 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -93,28 +93,28 @@ public:
|
|||||||
void SetSashVisible(wxSashEdgePosition edge, bool sash);
|
void SetSashVisible(wxSashEdgePosition edge, bool sash);
|
||||||
|
|
||||||
// Get whether there's a sash in this position
|
// Get whether there's a sash in this position
|
||||||
inline bool GetSashVisible(wxSashEdgePosition edge) const { return m_sashes[edge].m_show; }
|
bool GetSashVisible(wxSashEdgePosition edge) const { return m_sashes[edge].m_show; }
|
||||||
|
|
||||||
// Set whether there's a border in this position
|
// Set whether there's a border in this position
|
||||||
inline void SetSashBorder(wxSashEdgePosition edge, bool border) { m_sashes[edge].m_border = border; }
|
void SetSashBorder(wxSashEdgePosition edge, bool border) { m_sashes[edge].m_border = border; }
|
||||||
|
|
||||||
// Get whether there's a border in this position
|
// Get whether there's a border in this position
|
||||||
inline bool HasBorder(wxSashEdgePosition edge) const { return m_sashes[edge].m_border; }
|
bool HasBorder(wxSashEdgePosition edge) const { return m_sashes[edge].m_border; }
|
||||||
|
|
||||||
// Get border size
|
// Get border size
|
||||||
inline int GetEdgeMargin(wxSashEdgePosition edge) const { return m_sashes[edge].m_margin; }
|
int GetEdgeMargin(wxSashEdgePosition edge) const { return m_sashes[edge].m_margin; }
|
||||||
|
|
||||||
// Sets the default sash border size
|
// Sets the default sash border size
|
||||||
inline void SetDefaultBorderSize(int width) { m_borderSize = width; }
|
void SetDefaultBorderSize(int width) { m_borderSize = width; }
|
||||||
|
|
||||||
// Gets the default sash border size
|
// Gets the default sash border size
|
||||||
inline int GetDefaultBorderSize() const { return m_borderSize; }
|
int GetDefaultBorderSize() const { return m_borderSize; }
|
||||||
|
|
||||||
// Sets the addition border size between child and sash window
|
// Sets the addition border size between child and sash window
|
||||||
inline void SetExtraBorderSize(int width) { m_extraBorderSize = width; }
|
void SetExtraBorderSize(int width) { m_extraBorderSize = width; }
|
||||||
|
|
||||||
// Gets the addition border size between child and sash window
|
// Gets the addition border size between child and sash window
|
||||||
inline int GetExtraBorderSize() const { return m_extraBorderSize; }
|
int GetExtraBorderSize() const { return m_extraBorderSize; }
|
||||||
|
|
||||||
virtual void SetMinimumSizeX(int min) { m_minimumPaneSizeX = min; }
|
virtual void SetMinimumSizeX(int min) { m_minimumPaneSizeX = min; }
|
||||||
virtual void SetMinimumSizeY(int min) { m_minimumPaneSizeY = min; }
|
virtual void SetMinimumSizeY(int min) { m_minimumPaneSizeY = min; }
|
||||||
@@ -201,8 +201,6 @@ BEGIN_DECLARE_EVENT_TYPES()
|
|||||||
wxEVT_SASH_DRAGGED, wxEVT_FIRST + 1200)
|
wxEVT_SASH_DRAGGED, wxEVT_FIRST + 1200)
|
||||||
END_DECLARE_EVENT_TYPES()
|
END_DECLARE_EVENT_TYPES()
|
||||||
|
|
||||||
// #define wxEVT_SASH_DRAGGED (wxEVT_FIRST + 1200)
|
|
||||||
|
|
||||||
enum wxSashDragStatus
|
enum wxSashDragStatus
|
||||||
{
|
{
|
||||||
wxSASH_STATUS_OK,
|
wxSASH_STATUS_OK,
|
||||||
@@ -212,20 +210,24 @@ enum wxSashDragStatus
|
|||||||
class WXDLLIMPEXP_ADV wxSashEvent: public wxCommandEvent
|
class WXDLLIMPEXP_ADV wxSashEvent: public wxCommandEvent
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
inline wxSashEvent(int id = 0, wxSashEdgePosition edge = wxSASH_NONE) {
|
wxSashEvent(int id = 0, wxSashEdgePosition edge = wxSASH_NONE)
|
||||||
m_eventType = (wxEventType) wxEVT_SASH_DRAGGED; m_id = id; m_edge = edge; }
|
{
|
||||||
|
m_eventType = (wxEventType) wxEVT_SASH_DRAGGED;
|
||||||
|
m_id = id;
|
||||||
|
m_edge = edge;
|
||||||
|
}
|
||||||
|
|
||||||
inline void SetEdge(wxSashEdgePosition edge) { m_edge = edge; }
|
void SetEdge(wxSashEdgePosition edge) { m_edge = edge; }
|
||||||
inline wxSashEdgePosition GetEdge() const { return m_edge; }
|
wxSashEdgePosition GetEdge() const { return m_edge; }
|
||||||
|
|
||||||
//// The rectangle formed by the drag operation
|
//// The rectangle formed by the drag operation
|
||||||
inline void SetDragRect(const wxRect& rect) { m_dragRect = rect; }
|
void SetDragRect(const wxRect& rect) { m_dragRect = rect; }
|
||||||
inline wxRect GetDragRect() const { return m_dragRect; }
|
wxRect GetDragRect() const { return m_dragRect; }
|
||||||
|
|
||||||
//// Whether the drag caused the rectangle to be reversed (e.g.
|
//// Whether the drag caused the rectangle to be reversed (e.g.
|
||||||
//// dragging the top below the bottom)
|
//// dragging the top below the bottom)
|
||||||
inline void SetDragStatus(wxSashDragStatus status) { m_dragStatus = status; }
|
void SetDragStatus(wxSashDragStatus status) { m_dragStatus = status; }
|
||||||
inline wxSashDragStatus GetDragStatus() const { return m_dragStatus; }
|
wxSashDragStatus GetDragStatus() const { return m_dragStatus; }
|
||||||
|
|
||||||
private:
|
private:
|
||||||
wxSashEdgePosition m_edge;
|
wxSashEdgePosition m_edge;
|
||||||
@@ -238,10 +240,13 @@ private:
|
|||||||
|
|
||||||
typedef void (wxEvtHandler::*wxSashEventFunction)(wxSashEvent&);
|
typedef void (wxEvtHandler::*wxSashEventFunction)(wxSashEvent&);
|
||||||
|
|
||||||
|
#define wxSashEventHandler(func) \
|
||||||
|
(wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxSashEventFunction, &func)
|
||||||
|
|
||||||
#define EVT_SASH_DRAGGED(id, fn) \
|
#define EVT_SASH_DRAGGED(id, fn) \
|
||||||
DECLARE_EVENT_TABLE_ENTRY( wxEVT_SASH_DRAGGED, id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) wxStaticCastEvent( wxSashEventFunction, & fn ), NULL ),
|
wx__DECLARE_EVT1(wxEVT_SASH_DRAGGED, id, wxSashEventHandler(fn))
|
||||||
#define EVT_SASH_DRAGGED_RANGE(id1, id2, fn) \
|
#define EVT_SASH_DRAGGED_RANGE(id1, id2, fn) \
|
||||||
DECLARE_EVENT_TABLE_ENTRY( wxEVT_SASH_DRAGGED, id1, id2, (wxObjectEventFunction) (wxEventFunction) wxStaticCastEvent( wxSashEventFunction, & fn ), NULL ),
|
wx__DECLARE_EVT2(wxEVT_SASH_DRAGGED, id1, id2, wxSashEventHandler(fn))
|
||||||
|
|
||||||
#endif // wxUSE_SASH
|
#endif // wxUSE_SASH
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user