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

dropTarget is now dynamically allocated.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6747 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2000-03-16 00:15:48 +00:00
parent 7e42f2f863
commit 9eb662e94c
6 changed files with 8 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
contrib/src/stc/ScintillaWX.cpp
View File

@@ -84,8 +84,9 @@ ScintillaWX::~ScintillaWX() {
void ScintillaWX::Initialise() { void ScintillaWX::Initialise() {
//ScintillaBase::Initialise(); //ScintillaBase::Initialise();
dropTarget.SetScintilla(this); dropTarget = new wxSTCDropTarget;
stc->SetDropTarget(&dropTarget); dropTarget->SetScintilla(this);
stc->SetDropTarget(dropTarget);
} }

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

@@ -140,7 +140,7 @@ private:
wxStyledTextCtrl* stc; wxStyledTextCtrl* stc;
wxTextDataObject textDO; wxTextDataObject textDO;
wxSTCDropTarget dropTarget; wxSTCDropTarget* dropTarget;
wxDragResult dragResult; wxDragResult dragResult;
}; };

12
contrib/src/stc/makefile.vc
View File

@@ -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: {$(S)}.cxx{$(D)}.obj:
$(cc) @<< $(cc) @<<

5
src/stc/ScintillaWX.cpp
View File

@@ -84,8 +84,9 @@ ScintillaWX::~ScintillaWX() {
void ScintillaWX::Initialise() { void ScintillaWX::Initialise() {
//ScintillaBase::Initialise(); //ScintillaBase::Initialise();
dropTarget.SetScintilla(this); dropTarget = new wxSTCDropTarget;
stc->SetDropTarget(&dropTarget); dropTarget->SetScintilla(this);
stc->SetDropTarget(dropTarget);
} }

2
src/stc/ScintillaWX.h
View File

@@ -140,7 +140,7 @@ private:
wxStyledTextCtrl* stc; wxStyledTextCtrl* stc;
wxTextDataObject textDO; wxTextDataObject textDO;
wxSTCDropTarget dropTarget; wxSTCDropTarget* dropTarget;
wxDragResult dragResult; wxDragResult dragResult;
}; };

12
src/stc/makefile.vc
View File

@@ -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: {$(S)}.cxx{$(D)}.obj:
$(cc) @<< $(cc) @<<