From 2fcce89663e88cd41896ef62762660c1c1bbbc3a Mon Sep 17 00:00:00 2001 From: Mattia Barbon Date: Fri, 19 Sep 2003 21:44:42 +0000 Subject: [PATCH] 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 --- contrib/include/wx/stc/stc.h | 3 ++- contrib/src/stc/stc.cpp | 2 ++ contrib/src/stc/stc.cpp.in | 2 ++ contrib/src/stc/stc.h.in | 4 +++- include/wx/stc/stc.h | 3 ++- src/stc/stc.cpp | 2 ++ src/stc/stc.cpp.in | 2 ++ src/stc/stc.h.in | 4 +++- 8 files changed, 18 insertions(+), 4 deletions(-) diff --git a/contrib/include/wx/stc/stc.h b/contrib/include/wx/stc/stc.h index 7d39ec2c5c..ba8c6e1cb8 100644 --- 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); +#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); - + #endif //---------------------------------------------------------------------- diff --git a/contrib/src/stc/stc.cpp b/contrib/src/stc/stc.cpp index 493db91db6..c6438a351e 100644 --- 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); } @@ -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); } +#endif //---------------------------------------------------------------------- diff --git a/contrib/src/stc/stc.cpp.in b/contrib/src/stc/stc.cpp.in index 2df0a99cc2..2b531a6f54 100644 --- 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); } @@ -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); } +#endif //---------------------------------------------------------------------- diff --git a/contrib/src/stc/stc.h.in b/contrib/src/stc/stc.h.in index 6999efae4e..2427f34813 100644 --- 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); +#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); - +#endif + //---------------------------------------------------------------------- diff --git a/include/wx/stc/stc.h b/include/wx/stc/stc.h index 7d39ec2c5c..ba8c6e1cb8 100644 --- 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); +#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); - + #endif //---------------------------------------------------------------------- diff --git a/src/stc/stc.cpp b/src/stc/stc.cpp index 493db91db6..c6438a351e 100644 --- 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); } @@ -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); } +#endif //---------------------------------------------------------------------- diff --git a/src/stc/stc.cpp.in b/src/stc/stc.cpp.in index 2df0a99cc2..2b531a6f54 100644 --- 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); } @@ -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); } +#endif //---------------------------------------------------------------------- diff --git a/src/stc/stc.h.in b/src/stc/stc.h.in index 6999efae4e..2427f34813 100644 --- 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); +#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); - +#endif + //---------------------------------------------------------------------- -- 2.45.2