From 9eb662e94c05e177a6574ffa2c9898b4a0a0b6e0 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Thu, 16 Mar 2000 00:15:48 +0000 Subject: [PATCH] dropTarget is now dynamically allocated. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6747 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/src/stc/ScintillaWX.cpp | 5 +++-- contrib/src/stc/ScintillaWX.h | 2 +- contrib/src/stc/makefile.vc | 12 ------------ src/stc/ScintillaWX.cpp | 5 +++-- src/stc/ScintillaWX.h | 2 +- src/stc/makefile.vc | 12 ------------ 6 files changed, 8 insertions(+), 30 deletions(-) diff --git a/contrib/src/stc/ScintillaWX.cpp b/contrib/src/stc/ScintillaWX.cpp index 5b82473a49..7e44f56b3e 100644 --- a/contrib/src/stc/ScintillaWX.cpp +++ b/contrib/src/stc/ScintillaWX.cpp @@ -84,8 +84,9 @@ ScintillaWX::~ScintillaWX() { void ScintillaWX::Initialise() { //ScintillaBase::Initialise(); - dropTarget.SetScintilla(this); - stc->SetDropTarget(&dropTarget); + dropTarget = new wxSTCDropTarget; + dropTarget->SetScintilla(this); + stc->SetDropTarget(dropTarget); } diff --git a/contrib/src/stc/ScintillaWX.h b/contrib/src/stc/ScintillaWX.h index d25eb18188..2d273fc99a 100644 --- a/contrib/src/stc/ScintillaWX.h +++ b/contrib/src/stc/ScintillaWX.h @@ -140,7 +140,7 @@ private: wxStyledTextCtrl* stc; wxTextDataObject textDO; - wxSTCDropTarget dropTarget; + wxSTCDropTarget* dropTarget; wxDragResult dragResult; }; diff --git a/contrib/src/stc/makefile.vc b/contrib/src/stc/makefile.vc index 8e91828d3c..c1adeacff6 100644 --- a/contrib/src/stc/makefile.vc +++ b/contrib/src/stc/makefile.vc @@ -67,18 +67,6 @@ $(OBJECTS) << -$(PROGRAM).exe: $(D)\$(PROGRAM).obj $(DUMMYOBJ) $(WXLIB) $(LIBTARGET) $(PROGRAM).res - $(link) @<< --out:$(PROGRAM).exe -$(LINKFLAGS) -$(DUMMYOBJ) $(D)\$(PROGRAM).obj $(LIBTARGET) $(PROGRAM).res -$(LIBS) -<< - -$(PROGRAM).res : $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc - $(rc) -r /i$(WXDIR)\include -fo$@ $(PROGRAM).rc - - {$(S)}.cxx{$(D)}.obj: $(cc) @<< diff --git a/src/stc/ScintillaWX.cpp b/src/stc/ScintillaWX.cpp index 5b82473a49..7e44f56b3e 100644 --- a/src/stc/ScintillaWX.cpp +++ b/src/stc/ScintillaWX.cpp @@ -84,8 +84,9 @@ ScintillaWX::~ScintillaWX() { void ScintillaWX::Initialise() { //ScintillaBase::Initialise(); - dropTarget.SetScintilla(this); - stc->SetDropTarget(&dropTarget); + dropTarget = new wxSTCDropTarget; + dropTarget->SetScintilla(this); + stc->SetDropTarget(dropTarget); } diff --git a/src/stc/ScintillaWX.h b/src/stc/ScintillaWX.h index d25eb18188..2d273fc99a 100644 --- a/src/stc/ScintillaWX.h +++ b/src/stc/ScintillaWX.h @@ -140,7 +140,7 @@ private: wxStyledTextCtrl* stc; wxTextDataObject textDO; - wxSTCDropTarget dropTarget; + wxSTCDropTarget* dropTarget; wxDragResult dragResult; }; diff --git a/src/stc/makefile.vc b/src/stc/makefile.vc index 8e91828d3c..c1adeacff6 100644 --- a/src/stc/makefile.vc +++ b/src/stc/makefile.vc @@ -67,18 +67,6 @@ $(OBJECTS) << -$(PROGRAM).exe: $(D)\$(PROGRAM).obj $(DUMMYOBJ) $(WXLIB) $(LIBTARGET) $(PROGRAM).res - $(link) @<< --out:$(PROGRAM).exe -$(LINKFLAGS) -$(DUMMYOBJ) $(D)\$(PROGRAM).obj $(LIBTARGET) $(PROGRAM).res -$(LIBS) -<< - -$(PROGRAM).res : $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc - $(rc) -r /i$(WXDIR)\include -fo$@ $(PROGRAM).rc - - {$(S)}.cxx{$(D)}.obj: $(cc) @<< -- 2.45.2