projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
allow wxPopupWindow get the key events (patch 713269)
[wxWidgets.git]
/
src
/
stc
/
ScintillaWX.h
diff --git
a/src/stc/ScintillaWX.h
b/src/stc/ScintillaWX.h
index 04b2ac03334234128380d6be32010656e2b09033..4c6b35c6e3276e05ca65aa4743b1284a840829bb 100644
(file)
--- a/
src/stc/ScintillaWX.h
+++ b/
src/stc/ScintillaWX.h
@@
-27,6
+27,7
@@
#include "Platform.h"
#include "Scintilla.h"
#include "Platform.h"
#include "Scintilla.h"
+#include "XPM.h"
#ifdef SCI_LEXER
#include "SciLexer.h"
#include "PropSet.h"
#ifdef SCI_LEXER
#include "SciLexer.h"
#include "PropSet.h"
@@
-149,8
+150,10
@@
public:
bool GetHideSelection() { return hideSelection; }
void DoScrollToLine(int line);
void DoScrollToColumn(int column);
bool GetHideSelection() { return hideSelection; }
void DoScrollToLine(int line);
void DoScrollToColumn(int column);
+ void ClipChildren(wxDC& dc, PRectangle rect);
private:
private:
+ bool capturedMouse;
wxStyledTextCtrl* stc;
#if wxUSE_DRAG_AND_DROP
wxStyledTextCtrl* stc;
#if wxUSE_DRAG_AND_DROP
@@
-158,6
+161,9
@@
private:
wxDragResult dragResult;
#endif
int wheelRotation;
wxDragResult dragResult;
#endif
int wheelRotation;
+
+
+ friend class wxSTCCallTip;
};
//----------------------------------------------------------------------
};
//----------------------------------------------------------------------