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

#ifdef update for the old SWIG

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23898 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2003-09-24 20:06:19 +00:00
parent 3684ade82e
commit 9d41f689dc
4 changed files with 44 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,6 +35,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?
@@ -2275,7 +2284,7 @@ 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);
#if wxUSE_DRAG_AND_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);
@@ -2284,6 +2293,7 @@ public:
#endif #endif
//---------------------------------------------------------------------- //----------------------------------------------------------------------
@@ -2334,15 +2344,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
#ifndef SWIG #ifndef SWIG
class WXDLLIMPEXP_STC wxStyledTextEvent : public wxCommandEvent { class WXDLLIMPEXP_STC wxStyledTextEvent : public wxCommandEvent {
#else #else

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

@@ -35,6 +35,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?
@@ -191,7 +200,7 @@ 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);
#if wxUSE_DRAG_AND_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);
@@ -251,15 +260,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
#ifndef SWIG #ifndef SWIG
class WXDLLIMPEXP_STC wxStyledTextEvent : public wxCommandEvent { class WXDLLIMPEXP_STC wxStyledTextEvent : public wxCommandEvent {
#else #else

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

@@ -35,6 +35,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?
@@ -2275,7 +2284,7 @@ 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);
#if wxUSE_DRAG_AND_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);
@@ -2284,6 +2293,7 @@ public:
#endif #endif
//---------------------------------------------------------------------- //----------------------------------------------------------------------
@@ -2334,15 +2344,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
#ifndef SWIG #ifndef SWIG
class WXDLLIMPEXP_STC wxStyledTextEvent : public wxCommandEvent { class WXDLLIMPEXP_STC wxStyledTextEvent : public wxCommandEvent {
#else #else

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

@@ -35,6 +35,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?
@@ -191,7 +200,7 @@ 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);
#if wxUSE_DRAG_AND_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);
@@ -251,15 +260,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
#ifndef SWIG #ifndef SWIG
class WXDLLIMPEXP_STC wxStyledTextEvent : public wxCommandEvent { class WXDLLIMPEXP_STC wxStyledTextEvent : public wxCommandEvent {
#else #else