projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
set string length to 0 in AllocBeforeWrite() just to be tidy (replaces patch 1123226)
[wxWidgets.git]
/
src
/
stc
/
ScintillaWX.h
diff --git
a/src/stc/ScintillaWX.h
b/src/stc/ScintillaWX.h
index 4c6b35c6e3276e05ca65aa4743b1284a840829bb..0746fd24b9baeacc65680dcbb32a2e201c721a6b 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
@@
-55,7
+55,15
@@
//----------------------------------------------------------------------
//----------------------------------------------------------------------
-class wxStyledTextCtrl; // forward
+#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 ScintillaWX;
class ScintillaWX;
@@
-91,6
+99,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();
@@
-100,6
+109,8
@@
public:
virtual bool ModifyScrollBars(int nMax, int nPage);
virtual void Copy();
virtual void Paste();
virtual bool ModifyScrollBars(int nMax, int nPage);
virtual void Copy();
virtual void Paste();
+ virtual void CopyToClipboard(const SelectionText &selectedText);
+
virtual void CreateCallTipWindow(PRectangle rc);
virtual void AddToPopUp(const char *label, int cmd = 0, bool enabled = true);
virtual void ClaimSelection();
virtual void CreateCallTipWindow(PRectangle rc);
virtual void AddToPopUp(const char *label, int cmd = 0, bool enabled = true);
virtual void ClaimSelection();
@@
-114,6
+125,9
@@
public:
virtual void NotifyChange();
virtual void NotifyParent(SCNotification scn);
virtual void NotifyChange();
virtual void NotifyParent(SCNotification scn);
+ virtual void CancelModes();
+
+ virtual void UpdateSystemCaret();
// Event delegates
void DoPaint(wxDC* dc, wxRect rect);
// Event delegates
void DoPaint(wxDC* dc, wxRect rect);
@@
-129,8
+143,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 al
t, bool* consumed);
+ int DoKeyDown(
const wxKeyEvent& even
t, 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);
@@
-151,9
+166,12
@@
public:
void DoScrollToLine(int line);
void DoScrollToColumn(int column);
void ClipChildren(wxDC& dc, PRectangle rect);
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;
+ bool focusEvent;
wxStyledTextCtrl* stc;
#if wxUSE_DRAG_AND_DROP
wxStyledTextCtrl* stc;
#if wxUSE_DRAG_AND_DROP
@@
-162,7
+180,16
@@
private:
#endif
int wheelRotation;
#endif
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;
};