Compilation fix for wxUSE_DRAG_AND_DROP==0.

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

diff --git a/contrib/include/wx/stc/stc.h b/contrib/include/wx/stc/stc.h
index 7d39ec2c5cf55ff2214a420bf93d90393558052d..ba8c6e1cb8adc51b391dc7f4ae01da598400d177 100644 (file)
--- a/contrib/include/wx/stc/stc.h
+++ b/contrib/include/wx/stc/stc.h
@@ -2275,12 +2275,13 @@ 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

     // 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

 
 
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------

diff --git a/contrib/src/stc/stc.cpp b/contrib/src/stc/stc.cpp
index 493db91db63ba26bd3059a8d16800b27a1e2bf85..c6438a351e05f84d8a430bd177ab31360d6dfc5f 100644 (file)
--- a/contrib/src/stc/stc.cpp
+++ b/contrib/src/stc/stc.cpp
@@ -2163,6 +2163,7 @@ bool wxStyledTextCtrl::LoadFile(const wxString& filename)
 }
 
 
 }
 
 

+#if wxUSE_DRAG_AND_DROP

 wxDragResult wxStyledTextCtrl::DoDragOver(wxCoord x, wxCoord y, wxDragResult def) { 
         return m_swx->DoDragOver(x, y, def); 
 } 
 wxDragResult wxStyledTextCtrl::DoDragOver(wxCoord x, wxCoord y, wxDragResult def) { 
         return m_swx->DoDragOver(x, y, def); 
 } 


@@ -2171,6 +2172,7 @@ wxDragResult wxStyledTextCtrl::DoDragOver(wxCoord x, wxCoord y, wxDragResult def
 bool wxStyledTextCtrl::DoDropText(long x, long y, const wxString& data) { 
     return m_swx->DoDropText(x, y, data);
 }
 bool wxStyledTextCtrl::DoDropText(long x, long y, const wxString& data) { 
     return m_swx->DoDropText(x, y, data);
 }

+#endif

 
 
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------

diff --git a/contrib/src/stc/stc.cpp.in b/contrib/src/stc/stc.cpp.in
index 2df0a99cc2e805f445997566ea25849957323a3a..2b531a6f5416163d3d721017ba98d72068ad3d64 100644 (file)
--- a/contrib/src/stc/stc.cpp.in
+++ b/contrib/src/stc/stc.cpp.in
@@ -368,6 +368,7 @@ bool wxStyledTextCtrl::LoadFile(const wxString& filename)
 }
 
 
 }
 
 

+#if wxUSE_DRAG_AND_DROP

 wxDragResult wxStyledTextCtrl::DoDragOver(wxCoord x, wxCoord y, wxDragResult def) { 
         return m_swx->DoDragOver(x, y, def); 
 } 
 wxDragResult wxStyledTextCtrl::DoDragOver(wxCoord x, wxCoord y, wxDragResult def) { 
         return m_swx->DoDragOver(x, y, def); 
 } 


@@ -376,6 +377,7 @@ wxDragResult wxStyledTextCtrl::DoDragOver(wxCoord x, wxCoord y, wxDragResult def
 bool wxStyledTextCtrl::DoDropText(long x, long y, const wxString& data) { 
     return m_swx->DoDropText(x, y, data);
 }
 bool wxStyledTextCtrl::DoDropText(long x, long y, const wxString& data) { 
     return m_swx->DoDropText(x, y, data);
 }

+#endif

 
 
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------

diff --git a/contrib/src/stc/stc.h.in b/contrib/src/stc/stc.h.in
index 6999efae4ee851fde5a43049eee124bb71f7f698..2427f34813c3dd9ee96aa6b3d0bc2d7b5e70b106 100644 (file)
--- a/contrib/src/stc/stc.h.in
+++ b/contrib/src/stc/stc.h.in
@@ -191,12 +191,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

     // 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
+

 
 
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------

diff --git a/include/wx/stc/stc.h b/include/wx/stc/stc.h
index 7d39ec2c5cf55ff2214a420bf93d90393558052d..ba8c6e1cb8adc51b391dc7f4ae01da598400d177 100644 (file)
--- a/include/wx/stc/stc.h
+++ b/include/wx/stc/stc.h
@@ -2275,12 +2275,13 @@ 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

     // 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

 
 
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------

diff --git a/src/stc/stc.cpp b/src/stc/stc.cpp
index 493db91db63ba26bd3059a8d16800b27a1e2bf85..c6438a351e05f84d8a430bd177ab31360d6dfc5f 100644 (file)
--- a/src/stc/stc.cpp
+++ b/src/stc/stc.cpp
@@ -2163,6 +2163,7 @@ bool wxStyledTextCtrl::LoadFile(const wxString& filename)
 }
 
 
 }
 
 

+#if wxUSE_DRAG_AND_DROP

 wxDragResult wxStyledTextCtrl::DoDragOver(wxCoord x, wxCoord y, wxDragResult def) { 
         return m_swx->DoDragOver(x, y, def); 
 } 
 wxDragResult wxStyledTextCtrl::DoDragOver(wxCoord x, wxCoord y, wxDragResult def) { 
         return m_swx->DoDragOver(x, y, def); 
 } 


@@ -2171,6 +2172,7 @@ wxDragResult wxStyledTextCtrl::DoDragOver(wxCoord x, wxCoord y, wxDragResult def
 bool wxStyledTextCtrl::DoDropText(long x, long y, const wxString& data) { 
     return m_swx->DoDropText(x, y, data);
 }
 bool wxStyledTextCtrl::DoDropText(long x, long y, const wxString& data) { 
     return m_swx->DoDropText(x, y, data);
 }

+#endif

 
 
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------

diff --git a/src/stc/stc.cpp.in b/src/stc/stc.cpp.in
index 2df0a99cc2e805f445997566ea25849957323a3a..2b531a6f5416163d3d721017ba98d72068ad3d64 100644 (file)
--- a/src/stc/stc.cpp.in
+++ b/src/stc/stc.cpp.in
@@ -368,6 +368,7 @@ bool wxStyledTextCtrl::LoadFile(const wxString& filename)
 }
 
 
 }
 
 

+#if wxUSE_DRAG_AND_DROP

 wxDragResult wxStyledTextCtrl::DoDragOver(wxCoord x, wxCoord y, wxDragResult def) { 
         return m_swx->DoDragOver(x, y, def); 
 } 
 wxDragResult wxStyledTextCtrl::DoDragOver(wxCoord x, wxCoord y, wxDragResult def) { 
         return m_swx->DoDragOver(x, y, def); 
 } 


@@ -376,6 +377,7 @@ wxDragResult wxStyledTextCtrl::DoDragOver(wxCoord x, wxCoord y, wxDragResult def
 bool wxStyledTextCtrl::DoDropText(long x, long y, const wxString& data) { 
     return m_swx->DoDropText(x, y, data);
 }
 bool wxStyledTextCtrl::DoDropText(long x, long y, const wxString& data) { 
     return m_swx->DoDropText(x, y, data);
 }

+#endif

 
 
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------

diff --git a/src/stc/stc.h.in b/src/stc/stc.h.in
index 6999efae4ee851fde5a43049eee124bb71f7f698..2427f34813c3dd9ee96aa6b3d0bc2d7b5e70b106 100644 (file)
--- a/src/stc/stc.h.in
+++ b/src/stc/stc.h.in
@@ -191,12 +191,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

     // 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
+

 
 
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------