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

Compilation fix for wxUSE_DRAG_AND_DROP==0.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23718 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2003-09-19 21:44:42 +00:00
parent 02319c2458
commit 2fcce89663
8 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2275,12 +2275,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);
#if wxUSE_DRAG_AND_DROP
// 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
//---------------------------------------------------------------------- //----------------------------------------------------------------------

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

@@ -2163,6 +2163,7 @@ bool wxStyledTextCtrl::LoadFile(const wxString& filename)
} }
#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);
} }
@@ -2171,6 +2172,7 @@ wxDragResult wxStyledTextCtrl::DoDragOver(wxCoord x, wxCoord y, wxDragResult def
bool wxStyledTextCtrl::DoDropText(long x, long y, const wxString& data) { bool wxStyledTextCtrl::DoDropText(long x, long y, const wxString& data) {
return m_swx->DoDropText(x, y, data); return m_swx->DoDropText(x, y, data);
} }
#endif
//---------------------------------------------------------------------- //----------------------------------------------------------------------

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

@@ -368,6 +368,7 @@ bool wxStyledTextCtrl::LoadFile(const wxString& filename)
} }
#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);
} }
@@ -376,6 +377,7 @@ wxDragResult wxStyledTextCtrl::DoDragOver(wxCoord x, wxCoord y, wxDragResult def
bool wxStyledTextCtrl::DoDropText(long x, long y, const wxString& data) { bool wxStyledTextCtrl::DoDropText(long x, long y, const wxString& data) {
return m_swx->DoDropText(x, y, data); return m_swx->DoDropText(x, y, data);
} }
#endif
//---------------------------------------------------------------------- //----------------------------------------------------------------------

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

@@ -191,11 +191,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);
#if wxUSE_DRAG_AND_DROP
// 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

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

@@ -2275,12 +2275,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);
#if wxUSE_DRAG_AND_DROP
// 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
//---------------------------------------------------------------------- //----------------------------------------------------------------------

2
src/stc/stc.cpp
View File

@@ -2163,6 +2163,7 @@ bool wxStyledTextCtrl::LoadFile(const wxString& filename)
} }
#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);
} }
@@ -2171,6 +2172,7 @@ wxDragResult wxStyledTextCtrl::DoDragOver(wxCoord x, wxCoord y, wxDragResult def
bool wxStyledTextCtrl::DoDropText(long x, long y, const wxString& data) { bool wxStyledTextCtrl::DoDropText(long x, long y, const wxString& data) {
return m_swx->DoDropText(x, y, data); return m_swx->DoDropText(x, y, data);
} }
#endif
//---------------------------------------------------------------------- //----------------------------------------------------------------------

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

@@ -368,6 +368,7 @@ bool wxStyledTextCtrl::LoadFile(const wxString& filename)
} }
#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);
} }
@@ -376,6 +377,7 @@ wxDragResult wxStyledTextCtrl::DoDragOver(wxCoord x, wxCoord y, wxDragResult def
bool wxStyledTextCtrl::DoDropText(long x, long y, const wxString& data) { bool wxStyledTextCtrl::DoDropText(long x, long y, const wxString& data) {
return m_swx->DoDropText(x, y, data); return m_swx->DoDropText(x, y, data);
} }
#endif
//---------------------------------------------------------------------- //----------------------------------------------------------------------

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

@@ -191,11 +191,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);
#if wxUSE_DRAG_AND_DROP
// 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