#ifdef update for the old SWIG

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23898 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/include/wx/stc/stc.h b/contrib/include/wx/stc/stc.h
index ba8c6e1cb8adc51b391dc7f4ae01da598400d177..b02b934ccec84d974d76eaf5fc24086ffe898dbc 100644 (file)
--- a/contrib/include/wx/stc/stc.h
+++ b/contrib/include/wx/stc/stc.h
@@ -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,13 +2284,14 @@ public:
     // Load the contents of filename into the editor
     bool LoadFile(const wxString& filename);
 
     // Load the contents of filename into the editor
     bool LoadFile(const wxString& filename);
 

-#if wxUSE_DRAG_AND_DROP
+#ifdef STC_USE_DND

     // Allow for simulating a DnD DragOver
     wxDragResult DoDragOver(wxCoord x, wxCoord y, wxDragResult def); 
 
     // Allow for simulating a DnD DropText
     bool DoDropText(long x, long y, const wxString& data);
     // Allow for simulating a DnD DragOver
     wxDragResult DoDragOver(wxCoord x, wxCoord y, wxDragResult def); 
 
     // Allow for simulating a DnD DropText
     bool DoDropText(long x, long y, const wxString& data);

- #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
 class WXDLLIMPEXP_STC wxStyledTextEvent : public wxCommandEvent {
 #else
 #ifndef SWIG
 class WXDLLIMPEXP_STC wxStyledTextEvent : public wxCommandEvent {
 #else

diff --git a/contrib/src/stc/stc.h.in b/contrib/src/stc/stc.h.in
index 2427f34813c3dd9ee96aa6b3d0bc2d7b5e70b106..9ea0102760f2341431c5064f0a97505c4a13a638 100644 (file)
--- a/contrib/src/stc/stc.h.in
+++ b/contrib/src/stc/stc.h.in
@@ -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
     bool LoadFile(const wxString& filename);
 
     // Load the contents of filename into the editor
     bool LoadFile(const wxString& filename);
 

-#if wxUSE_DRAG_AND_DROP
+#ifdef STC_USE_DND

     // Allow for simulating a DnD DragOver
     wxDragResult DoDragOver(wxCoord x, wxCoord y, wxDragResult def); 
 
     // Allow for simulating a DnD DragOver
     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
 class WXDLLIMPEXP_STC wxStyledTextEvent : public wxCommandEvent {
 #else
 #ifndef SWIG
 class WXDLLIMPEXP_STC wxStyledTextEvent : public wxCommandEvent {
 #else

diff --git a/include/wx/stc/stc.h b/include/wx/stc/stc.h
index ba8c6e1cb8adc51b391dc7f4ae01da598400d177..b02b934ccec84d974d76eaf5fc24086ffe898dbc 100644 (file)
--- a/include/wx/stc/stc.h
+++ b/include/wx/stc/stc.h
@@ -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,13 +2284,14 @@ public:
     // Load the contents of filename into the editor
     bool LoadFile(const wxString& filename);
 
     // Load the contents of filename into the editor
     bool LoadFile(const wxString& filename);
 

-#if wxUSE_DRAG_AND_DROP
+#ifdef STC_USE_DND

     // Allow for simulating a DnD DragOver
     wxDragResult DoDragOver(wxCoord x, wxCoord y, wxDragResult def); 
 
     // Allow for simulating a DnD DropText
     bool DoDropText(long x, long y, const wxString& data);
     // Allow for simulating a DnD DragOver
     wxDragResult DoDragOver(wxCoord x, wxCoord y, wxDragResult def); 
 
     // Allow for simulating a DnD DropText
     bool DoDropText(long x, long y, const wxString& data);

- #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
 class WXDLLIMPEXP_STC wxStyledTextEvent : public wxCommandEvent {
 #else
 #ifndef SWIG
 class WXDLLIMPEXP_STC wxStyledTextEvent : public wxCommandEvent {
 #else

diff --git a/src/stc/stc.h.in b/src/stc/stc.h.in
index 2427f34813c3dd9ee96aa6b3d0bc2d7b5e70b106..9ea0102760f2341431c5064f0a97505c4a13a638 100644 (file)
--- a/src/stc/stc.h.in
+++ b/src/stc/stc.h.in
@@ -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
     bool LoadFile(const wxString& filename);
 
     // Load the contents of filename into the editor
     bool LoadFile(const wxString& filename);
 

-#if wxUSE_DRAG_AND_DROP
+#ifdef STC_USE_DND

     // Allow for simulating a DnD DragOver
     wxDragResult DoDragOver(wxCoord x, wxCoord y, wxDragResult def); 
 
     // Allow for simulating a DnD DragOver
     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
 class WXDLLIMPEXP_STC wxStyledTextEvent : public wxCommandEvent {
 #else
 #ifndef SWIG
 class WXDLLIMPEXP_STC wxStyledTextEvent : public wxCommandEvent {
 #else