projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix Shift+TAB navigation from wxNotebook.
[wxWidgets.git]
/
src
/
stc
/
ScintillaWX.h
diff --git
a/src/stc/ScintillaWX.h
b/src/stc/ScintillaWX.h
index c945804fce32bc5ffd2ba5d9c74c4ceeb6830325..ae27a5d50047a3a88152e78c03cd845ac756c1fd 100644
(file)
--- a/
src/stc/ScintillaWX.h
+++ b/
src/stc/ScintillaWX.h
@@
-16,6
+16,7
@@
#ifndef __ScintillaWX_h__
#define __ScintillaWX_h__
#ifndef __ScintillaWX_h__
#define __ScintillaWX_h__
+#include "wx/defs.h"
//----------------------------------------------------------------------
//----------------------------------------------------------------------
@@
-25,9
+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 "
XPM
.h"
+#include "
ScintillaWidget
.h"
#ifdef SCI_LEXER
#include "SciLexer.h"
#include "PropSet.h"
#ifdef SCI_LEXER
#include "SciLexer.h"
#include "PropSet.h"
@@
-40,26
+43,32
@@
#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"
#include "ScintillaBase.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;
@@
-70,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);
@@
-79,7
+88,7
@@
public:
void OnLeave();
private:
void OnLeave();
private:
- ScintillaWX* swx;
+ ScintillaWX*
m_
swx;
};
#endif
};
#endif
@@
-111,12
+120,12
@@
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 NotifyChange();
virtual void NotifyParent(SCNotification scn);
@@
-142,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);
@@
-174,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;