projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove extra colons and semicolons
[wxWidgets.git]
/
src
/
stc
/
ScintillaWX.h
diff --git
a/src/stc/ScintillaWX.h
b/src/stc/ScintillaWX.h
index 4c6b35c6e3276e05ca65aa4743b1284a840829bb..26e9c239e58361882c97cd51d3ea3d6e3e7ce469 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"
@@
-48,14
+50,18
@@
#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
//----------------------------------------------------------------------
//----------------------------------------------------------------------
-class wxStyledTextCtrl; // forward
+
+class WXDLLIMPEXP_FWD_CORE wxDC;
+class WXDLLIMPEXP_FWD_STC wxStyledTextCtrl; // forward
class ScintillaWX;
class ScintillaWX;
@@
-66,7
+72,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);
@@
-75,7
+81,7
@@
public:
void OnLeave();
private:
void OnLeave();
private:
- ScintillaWX* swx;
+ ScintillaWX*
m_
swx;
};
#endif
};
#endif
@@
-91,6
+97,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,20
+107,25
@@
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();
- 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 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
+141,10
@@
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);
+ 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);
@@
-151,18
+165,32
@@
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
wxSTCDropTarget* dropTarget;
wxDragResult dragResult;
wxStyledTextCtrl* stc;
#if wxUSE_DRAG_AND_DROP
wxSTCDropTarget* dropTarget;
wxDragResult dragResult;
+ wxTimer* startDragTimer;
#endif
#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;
};