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

Patch 559673 and 561053

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15694 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2002-05-27 22:06:55 +00:00
parent 9321420052
commit 92bbd64f7f
10 changed files with 78 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1860,6 +1860,15 @@ private:
//---------------------------------------------------------------------- //----------------------------------------------------------------------
// SWIG can't handle "#if" type of conditionals, onlu "#ifdef"
#ifdef SWIG
#define STC_USE_DND 1
#else
#if wxUSE_DRAG_AND_DROP
#define STC_USE_DND 1
#endif
#endif
class wxStyledTextEvent : public wxCommandEvent { class wxStyledTextEvent : public wxCommandEvent {
public: public:
wxStyledTextEvent(wxEventType commandType=0, int id=0); wxStyledTextEvent(wxEventType commandType=0, int id=0);
@@ -1887,7 +1896,9 @@ public:
void SetY(int val) { m_y = val; } void SetY(int val) { m_y = val; }
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; }
#ifdef STC_USE_DND
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; }
@@ -1908,7 +1919,9 @@ public:
int GetY() const { return m_y; } int GetY() const { return m_y; }
wxString GetDragText() { return m_dragText; } wxString GetDragText() { return m_dragText; }
bool GetDragAllowMove() { return m_dragAllowMove; } bool GetDragAllowMove() { return m_dragAllowMove; }
#ifdef STC_USE_DND
wxDragResult GetDragResult() { return m_dragResult; } wxDragResult GetDragResult() { return m_dragResult; }
#endif
bool GetShift() const; bool GetShift() const;
bool GetControl() const; bool GetControl() const;
@@ -1945,8 +1958,10 @@ private:
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
#if wxUSE_DRAG_AND_DROP
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

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

@@ -2134,7 +2134,9 @@ wxStyledTextEvent::wxStyledTextEvent(wxEventType commandType, int id)
m_x = 0; m_x = 0;
m_y = 0; m_y = 0;
m_dragAllowMove = FALSE; m_dragAllowMove = FALSE;
#if wxUSE_DRAG_AND_DROP
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; }
@@ -2168,7 +2170,9 @@ wxStyledTextEvent::wxStyledTextEvent(const wxStyledTextEvent& event):
m_dragText = event.m_dragText; m_dragText = event.m_dragText;
m_dragAllowMove =event.m_dragAllowMove; m_dragAllowMove =event.m_dragAllowMove;
#if wxUSE_DRAG_AND_DROP
m_dragResult = event.m_dragResult; m_dragResult = event.m_dragResult;
#endif
} }
//---------------------------------------------------------------------- //----------------------------------------------------------------------

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

@@ -584,7 +584,9 @@ wxStyledTextEvent::wxStyledTextEvent(wxEventType commandType, int id)
m_x = 0; m_x = 0;
m_y = 0; m_y = 0;
m_dragAllowMove = FALSE; m_dragAllowMove = FALSE;
#if wxUSE_DRAG_AND_DROP
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; }
@@ -618,7 +620,9 @@ wxStyledTextEvent::wxStyledTextEvent(const wxStyledTextEvent& event):
m_dragText = event.m_dragText; m_dragText = event.m_dragText;
m_dragAllowMove =event.m_dragAllowMove; m_dragAllowMove =event.m_dragAllowMove;
#if wxUSE_DRAG_AND_DROP
m_dragResult = event.m_dragResult; m_dragResult = event.m_dragResult;
#endif
} }
//---------------------------------------------------------------------- //----------------------------------------------------------------------

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

@@ -210,6 +210,15 @@ private:
//---------------------------------------------------------------------- //----------------------------------------------------------------------
// SWIG can't handle "#if" type of conditionals, onlu "#ifdef"
#ifdef SWIG
#define STC_USE_DND 1
#else
#if wxUSE_DRAG_AND_DROP
#define STC_USE_DND 1
#endif
#endif
class wxStyledTextEvent : public wxCommandEvent { class wxStyledTextEvent : public wxCommandEvent {
public: public:
wxStyledTextEvent(wxEventType commandType=0, int id=0); wxStyledTextEvent(wxEventType commandType=0, int id=0);
@@ -237,7 +246,9 @@ public:
void SetY(int val) { m_y = val; } void SetY(int val) { m_y = val; }
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; }
#ifdef STC_USE_DND
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; }
@@ -258,7 +269,9 @@ public:
int GetY() const { return m_y; } int GetY() const { return m_y; }
wxString GetDragText() { return m_dragText; } wxString GetDragText() { return m_dragText; }
bool GetDragAllowMove() { return m_dragAllowMove; } bool GetDragAllowMove() { return m_dragAllowMove; }
#ifdef STC_USE_DND
wxDragResult GetDragResult() { return m_dragResult; } wxDragResult GetDragResult() { return m_dragResult; }
#endif
bool GetShift() const; bool GetShift() const;
bool GetControl() const; bool GetControl() const;
@@ -295,8 +308,10 @@ private:
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
#if wxUSE_DRAG_AND_DROP
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

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

@@ -1860,6 +1860,15 @@ private:
//---------------------------------------------------------------------- //----------------------------------------------------------------------
// SWIG can't handle "#if" type of conditionals, onlu "#ifdef"
#ifdef SWIG
#define STC_USE_DND 1
#else
#if wxUSE_DRAG_AND_DROP
#define STC_USE_DND 1
#endif
#endif
class wxStyledTextEvent : public wxCommandEvent { class wxStyledTextEvent : public wxCommandEvent {
public: public:
wxStyledTextEvent(wxEventType commandType=0, int id=0); wxStyledTextEvent(wxEventType commandType=0, int id=0);
@@ -1887,7 +1896,9 @@ public:
void SetY(int val) { m_y = val; } void SetY(int val) { m_y = val; }
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; }
#ifdef STC_USE_DND
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; }
@@ -1908,7 +1919,9 @@ public:
int GetY() const { return m_y; } int GetY() const { return m_y; }
wxString GetDragText() { return m_dragText; } wxString GetDragText() { return m_dragText; }
bool GetDragAllowMove() { return m_dragAllowMove; } bool GetDragAllowMove() { return m_dragAllowMove; }
#ifdef STC_USE_DND
wxDragResult GetDragResult() { return m_dragResult; } wxDragResult GetDragResult() { return m_dragResult; }
#endif
bool GetShift() const; bool GetShift() const;
bool GetControl() const; bool GetControl() const;
@@ -1945,8 +1958,10 @@ private:
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
#if wxUSE_DRAG_AND_DROP
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

4
src/stc/stc.cpp
View File

@@ -2134,7 +2134,9 @@ wxStyledTextEvent::wxStyledTextEvent(wxEventType commandType, int id)
m_x = 0; m_x = 0;
m_y = 0; m_y = 0;
m_dragAllowMove = FALSE; m_dragAllowMove = FALSE;
#if wxUSE_DRAG_AND_DROP
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; }
@@ -2168,7 +2170,9 @@ wxStyledTextEvent::wxStyledTextEvent(const wxStyledTextEvent& event):
m_dragText = event.m_dragText; m_dragText = event.m_dragText;
m_dragAllowMove =event.m_dragAllowMove; m_dragAllowMove =event.m_dragAllowMove;
#if wxUSE_DRAG_AND_DROP
m_dragResult = event.m_dragResult; m_dragResult = event.m_dragResult;
#endif
} }
//---------------------------------------------------------------------- //----------------------------------------------------------------------

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

@@ -584,7 +584,9 @@ wxStyledTextEvent::wxStyledTextEvent(wxEventType commandType, int id)
m_x = 0; m_x = 0;
m_y = 0; m_y = 0;
m_dragAllowMove = FALSE; m_dragAllowMove = FALSE;
#if wxUSE_DRAG_AND_DROP
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; }
@@ -618,7 +620,9 @@ wxStyledTextEvent::wxStyledTextEvent(const wxStyledTextEvent& event):
m_dragText = event.m_dragText; m_dragText = event.m_dragText;
m_dragAllowMove =event.m_dragAllowMove; m_dragAllowMove =event.m_dragAllowMove;
#if wxUSE_DRAG_AND_DROP
m_dragResult = event.m_dragResult; m_dragResult = event.m_dragResult;
#endif
} }
//---------------------------------------------------------------------- //----------------------------------------------------------------------

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

@@ -210,6 +210,15 @@ private:
//---------------------------------------------------------------------- //----------------------------------------------------------------------
// SWIG can't handle "#if" type of conditionals, onlu "#ifdef"
#ifdef SWIG
#define STC_USE_DND 1
#else
#if wxUSE_DRAG_AND_DROP
#define STC_USE_DND 1
#endif
#endif
class wxStyledTextEvent : public wxCommandEvent { class wxStyledTextEvent : public wxCommandEvent {
public: public:
wxStyledTextEvent(wxEventType commandType=0, int id=0); wxStyledTextEvent(wxEventType commandType=0, int id=0);
@@ -237,7 +246,9 @@ public:
void SetY(int val) { m_y = val; } void SetY(int val) { m_y = val; }
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; }
#ifdef STC_USE_DND
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; }
@@ -258,7 +269,9 @@ public:
int GetY() const { return m_y; } int GetY() const { return m_y; }
wxString GetDragText() { return m_dragText; } wxString GetDragText() { return m_dragText; }
bool GetDragAllowMove() { return m_dragAllowMove; } bool GetDragAllowMove() { return m_dragAllowMove; }
#ifdef STC_USE_DND
wxDragResult GetDragResult() { return m_dragResult; } wxDragResult GetDragResult() { return m_dragResult; }
#endif
bool GetShift() const; bool GetShift() const;
bool GetControl() const; bool GetControl() const;
@@ -295,8 +308,10 @@ private:
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
#if wxUSE_DRAG_AND_DROP
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

1
wxPython/contrib/stc/msw/stc_.cpp
View File

@@ -11579,6 +11579,7 @@ SWIGEXPORT(void) initstc_c() {
PyDict_SetItemString(d,"wxSTC_MATLAB_OPERATOR", PyInt_FromLong((long) 6)); PyDict_SetItemString(d,"wxSTC_MATLAB_OPERATOR", PyInt_FromLong((long) 6));
PyDict_SetItemString(d,"wxSTC_MATLAB_IDENTIFIER", PyInt_FromLong((long) 7)); PyDict_SetItemString(d,"wxSTC_MATLAB_IDENTIFIER", PyInt_FromLong((long) 7));
PyDict_SetItemString(d,"wxSTCNameStr", PyString_FromString("wxSTCNameStr")); PyDict_SetItemString(d,"wxSTCNameStr", PyString_FromString("wxSTCNameStr"));
PyDict_SetItemString(d,"STC_USE_DND", PyInt_FromLong((long) 1));
PyDict_SetItemString(d,"wxEVT_STC_CHANGE", PyInt_FromLong((long) wxEVT_STC_CHANGE)); PyDict_SetItemString(d,"wxEVT_STC_CHANGE", PyInt_FromLong((long) wxEVT_STC_CHANGE));
PyDict_SetItemString(d,"wxEVT_STC_STYLENEEDED", PyInt_FromLong((long) wxEVT_STC_STYLENEEDED)); PyDict_SetItemString(d,"wxEVT_STC_STYLENEEDED", PyInt_FromLong((long) wxEVT_STC_STYLENEEDED));
PyDict_SetItemString(d,"wxEVT_STC_CHARADDED", PyInt_FromLong((long) wxEVT_STC_CHARADDED)); PyDict_SetItemString(d,"wxEVT_STC_CHARADDED", PyInt_FromLong((long) wxEVT_STC_CHARADDED));

1
wxPython/contrib/stc/msw/stc_.py
View File

@@ -1705,6 +1705,7 @@ wxSTC_MATLAB_STRING = stc_c.wxSTC_MATLAB_STRING
wxSTC_MATLAB_OPERATOR = stc_c.wxSTC_MATLAB_OPERATOR wxSTC_MATLAB_OPERATOR = stc_c.wxSTC_MATLAB_OPERATOR
wxSTC_MATLAB_IDENTIFIER = stc_c.wxSTC_MATLAB_IDENTIFIER wxSTC_MATLAB_IDENTIFIER = stc_c.wxSTC_MATLAB_IDENTIFIER
wxSTCNameStr = stc_c.wxSTCNameStr wxSTCNameStr = stc_c.wxSTCNameStr
STC_USE_DND = stc_c.STC_USE_DND
wxEVT_STC_CHANGE = stc_c.wxEVT_STC_CHANGE wxEVT_STC_CHANGE = stc_c.wxEVT_STC_CHANGE
wxEVT_STC_STYLENEEDED = stc_c.wxEVT_STC_STYLENEEDED wxEVT_STC_STYLENEEDED = stc_c.wxEVT_STC_STYLENEEDED
wxEVT_STC_CHARADDED = stc_c.wxEVT_STC_CHARADDED wxEVT_STC_CHARADDED = stc_c.wxEVT_STC_CHARADDED