dropTarget is now dynamically allocated.

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

diff --git a/contrib/src/stc/ScintillaWX.cpp b/contrib/src/stc/ScintillaWX.cpp
index 5b82473a49240250c21aa9bd15ec91eb3f1c3936..7e44f56b3eed89c6e8fbbf35fdf57a33ba6a4250 100644 (file)
--- a/contrib/src/stc/ScintillaWX.cpp
+++ b/contrib/src/stc/ScintillaWX.cpp
@@ -84,8 +84,9 @@ ScintillaWX::~ScintillaWX() {
 
 void ScintillaWX::Initialise() {
     //ScintillaBase::Initialise();
 
 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 d25eb1818805588d2f8c9207f03347584ecf3106..2d273fc99a276b048d85ae35c4c90f56c57e7a20 100644 (file)
--- a/contrib/src/stc/ScintillaWX.h
+++ b/contrib/src/stc/ScintillaWX.h
@@ -140,7 +140,7 @@ private:
     wxStyledTextCtrl*   stc;
 
     wxTextDataObject    textDO;
     wxStyledTextCtrl*   stc;
 
     wxTextDataObject    textDO;

-    wxSTCDropTarget     dropTarget;
+    wxSTCDropTarget*    dropTarget;

     wxDragResult        dragResult;
 };
 
     wxDragResult        dragResult;
 };
 

diff --git a/contrib/src/stc/makefile.vc b/contrib/src/stc/makefile.vc
index 8e91828d3c921bc3b2abc4be5662221192c81c8a..c1adeacff6c2ff653de77d024ea2e6f491821440 100644 (file)
--- 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) @<<
 
 {$(S)}.cxx{$(D)}.obj:
        $(cc) @<<

diff --git a/src/stc/ScintillaWX.cpp b/src/stc/ScintillaWX.cpp
index 5b82473a49240250c21aa9bd15ec91eb3f1c3936..7e44f56b3eed89c6e8fbbf35fdf57a33ba6a4250 100644 (file)
--- a/src/stc/ScintillaWX.cpp
+++ b/src/stc/ScintillaWX.cpp
@@ -84,8 +84,9 @@ ScintillaWX::~ScintillaWX() {
 
 void ScintillaWX::Initialise() {
     //ScintillaBase::Initialise();
 
 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 d25eb1818805588d2f8c9207f03347584ecf3106..2d273fc99a276b048d85ae35c4c90f56c57e7a20 100644 (file)
--- a/src/stc/ScintillaWX.h
+++ b/src/stc/ScintillaWX.h
@@ -140,7 +140,7 @@ private:
     wxStyledTextCtrl*   stc;
 
     wxTextDataObject    textDO;
     wxStyledTextCtrl*   stc;
 
     wxTextDataObject    textDO;

-    wxSTCDropTarget     dropTarget;
+    wxSTCDropTarget*    dropTarget;

     wxDragResult        dragResult;
 };
 
     wxDragResult        dragResult;
 };
 

diff --git a/src/stc/makefile.vc b/src/stc/makefile.vc
index 8e91828d3c921bc3b2abc4be5662221192c81c8a..c1adeacff6c2ff653de77d024ea2e6f491821440 100644 (file)
--- 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) @<<
 
 {$(S)}.cxx{$(D)}.obj:
        $(cc) @<<