projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
don't forget to output new line in wxMessageOutputStderr::Output() even if conversion...
[wxWidgets.git]
/
src
/
stc
/
ScintillaWX.h
diff --git
a/src/stc/ScintillaWX.h
b/src/stc/ScintillaWX.h
index 799e58ed5a289b5bed14b76f823067038aaf29fa..576229389b994ff54e4e649ca77ee31709827dbe 100644
(file)
--- a/
src/stc/ScintillaWX.h
+++ b/
src/stc/ScintillaWX.h
@@
-1,6
+1,6
@@
////////////////////////////////////////////////////////////////////////////
// Name: ScintillaWX.h
////////////////////////////////////////////////////////////////////////////
// Name: ScintillaWX.h
-// Purpose: A wxWi
ndow
s implementation of Scintilla. A class derived
+// Purpose: A wxWi
dget
s implementation of Scintilla. A class derived
// from ScintillaBase that uses the "wx platform" defined in
// PlatWX.cpp. This class is one end of a bridge between
// the wx world and the Scintilla world. It needs a peer
// from ScintillaBase that uses the "wx platform" defined in
// PlatWX.cpp. This class is one end of a bridge between
// the wx world and the Scintilla world. It needs a peer
@@
-16,6
+16,7
@@
#ifndef __ScintillaWX_h__
#define __ScintillaWX_h__
#ifndef __ScintillaWX_h__
#define __ScintillaWX_h__
+#include "wx/defs.h"
//----------------------------------------------------------------------
//----------------------------------------------------------------------
@@
-27,6
+28,7
@@
#include "Platform.h"
#include "Scintilla.h"
#include "Platform.h"
#include "Scintilla.h"
+#include "CharClassify.h"
#include "XPM.h"
#ifdef SCI_LEXER
#include "SciLexer.h"
#include "XPM.h"
#ifdef SCI_LEXER
#include "SciLexer.h"
@@
-34,8
+36,10
@@
#include "Accessor.h"
#include "KeyWords.h"
#endif
#include "Accessor.h"
#include "KeyWords.h"
#endif
+#include "SplitVector.h"
+#include "Partitioning.h"
+#include "RunStyles.h"
#include "ContractionState.h"
#include "ContractionState.h"
-#include "SVector.h"
#include "CellBuffer.h"
#include "CallTip.h"
#include "KeyMap.h"
#include "CellBuffer.h"
#include "CallTip.h"
#include "KeyMap.h"
@@
-44,26
+48,24
@@
#include "Style.h"
#include "ViewStyle.h"
#include "AutoComplete.h"
#include "Style.h"
#include "ViewStyle.h"
#include "AutoComplete.h"
+#include "Decoration.h"
#include "Document.h"
#include "Document.h"
+#include "PositionCache.h"
#include "Editor.h"
#include "ScintillaBase.h"
#include "Editor.h"
#include "ScintillaBase.h"
-#include <wx/wx.h>
-#include <wx/dataobj.h>
-#include <wx/clipbrd.h>
-#include <wx/dnd.h>
+#ifdef __WXMSW__
+#include "wx/msw/wrapwin.h" // HBITMAP
+#endif
+#if wxUSE_DRAG_AND_DROP
+#include "wx/timer.h"
+#endif
//----------------------------------------------------------------------
//----------------------------------------------------------------------
-#ifdef WXMAKINGDLL_STC
- #define WXDLLIMPEXP_STC WXEXPORT
-#elif defined(WXUSINGDLL)
- #define WXDLLIMPEXP_STC WXIMPORT
-#else // not making nor using DLL
- #define WXDLLIMPEXP_STC
-#endif
-class WXDLLIMPEXP_STC wxStyledTextCtrl; // forward
+class WXDLLIMPEXP_FWD_CORE wxDC;
+class WXDLLIMPEXP_FWD_STC wxStyledTextCtrl; // forward
class ScintillaWX;
class ScintillaWX;
@@
-74,7
+76,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);
@@
-83,7
+85,7
@@
public:
void OnLeave();
private:
void OnLeave();
private:
- ScintillaWX* swx;
+ ScintillaWX*
m_
swx;
};
#endif
};
#endif
@@
-99,6
+101,7
@@
public:
virtual void Initialise();
virtual void Finalise();
virtual void StartDrag();
virtual void Initialise();
virtual void Finalise();
virtual void StartDrag();
+ virtual bool SetIdle(bool on);
virtual void SetTicking(bool on);
virtual void SetMouseCapture(bool on);
virtual bool HaveMouseCapture();
virtual void SetTicking(bool on);
virtual void SetMouseCapture(bool on);
virtual bool HaveMouseCapture();
@@
-114,18
+117,20
@@
public:
virtual void AddToPopUp(const char *label, int cmd = 0, bool enabled = true);
virtual void ClaimSelection();
virtual void AddToPopUp(const char *label, int cmd = 0, bool enabled = true);
virtual void ClaimSelection();
- virtual
long
DefWndProc(unsigned int iMessage,
-
unsigned long
wParam,
-
long
lParam);
- virtual
long
WndProc(unsigned int iMessage,
-
unsigned long
wParam,
-
long
lParam);
+ virtual
sptr_t
DefWndProc(unsigned int iMessage,
+
uptr_t
wParam,
+
sptr_t
lParam);
+ virtual
sptr_t
WndProc(unsigned int iMessage,
+
uptr_t
wParam,
+
sptr_t
lParam);
virtual void NotifyChange();
virtual void NotifyParent(SCNotification scn);
virtual void CancelModes();
virtual void NotifyChange();
virtual void NotifyParent(SCNotification scn);
virtual void CancelModes();
+ virtual void UpdateSystemCaret();
+
// Event delegates
void DoPaint(wxDC* dc, wxRect rect);
void DoHScroll(int type, int pos);
// Event delegates
void DoPaint(wxDC* dc, wxRect rect);
void DoHScroll(int type, int pos);
@@
-140,8
+145,9
@@
public:
void DoMiddleButtonUp(Point pt);
void DoMouseWheel(int rotation, int delta, int linesPerAction, int ctrlDown, bool isPageScroll);
void DoAddChar(int key);
void DoMiddleButtonUp(Point pt);
void DoMouseWheel(int rotation, int delta, int linesPerAction, int ctrlDown, bool isPageScroll);
void DoAddChar(int key);
- int DoKeyDown(
int key, bool shift, bool ctrl, bool alt, bool meta
, bool* consumed);
+ int DoKeyDown(
const wxKeyEvent& event
, bool* consumed);
void DoTick() { Tick(); }
void DoTick() { Tick(); }
+ void DoOnIdle(wxIdleEvent& evt);
#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);
@@
-156,12
+162,14
@@
public:
// helpers
// helpers
- void FullPaint(
wxDC *dc
);
+ void FullPaint();
bool CanPaste();
bool GetHideSelection() { return hideSelection; }
void DoScrollToLine(int line);
void DoScrollToColumn(int column);
void ClipChildren(wxDC& dc, PRectangle rect);
bool CanPaste();
bool GetHideSelection() { return hideSelection; }
void DoScrollToLine(int line);
void DoScrollToColumn(int column);
void ClipChildren(wxDC& dc, PRectangle rect);
+ void SetUseAntiAliasing(bool useAA);
+ bool GetUseAntiAliasing();
private:
bool capturedMouse;
private:
bool capturedMouse;
@@
-172,9
+180,19
@@
private:
wxSTCDropTarget* dropTarget;
wxDragResult dragResult;
#endif
wxSTCDropTarget* dropTarget;
wxDragResult dragResult;
#endif
- int wheelRotation;
+ int wheelRotation;
+ // For use in creating a system caret
+ bool HasCaretSizeChanged();
+ bool CreateSystemCaret();
+ bool DestroySystemCaret();
+#ifdef __WXMSW__
+ HBITMAP sysCaretBitmap;
+ int sysCaretWidth;
+ int sysCaretHeight;
+#endif
+
friend class wxSTCCallTip;
};
friend class wxSTCCallTip;
};