Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some compilation fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13401 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2002-01-06 01:14:49 +00:00
parent 6abe8375ac
commit 7cdecac3b7
8 changed files with 0 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
contrib/include/wx/stc/stc.h
View File

@@ -1676,11 +1676,9 @@ public:
void SetListType(int val) { m_listType = val; } void SetListType(int val) { m_listType = val; }
void SetX(int val) { m_x = val; } void SetX(int val) { m_x = val; }
void SetY(int val) { m_y = val; } void SetY(int val) { m_y = val; }
#ifndef __WXMAC__ // #if wxUSE_DRAG_AND_DROP
void SetDragText(const wxString& val) { m_dragText = val; } void SetDragText(const wxString& val) { m_dragText = val; }
void SetDragAllowMove(bool val) { m_dragAllowMove = val; } void SetDragAllowMove(bool val) { m_dragAllowMove = val; }
void SetDragResult(wxDragResult val) { m_dragResult = val; } void SetDragResult(wxDragResult val) { m_dragResult = val; }
#endif
int GetPosition() const { return m_position; } int GetPosition() const { return m_position; }
int GetKey() const { return m_key; } int GetKey() const { return m_key; }
@@ -1699,11 +1697,9 @@ public:
int GetListType() const { return m_listType; } int GetListType() const { return m_listType; }
int GetX() const { return m_x; } int GetX() const { return m_x; }
int GetY() const { return m_y; } int GetY() const { return m_y; }
#ifndef __WXMAC__ // #if wxUSE_DRAG_AND_DROP
wxString GetDragText() { return m_dragText; } wxString GetDragText() { return m_dragText; }
bool GetDragAllowMove() { return m_dragAllowMove; } bool GetDragAllowMove() { return m_dragAllowMove; }
wxDragResult GetDragResult() { return m_dragResult; } wxDragResult GetDragResult() { return m_dragResult; }
#endif
bool GetShift() const; bool GetShift() const;
bool GetControl() const; bool GetControl() const;
@@ -1737,13 +1733,11 @@ private:
int m_x; int m_x;
int m_y; int m_y;
#ifndef __WXMAC__ // #if wxUSE_DRAG_AND_DROP
wxString m_dragText; // wxEVT_STC_START_DRAG, wxEVT_STC_DO_DROP wxString m_dragText; // wxEVT_STC_START_DRAG, wxEVT_STC_DO_DROP
bool m_dragAllowMove; // wxEVT_STC_START_DRAG bool m_dragAllowMove; // wxEVT_STC_START_DRAG
wxDragResult m_dragResult; // wxEVT_STC_DRAG_OVER,wxEVT_STC_DO_DROP wxDragResult m_dragResult; // wxEVT_STC_DRAG_OVER,wxEVT_STC_DO_DROP
#endif #endif
#endif
}; };
#ifndef SWIG #ifndef SWIG
@@ -1767,11 +1761,9 @@ BEGIN_DECLARE_EVENT_TYPES()
DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_URIDROPPED, 1666) DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_URIDROPPED, 1666)
DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_DWELLSTART, 1667) DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_DWELLSTART, 1667)
DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_DWELLEND, 1668) DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_DWELLEND, 1668)
#if wxUSE_DRAG_AND_DROP
DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_START_DRAG, 1669) DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_START_DRAG, 1669)
DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_DRAG_OVER, 1670) DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_DRAG_OVER, 1670)
DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_DO_DROP, 1671) DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_DO_DROP, 1671)
#endif
END_DECLARE_EVENT_TYPES() END_DECLARE_EVENT_TYPES()
#else #else
enum { enum {
@@ -1794,11 +1786,9 @@ END_DECLARE_EVENT_TYPES()
wxEVT_STC_URIDROPPED, wxEVT_STC_URIDROPPED,
wxEVT_STC_DWELLSTART, wxEVT_STC_DWELLSTART,
wxEVT_STC_DWELLEND, wxEVT_STC_DWELLEND,
#ifndef __WXMAC__ // #if wxUSE_DRAG_AND_DROP
wxEVT_STC_START_DRAG, wxEVT_STC_START_DRAG,
wxEVT_STC_DRAG_OVER, wxEVT_STC_DRAG_OVER,
wxEVT_STC_DO_DROP, wxEVT_STC_DO_DROP,
#endif
}; };
#endif #endif
@@ -1826,12 +1816,10 @@ typedef void (wxEvtHandler::*wxStyledTextEventFunction)(wxStyledTextEvent&);
#define EVT_STC_URIDROPPED(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_URIDROPPED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ), #define EVT_STC_URIDROPPED(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_URIDROPPED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
#define EVT_STC_DWELLSTART(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_DWELLSTART, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ), #define EVT_STC_DWELLSTART(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_DWELLSTART, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
#define EVT_STC_DWELLEND(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_DWELLEND, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ), #define EVT_STC_DWELLEND(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_DWELLEND, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
#if wxUSE_DRAG_AND_DROP
#define EVT_STC_START_DRAG(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_START_DRAG, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ), #define EVT_STC_START_DRAG(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_START_DRAG, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
#define EVT_STC_DRAG_OVER(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_DRAG_OVER, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ), #define EVT_STC_DRAG_OVER(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_DRAG_OVER, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
#define EVT_STC_DO_DROP(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_DO_DROP, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ), #define EVT_STC_DO_DROP(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_DO_DROP, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
#endif #endif
#endif
//---------------------------------------------------------------------- //----------------------------------------------------------------------
//---------------------------------------------------------------------- //----------------------------------------------------------------------

6
contrib/src/stc/stc.cpp
View File

@@ -93,11 +93,9 @@ DEFINE_EVENT_TYPE( wxEVT_STC_USERLISTSELECTION )
DEFINE_EVENT_TYPE( wxEVT_STC_URIDROPPED ) DEFINE_EVENT_TYPE( wxEVT_STC_URIDROPPED )
DEFINE_EVENT_TYPE( wxEVT_STC_DWELLSTART ) DEFINE_EVENT_TYPE( wxEVT_STC_DWELLSTART )
DEFINE_EVENT_TYPE( wxEVT_STC_DWELLEND ) DEFINE_EVENT_TYPE( wxEVT_STC_DWELLEND )
#if wxUSE_DRAG_AND_DROP
DEFINE_EVENT_TYPE( wxEVT_STC_START_DRAG ) DEFINE_EVENT_TYPE( wxEVT_STC_START_DRAG )
DEFINE_EVENT_TYPE( wxEVT_STC_DRAG_OVER ) DEFINE_EVENT_TYPE( wxEVT_STC_DRAG_OVER )
DEFINE_EVENT_TYPE( wxEVT_STC_DO_DROP ) DEFINE_EVENT_TYPE( wxEVT_STC_DO_DROP )
#endif
BEGIN_EVENT_TABLE(wxStyledTextCtrl, wxControl) BEGIN_EVENT_TABLE(wxStyledTextCtrl, wxControl)
@@ -2077,10 +2075,8 @@ wxStyledTextEvent::wxStyledTextEvent(wxEventType commandType, int id)
m_listType = 0; m_listType = 0;
m_x = 0; m_x = 0;
m_y = 0; m_y = 0;
#if wxUSE_DRAG_AND_DROP
m_dragAllowMove = FALSE; m_dragAllowMove = FALSE;
m_dragResult = wxDragNone; m_dragResult = wxDragNone;
#endif
} }
bool wxStyledTextEvent::GetShift() const { return (m_modifiers & SCI_SHIFT) != 0; } bool wxStyledTextEvent::GetShift() const { return (m_modifiers & SCI_SHIFT) != 0; }
@@ -2112,11 +2108,9 @@ wxStyledTextEvent::wxStyledTextEvent(const wxStyledTextEvent& event):
m_x = event.m_x; m_x = event.m_x;
m_y = event.m_y; m_y = event.m_y;
#if wxUSE_DRAG_AND_DROP
m_dragText = event.m_dragText; m_dragText = event.m_dragText;
m_dragAllowMove =event.m_dragAllowMove; m_dragAllowMove =event.m_dragAllowMove;
m_dragResult = event.m_dragResult; m_dragResult = event.m_dragResult;
#endif
} }
//---------------------------------------------------------------------- //----------------------------------------------------------------------

6
contrib/src/stc/stc.cpp.in
View File

@@ -93,11 +93,9 @@ DEFINE_EVENT_TYPE( wxEVT_STC_USERLISTSELECTION )
DEFINE_EVENT_TYPE( wxEVT_STC_URIDROPPED ) DEFINE_EVENT_TYPE( wxEVT_STC_URIDROPPED )
DEFINE_EVENT_TYPE( wxEVT_STC_DWELLSTART ) DEFINE_EVENT_TYPE( wxEVT_STC_DWELLSTART )
DEFINE_EVENT_TYPE( wxEVT_STC_DWELLEND ) DEFINE_EVENT_TYPE( wxEVT_STC_DWELLEND )
#if wxUSE_DRAG_AND_DROP
DEFINE_EVENT_TYPE( wxEVT_STC_START_DRAG ) DEFINE_EVENT_TYPE( wxEVT_STC_START_DRAG )
DEFINE_EVENT_TYPE( wxEVT_STC_DRAG_OVER ) DEFINE_EVENT_TYPE( wxEVT_STC_DRAG_OVER )
DEFINE_EVENT_TYPE( wxEVT_STC_DO_DROP ) DEFINE_EVENT_TYPE( wxEVT_STC_DO_DROP )
#endif
BEGIN_EVENT_TABLE(wxStyledTextCtrl, wxControl) BEGIN_EVENT_TABLE(wxStyledTextCtrl, wxControl)
@@ -621,10 +619,8 @@ wxStyledTextEvent::wxStyledTextEvent(wxEventType commandType, int id)
m_listType = 0; m_listType = 0;
m_x = 0; m_x = 0;
m_y = 0; m_y = 0;
#if wxUSE_DRAG_AND_DROP
m_dragAllowMove = FALSE; m_dragAllowMove = FALSE;
m_dragResult = wxDragNone; m_dragResult = wxDragNone;
#endif
} }
bool wxStyledTextEvent::GetShift() const { return (m_modifiers & SCI_SHIFT) != 0; } bool wxStyledTextEvent::GetShift() const { return (m_modifiers & SCI_SHIFT) != 0; }
@@ -656,11 +652,9 @@ wxStyledTextEvent::wxStyledTextEvent(const wxStyledTextEvent& event):
m_x = event.m_x; m_x = event.m_x;
m_y = event.m_y; m_y = event.m_y;
#if wxUSE_DRAG_AND_DROP
m_dragText = event.m_dragText; m_dragText = event.m_dragText;
m_dragAllowMove =event.m_dragAllowMove; m_dragAllowMove =event.m_dragAllowMove;
m_dragResult = event.m_dragResult; m_dragResult = event.m_dragResult;
#endif
} }
//---------------------------------------------------------------------- //----------------------------------------------------------------------

12
contrib/src/stc/stc.h.in
View File

@@ -230,11 +230,9 @@ public:
void SetListType(int val) { m_listType = val; } void SetListType(int val) { m_listType = val; }
void SetX(int val) { m_x = val; } void SetX(int val) { m_x = val; }
void SetY(int val) { m_y = val; } void SetY(int val) { m_y = val; }
#ifndef __WXMAC__ // #if wxUSE_DRAG_AND_DROP
void SetDragText(const wxString& val) { m_dragText = val; } void SetDragText(const wxString& val) { m_dragText = val; }
void SetDragAllowMove(bool val) { m_dragAllowMove = val; } void SetDragAllowMove(bool val) { m_dragAllowMove = val; }
void SetDragResult(wxDragResult val) { m_dragResult = val; } void SetDragResult(wxDragResult val) { m_dragResult = val; }
#endif
int GetPosition() const { return m_position; } int GetPosition() const { return m_position; }
int GetKey() const { return m_key; } int GetKey() const { return m_key; }
@@ -253,11 +251,9 @@ public:
int GetListType() const { return m_listType; } int GetListType() const { return m_listType; }
int GetX() const { return m_x; } int GetX() const { return m_x; }
int GetY() const { return m_y; } int GetY() const { return m_y; }
#ifndef __WXMAC__ // #if wxUSE_DRAG_AND_DROP
wxString GetDragText() { return m_dragText; } wxString GetDragText() { return m_dragText; }
bool GetDragAllowMove() { return m_dragAllowMove; } bool GetDragAllowMove() { return m_dragAllowMove; }
wxDragResult GetDragResult() { return m_dragResult; } wxDragResult GetDragResult() { return m_dragResult; }
#endif
bool GetShift() const; bool GetShift() const;
bool GetControl() const; bool GetControl() const;
@@ -291,13 +287,11 @@ private:
int m_x; int m_x;
int m_y; int m_y;
#ifndef __WXMAC__ // #if wxUSE_DRAG_AND_DROP
wxString m_dragText; // wxEVT_STC_START_DRAG, wxEVT_STC_DO_DROP wxString m_dragText; // wxEVT_STC_START_DRAG, wxEVT_STC_DO_DROP
bool m_dragAllowMove; // wxEVT_STC_START_DRAG bool m_dragAllowMove; // wxEVT_STC_START_DRAG
wxDragResult m_dragResult; // wxEVT_STC_DRAG_OVER,wxEVT_STC_DO_DROP wxDragResult m_dragResult; // wxEVT_STC_DRAG_OVER,wxEVT_STC_DO_DROP
#endif #endif
#endif
}; };
#ifndef SWIG #ifndef SWIG
@@ -321,11 +315,9 @@ BEGIN_DECLARE_EVENT_TYPES()
DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_URIDROPPED, 1666) DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_URIDROPPED, 1666)
DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_DWELLSTART, 1667) DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_DWELLSTART, 1667)
DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_DWELLEND, 1668) DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_DWELLEND, 1668)
#if wxUSE_DRAG_AND_DROP
DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_START_DRAG, 1669) DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_START_DRAG, 1669)
DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_DRAG_OVER, 1670) DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_DRAG_OVER, 1670)
DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_DO_DROP, 1671) DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_DO_DROP, 1671)
#endif
END_DECLARE_EVENT_TYPES() END_DECLARE_EVENT_TYPES()
#else #else
enum { enum {
@@ -348,11 +340,9 @@ END_DECLARE_EVENT_TYPES()
wxEVT_STC_URIDROPPED, wxEVT_STC_URIDROPPED,
wxEVT_STC_DWELLSTART, wxEVT_STC_DWELLSTART,
wxEVT_STC_DWELLEND, wxEVT_STC_DWELLEND,
#ifndef __WXMAC__ // #if wxUSE_DRAG_AND_DROP
wxEVT_STC_START_DRAG, wxEVT_STC_START_DRAG,
wxEVT_STC_DRAG_OVER, wxEVT_STC_DRAG_OVER,
wxEVT_STC_DO_DROP, wxEVT_STC_DO_DROP,
#endif
}; };
#endif #endif
@@ -380,12 +370,10 @@ typedef void (wxEvtHandler::*wxStyledTextEventFunction)(wxStyledTextEvent&);
#define EVT_STC_URIDROPPED(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_URIDROPPED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ), #define EVT_STC_URIDROPPED(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_URIDROPPED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
#define EVT_STC_DWELLSTART(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_DWELLSTART, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ), #define EVT_STC_DWELLSTART(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_DWELLSTART, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
#define EVT_STC_DWELLEND(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_DWELLEND, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ), #define EVT_STC_DWELLEND(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_DWELLEND, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
#if wxUSE_DRAG_AND_DROP
#define EVT_STC_START_DRAG(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_START_DRAG, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ), #define EVT_STC_START_DRAG(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_START_DRAG, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
#define EVT_STC_DRAG_OVER(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_DRAG_OVER, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ), #define EVT_STC_DRAG_OVER(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_DRAG_OVER, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
#define EVT_STC_DO_DROP(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_DO_DROP, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ), #define EVT_STC_DO_DROP(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_DO_DROP, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
#endif #endif
#endif
//---------------------------------------------------------------------- //----------------------------------------------------------------------
//---------------------------------------------------------------------- //----------------------------------------------------------------------

12
include/wx/stc/stc.h
View File

@@ -1676,11 +1676,9 @@ public:
void SetListType(int val) { m_listType = val; } void SetListType(int val) { m_listType = val; }
void SetX(int val) { m_x = val; } void SetX(int val) { m_x = val; }
void SetY(int val) { m_y = val; } void SetY(int val) { m_y = val; }
#ifndef __WXMAC__ // #if wxUSE_DRAG_AND_DROP
void SetDragText(const wxString& val) { m_dragText = val; } void SetDragText(const wxString& val) { m_dragText = val; }
void SetDragAllowMove(bool val) { m_dragAllowMove = val; } void SetDragAllowMove(bool val) { m_dragAllowMove = val; }
void SetDragResult(wxDragResult val) { m_dragResult = val; } void SetDragResult(wxDragResult val) { m_dragResult = val; }
#endif
int GetPosition() const { return m_position; } int GetPosition() const { return m_position; }
int GetKey() const { return m_key; } int GetKey() const { return m_key; }
@@ -1699,11 +1697,9 @@ public:
int GetListType() const { return m_listType; } int GetListType() const { return m_listType; }
int GetX() const { return m_x; } int GetX() const { return m_x; }
int GetY() const { return m_y; } int GetY() const { return m_y; }
#ifndef __WXMAC__ // #if wxUSE_DRAG_AND_DROP
wxString GetDragText() { return m_dragText; } wxString GetDragText() { return m_dragText; }
bool GetDragAllowMove() { return m_dragAllowMove; } bool GetDragAllowMove() { return m_dragAllowMove; }
wxDragResult GetDragResult() { return m_dragResult; } wxDragResult GetDragResult() { return m_dragResult; }
#endif
bool GetShift() const; bool GetShift() const;
bool GetControl() const; bool GetControl() const;
@@ -1737,13 +1733,11 @@ private:
int m_x; int m_x;
int m_y; int m_y;
#ifndef __WXMAC__ // #if wxUSE_DRAG_AND_DROP
wxString m_dragText; // wxEVT_STC_START_DRAG, wxEVT_STC_DO_DROP wxString m_dragText; // wxEVT_STC_START_DRAG, wxEVT_STC_DO_DROP
bool m_dragAllowMove; // wxEVT_STC_START_DRAG bool m_dragAllowMove; // wxEVT_STC_START_DRAG
wxDragResult m_dragResult; // wxEVT_STC_DRAG_OVER,wxEVT_STC_DO_DROP wxDragResult m_dragResult; // wxEVT_STC_DRAG_OVER,wxEVT_STC_DO_DROP
#endif #endif
#endif
}; };
#ifndef SWIG #ifndef SWIG
@@ -1767,11 +1761,9 @@ BEGIN_DECLARE_EVENT_TYPES()
DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_URIDROPPED, 1666) DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_URIDROPPED, 1666)
DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_DWELLSTART, 1667) DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_DWELLSTART, 1667)
DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_DWELLEND, 1668) DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_DWELLEND, 1668)
#if wxUSE_DRAG_AND_DROP
DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_START_DRAG, 1669) DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_START_DRAG, 1669)
DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_DRAG_OVER, 1670) DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_DRAG_OVER, 1670)
DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_DO_DROP, 1671) DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_DO_DROP, 1671)
#endif
END_DECLARE_EVENT_TYPES() END_DECLARE_EVENT_TYPES()
#else #else
enum { enum {
@@ -1794,11 +1786,9 @@ END_DECLARE_EVENT_TYPES()
wxEVT_STC_URIDROPPED, wxEVT_STC_URIDROPPED,
wxEVT_STC_DWELLSTART, wxEVT_STC_DWELLSTART,
wxEVT_STC_DWELLEND, wxEVT_STC_DWELLEND,
#ifndef __WXMAC__ // #if wxUSE_DRAG_AND_DROP
wxEVT_STC_START_DRAG, wxEVT_STC_START_DRAG,
wxEVT_STC_DRAG_OVER, wxEVT_STC_DRAG_OVER,
wxEVT_STC_DO_DROP, wxEVT_STC_DO_DROP,
#endif
}; };
#endif #endif
@@ -1826,12 +1816,10 @@ typedef void (wxEvtHandler::*wxStyledTextEventFunction)(wxStyledTextEvent&);
#define EVT_STC_URIDROPPED(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_URIDROPPED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ), #define EVT_STC_URIDROPPED(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_URIDROPPED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
#define EVT_STC_DWELLSTART(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_DWELLSTART, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ), #define EVT_STC_DWELLSTART(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_DWELLSTART, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
#define EVT_STC_DWELLEND(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_DWELLEND, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ), #define EVT_STC_DWELLEND(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_DWELLEND, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
#if wxUSE_DRAG_AND_DROP
#define EVT_STC_START_DRAG(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_START_DRAG, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ), #define EVT_STC_START_DRAG(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_START_DRAG, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
#define EVT_STC_DRAG_OVER(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_DRAG_OVER, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ), #define EVT_STC_DRAG_OVER(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_DRAG_OVER, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
#define EVT_STC_DO_DROP(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_DO_DROP, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ), #define EVT_STC_DO_DROP(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_DO_DROP, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
#endif #endif
#endif
//---------------------------------------------------------------------- //----------------------------------------------------------------------
//---------------------------------------------------------------------- //----------------------------------------------------------------------

6
src/stc/stc.cpp
View File

@@ -93,11 +93,9 @@ DEFINE_EVENT_TYPE( wxEVT_STC_USERLISTSELECTION )
DEFINE_EVENT_TYPE( wxEVT_STC_URIDROPPED ) DEFINE_EVENT_TYPE( wxEVT_STC_URIDROPPED )
DEFINE_EVENT_TYPE( wxEVT_STC_DWELLSTART ) DEFINE_EVENT_TYPE( wxEVT_STC_DWELLSTART )
DEFINE_EVENT_TYPE( wxEVT_STC_DWELLEND ) DEFINE_EVENT_TYPE( wxEVT_STC_DWELLEND )
#if wxUSE_DRAG_AND_DROP
DEFINE_EVENT_TYPE( wxEVT_STC_START_DRAG ) DEFINE_EVENT_TYPE( wxEVT_STC_START_DRAG )
DEFINE_EVENT_TYPE( wxEVT_STC_DRAG_OVER ) DEFINE_EVENT_TYPE( wxEVT_STC_DRAG_OVER )
DEFINE_EVENT_TYPE( wxEVT_STC_DO_DROP ) DEFINE_EVENT_TYPE( wxEVT_STC_DO_DROP )
#endif
BEGIN_EVENT_TABLE(wxStyledTextCtrl, wxControl) BEGIN_EVENT_TABLE(wxStyledTextCtrl, wxControl)
@@ -2077,10 +2075,8 @@ wxStyledTextEvent::wxStyledTextEvent(wxEventType commandType, int id)
m_listType = 0; m_listType = 0;
m_x = 0; m_x = 0;
m_y = 0; m_y = 0;
#if wxUSE_DRAG_AND_DROP
m_dragAllowMove = FALSE; m_dragAllowMove = FALSE;
m_dragResult = wxDragNone; m_dragResult = wxDragNone;
#endif
} }
bool wxStyledTextEvent::GetShift() const { return (m_modifiers & SCI_SHIFT) != 0; } bool wxStyledTextEvent::GetShift() const { return (m_modifiers & SCI_SHIFT) != 0; }
@@ -2112,11 +2108,9 @@ wxStyledTextEvent::wxStyledTextEvent(const wxStyledTextEvent& event):
m_x = event.m_x; m_x = event.m_x;
m_y = event.m_y; m_y = event.m_y;
#if wxUSE_DRAG_AND_DROP
m_dragText = event.m_dragText; m_dragText = event.m_dragText;
m_dragAllowMove =event.m_dragAllowMove; m_dragAllowMove =event.m_dragAllowMove;
m_dragResult = event.m_dragResult; m_dragResult = event.m_dragResult;
#endif
} }
//---------------------------------------------------------------------- //----------------------------------------------------------------------

6
src/stc/stc.cpp.in
View File

@@ -93,11 +93,9 @@ DEFINE_EVENT_TYPE( wxEVT_STC_USERLISTSELECTION )
DEFINE_EVENT_TYPE( wxEVT_STC_URIDROPPED ) DEFINE_EVENT_TYPE( wxEVT_STC_URIDROPPED )
DEFINE_EVENT_TYPE( wxEVT_STC_DWELLSTART ) DEFINE_EVENT_TYPE( wxEVT_STC_DWELLSTART )
DEFINE_EVENT_TYPE( wxEVT_STC_DWELLEND ) DEFINE_EVENT_TYPE( wxEVT_STC_DWELLEND )
#if wxUSE_DRAG_AND_DROP
DEFINE_EVENT_TYPE( wxEVT_STC_START_DRAG ) DEFINE_EVENT_TYPE( wxEVT_STC_START_DRAG )
DEFINE_EVENT_TYPE( wxEVT_STC_DRAG_OVER ) DEFINE_EVENT_TYPE( wxEVT_STC_DRAG_OVER )
DEFINE_EVENT_TYPE( wxEVT_STC_DO_DROP ) DEFINE_EVENT_TYPE( wxEVT_STC_DO_DROP )
#endif
BEGIN_EVENT_TABLE(wxStyledTextCtrl, wxControl) BEGIN_EVENT_TABLE(wxStyledTextCtrl, wxControl)
@@ -621,10 +619,8 @@ wxStyledTextEvent::wxStyledTextEvent(wxEventType commandType, int id)
m_listType = 0; m_listType = 0;
m_x = 0; m_x = 0;
m_y = 0; m_y = 0;
#if wxUSE_DRAG_AND_DROP
m_dragAllowMove = FALSE; m_dragAllowMove = FALSE;
m_dragResult = wxDragNone; m_dragResult = wxDragNone;
#endif
} }
bool wxStyledTextEvent::GetShift() const { return (m_modifiers & SCI_SHIFT) != 0; } bool wxStyledTextEvent::GetShift() const { return (m_modifiers & SCI_SHIFT) != 0; }
@@ -656,11 +652,9 @@ wxStyledTextEvent::wxStyledTextEvent(const wxStyledTextEvent& event):
m_x = event.m_x; m_x = event.m_x;
m_y = event.m_y; m_y = event.m_y;
#if wxUSE_DRAG_AND_DROP
m_dragText = event.m_dragText; m_dragText = event.m_dragText;
m_dragAllowMove =event.m_dragAllowMove; m_dragAllowMove =event.m_dragAllowMove;
m_dragResult = event.m_dragResult; m_dragResult = event.m_dragResult;
#endif
} }
//---------------------------------------------------------------------- //----------------------------------------------------------------------

12
src/stc/stc.h.in
View File

@@ -230,11 +230,9 @@ public:
void SetListType(int val) { m_listType = val; } void SetListType(int val) { m_listType = val; }
void SetX(int val) { m_x = val; } void SetX(int val) { m_x = val; }
void SetY(int val) { m_y = val; } void SetY(int val) { m_y = val; }
#ifndef __WXMAC__ // #if wxUSE_DRAG_AND_DROP
void SetDragText(const wxString& val) { m_dragText = val; } void SetDragText(const wxString& val) { m_dragText = val; }
void SetDragAllowMove(bool val) { m_dragAllowMove = val; } void SetDragAllowMove(bool val) { m_dragAllowMove = val; }
void SetDragResult(wxDragResult val) { m_dragResult = val; } void SetDragResult(wxDragResult val) { m_dragResult = val; }
#endif
int GetPosition() const { return m_position; } int GetPosition() const { return m_position; }
int GetKey() const { return m_key; } int GetKey() const { return m_key; }
@@ -253,11 +251,9 @@ public:
int GetListType() const { return m_listType; } int GetListType() const { return m_listType; }
int GetX() const { return m_x; } int GetX() const { return m_x; }
int GetY() const { return m_y; } int GetY() const { return m_y; }
#ifndef __WXMAC__ // #if wxUSE_DRAG_AND_DROP
wxString GetDragText() { return m_dragText; } wxString GetDragText() { return m_dragText; }
bool GetDragAllowMove() { return m_dragAllowMove; } bool GetDragAllowMove() { return m_dragAllowMove; }
wxDragResult GetDragResult() { return m_dragResult; } wxDragResult GetDragResult() { return m_dragResult; }
#endif
bool GetShift() const; bool GetShift() const;
bool GetControl() const; bool GetControl() const;
@@ -291,13 +287,11 @@ private:
int m_x; int m_x;
int m_y; int m_y;
#ifndef __WXMAC__ // #if wxUSE_DRAG_AND_DROP
wxString m_dragText; // wxEVT_STC_START_DRAG, wxEVT_STC_DO_DROP wxString m_dragText; // wxEVT_STC_START_DRAG, wxEVT_STC_DO_DROP
bool m_dragAllowMove; // wxEVT_STC_START_DRAG bool m_dragAllowMove; // wxEVT_STC_START_DRAG
wxDragResult m_dragResult; // wxEVT_STC_DRAG_OVER,wxEVT_STC_DO_DROP wxDragResult m_dragResult; // wxEVT_STC_DRAG_OVER,wxEVT_STC_DO_DROP
#endif #endif
#endif
}; };
#ifndef SWIG #ifndef SWIG
@@ -321,11 +315,9 @@ BEGIN_DECLARE_EVENT_TYPES()
DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_URIDROPPED, 1666) DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_URIDROPPED, 1666)
DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_DWELLSTART, 1667) DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_DWELLSTART, 1667)
DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_DWELLEND, 1668) DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_DWELLEND, 1668)
#if wxUSE_DRAG_AND_DROP
DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_START_DRAG, 1669) DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_START_DRAG, 1669)
DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_DRAG_OVER, 1670) DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_DRAG_OVER, 1670)
DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_DO_DROP, 1671) DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_DO_DROP, 1671)
#endif
END_DECLARE_EVENT_TYPES() END_DECLARE_EVENT_TYPES()
#else #else
enum { enum {
@@ -348,11 +340,9 @@ END_DECLARE_EVENT_TYPES()
wxEVT_STC_URIDROPPED, wxEVT_STC_URIDROPPED,
wxEVT_STC_DWELLSTART, wxEVT_STC_DWELLSTART,
wxEVT_STC_DWELLEND, wxEVT_STC_DWELLEND,
#ifndef __WXMAC__ // #if wxUSE_DRAG_AND_DROP
wxEVT_STC_START_DRAG, wxEVT_STC_START_DRAG,
wxEVT_STC_DRAG_OVER, wxEVT_STC_DRAG_OVER,
wxEVT_STC_DO_DROP, wxEVT_STC_DO_DROP,
#endif
}; };
#endif #endif
@@ -380,12 +370,10 @@ typedef void (wxEvtHandler::*wxStyledTextEventFunction)(wxStyledTextEvent&);
#define EVT_STC_URIDROPPED(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_URIDROPPED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ), #define EVT_STC_URIDROPPED(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_URIDROPPED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
#define EVT_STC_DWELLSTART(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_DWELLSTART, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ), #define EVT_STC_DWELLSTART(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_DWELLSTART, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
#define EVT_STC_DWELLEND(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_DWELLEND, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ), #define EVT_STC_DWELLEND(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_DWELLEND, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
#if wxUSE_DRAG_AND_DROP
#define EVT_STC_START_DRAG(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_START_DRAG, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ), #define EVT_STC_START_DRAG(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_START_DRAG, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
#define EVT_STC_DRAG_OVER(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_DRAG_OVER, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ), #define EVT_STC_DRAG_OVER(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_DRAG_OVER, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
#define EVT_STC_DO_DROP(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_DO_DROP, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ), #define EVT_STC_DO_DROP(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_DO_DROP, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
#endif #endif
#endif
//---------------------------------------------------------------------- //----------------------------------------------------------------------
//---------------------------------------------------------------------- //----------------------------------------------------------------------