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

Fixed typos and SWIG #ifdef stuff

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@23905 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2003-09-24 22:37:43 +00:00
parent 07b0a4da6d
commit 31f9c02b94
4 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,6 +48,15 @@
#endif // SWIG #endif // SWIG
// SWIG can't handle "#if" type of conditionals, only "#ifdef"
#ifdef SWIG
#define STC_USE_DND 1
#else
#if wxUSE_DRAG_AND_DROP
#define STC_USE_DND 1
#endif
#endif
//---------------------------------------------------------------------- //----------------------------------------------------------------------
// Should a wxPopupWindow be used for the call tips and autocomplete windows? // Should a wxPopupWindow be used for the call tips and autocomplete windows?
@@ -2283,7 +2292,8 @@ public:
// Load the contents of filename into the editor // Load the contents of filename into the editor
bool LoadFile(const wxString& filename); bool LoadFile(const wxString& filename);
#ifdef wxUSE_DRAG_DROP
#ifdef STC_USE_DND
// Allow for simulating a DnD DragOver // Allow for simulating a DnD DragOver
wxDragResult DoDragOver(wxCoord x, wxCoord y, wxDragResult def); wxDragResult DoDragOver(wxCoord x, wxCoord y, wxDragResult def);
@@ -2341,15 +2351,6 @@ protected:
//---------------------------------------------------------------------- //----------------------------------------------------------------------
// SWIG can't handle "#if" type of conditionals, only "#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);

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

@@ -2162,7 +2162,7 @@ bool wxStyledTextCtrl::LoadFile(const wxString& filename)
return success; return success;
} }
#if wx_USE_DRAG_DROP #if wxUSE_DRAG_AND_DROP
wxDragResult wxStyledTextCtrl::DoDragOver(wxCoord x, wxCoord y, wxDragResult def) { wxDragResult wxStyledTextCtrl::DoDragOver(wxCoord x, wxCoord y, wxDragResult def) {
return m_swx->DoDragOver(x, y, def); return m_swx->DoDragOver(x, y, def);
} }
@@ -2173,7 +2173,6 @@ bool wxStyledTextCtrl::DoDropText(long x, long y, const wxString& data) {
} }
#endif #endif
//---------------------------------------------------------------------- //----------------------------------------------------------------------
// Event handlers // Event handlers

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

@@ -367,7 +367,7 @@ bool wxStyledTextCtrl::LoadFile(const wxString& filename)
return success; return success;
} }
#if wx_USE_DRAG_DROP #if wxUSE_DRAG_AND_DROP
wxDragResult wxStyledTextCtrl::DoDragOver(wxCoord x, wxCoord y, wxDragResult def) { wxDragResult wxStyledTextCtrl::DoDragOver(wxCoord x, wxCoord y, wxDragResult def) {
return m_swx->DoDragOver(x, y, def); return m_swx->DoDragOver(x, y, def);
} }

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

@@ -48,6 +48,15 @@
#endif // SWIG #endif // SWIG
// SWIG can't handle "#if" type of conditionals, only "#ifdef"
#ifdef SWIG
#define STC_USE_DND 1
#else
#if wxUSE_DRAG_AND_DROP
#define STC_USE_DND 1
#endif
#endif
//---------------------------------------------------------------------- //----------------------------------------------------------------------
// Should a wxPopupWindow be used for the call tips and autocomplete windows? // Should a wxPopupWindow be used for the call tips and autocomplete windows?
@@ -200,12 +209,13 @@ public:
// Load the contents of filename into the editor // Load the contents of filename into the editor
bool LoadFile(const wxString& filename); bool LoadFile(const wxString& filename);
#ifdef STC_USE_DND
// Allow for simulating a DnD DragOver // Allow for simulating a DnD DragOver
wxDragResult DoDragOver(wxCoord x, wxCoord y, wxDragResult def); wxDragResult DoDragOver(wxCoord x, wxCoord y, wxDragResult def);
// Allow for simulating a DnD DropText // Allow for simulating a DnD DropText
bool DoDropText(long x, long y, const wxString& data); bool DoDropText(long x, long y, const wxString& data);
#endif
//---------------------------------------------------------------------- //----------------------------------------------------------------------
@@ -257,15 +267,6 @@ protected:
//---------------------------------------------------------------------- //----------------------------------------------------------------------
// SWIG can't handle "#if" type of conditionals, only "#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);