projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Define KEY_WOW64_64KEY if it is missing from SDK headers.
[wxWidgets.git]
/
src
/
stc
/
ScintillaWX.h
diff --git
a/src/stc/ScintillaWX.h
b/src/stc/ScintillaWX.h
index cdad2be175a58fcdf9c2bee9a47614031862f2d6..dfb9b6965b11a3f87be04d572b02d77e7c2bcd2d 100644
(file)
--- a/
src/stc/ScintillaWX.h
+++ b/
src/stc/ScintillaWX.h
@@
-11,7
+11,7
@@
// Created: 13-Jan-2000
// RCS-ID: $Id$
// Copyright: (c) 2000 by Total Control Software
// Created: 13-Jan-2000
// RCS-ID: $Id$
// Copyright: (c) 2000 by Total Control Software
-// Licence: wxWindows licen
s
e
+// Licence: wxWindows licen
c
e
/////////////////////////////////////////////////////////////////////////////
#ifndef __ScintillaWX_h__
/////////////////////////////////////////////////////////////////////////////
#ifndef __ScintillaWX_h__
@@
-26,10
+26,11
@@
#include <string.h>
#include "Platform.h"
#include <string.h>
#include "Platform.h"
-
+#include "SplitVector.h"
+#include "Partitioning.h"
+#include "RunStyles.h"
#include "Scintilla.h"
#include "Scintilla.h"
-#include "CharClassify.h"
-#include "XPM.h"
+#include "ScintillaWidget.h"
#ifdef SCI_LEXER
#include "SciLexer.h"
#include "PropSet.h"
#ifdef SCI_LEXER
#include "SciLexer.h"
#include "PropSet.h"
@@
-42,12
+43,18
@@
#include "CallTip.h"
#include "KeyMap.h"
#include "Indicator.h"
#include "CallTip.h"
#include "KeyMap.h"
#include "Indicator.h"
+#include "XPM.h"
#include "LineMarker.h"
#include "Style.h"
#include "LineMarker.h"
#include "Style.h"
-#include "ViewStyle.h"
#include "AutoComplete.h"
#include "AutoComplete.h"
+#include "ViewStyle.h"
+#include "CharClassify.h"
+#include "Decoration.h"
#include "Document.h"
#include "Document.h"
+#include "Selection.h"
+#include "PositionCache.h"
#include "Editor.h"
#include "Editor.h"
+#include "PropSetSimple.h"
#include "ScintillaBase.h"
#ifdef __WXMSW__
#include "ScintillaBase.h"
#ifdef __WXMSW__
@@
-60,8
+67,8
@@
//----------------------------------------------------------------------
//----------------------------------------------------------------------
-class WXDLLIMPEXP_CORE wxDC;
-class WXDLLIMPEXP_STC wxStyledTextCtrl; // forward
+class WXDLLIMPEXP_
FWD_
CORE wxDC;
+class WXDLLIMPEXP_
FWD_
STC wxStyledTextCtrl; // forward
class ScintillaWX;
class ScintillaWX;
@@
-72,7
+79,7
@@
class ScintillaWX;
class wxSTCDropTarget : public wxTextDropTarget {
public:
void SetScintilla(ScintillaWX* swx) {
class wxSTCDropTarget : public wxTextDropTarget {
public:
void SetScintilla(ScintillaWX* swx) {
-
this->
swx = swx;
+
m_
swx = swx;
}
bool OnDropText(wxCoord x, wxCoord y, const wxString& data);
}
bool OnDropText(wxCoord x, wxCoord y, const wxString& data);
@@
-81,7
+88,7
@@
public:
void OnLeave();
private:
void OnLeave();
private:
- ScintillaWX* swx;
+ ScintillaWX*
m_
swx;
};
#endif
};
#endif
@@
-144,7
+151,6
@@
public:
int DoKeyDown(const wxKeyEvent& event, bool* consumed);
void DoTick() { Tick(); }
void DoOnIdle(wxIdleEvent& evt);
int DoKeyDown(const wxKeyEvent& event, bool* consumed);
void DoTick() { Tick(); }
void DoOnIdle(wxIdleEvent& evt);
- void DoStartDrag();
#if wxUSE_DRAG_AND_DROP
bool DoDropText(long x, long y, const wxString& data);
#if wxUSE_DRAG_AND_DROP
bool DoDropText(long x, long y, const wxString& data);
@@
-176,7
+182,6
@@
private:
#if wxUSE_DRAG_AND_DROP
wxSTCDropTarget* dropTarget;
wxDragResult dragResult;
#if wxUSE_DRAG_AND_DROP
wxSTCDropTarget* dropTarget;
wxDragResult dragResult;
- wxTimer* startDragTimer;
#endif
int wheelRotation;
#endif
int wheelRotation;