projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
simplify code so it always returns the same object
[wxWidgets.git]
/
src
/
stc
/
ScintillaWX.h
diff --git
a/src/stc/ScintillaWX.h
b/src/stc/ScintillaWX.h
index 105343f240840a574d455d8055f8b35430ed02aa..a7ac8023e084f9e464ac0ab4cf7790936caa4f6c 100644
(file)
--- a/
src/stc/ScintillaWX.h
+++ b/
src/stc/ScintillaWX.h
@@
-1,5
+1,5
@@
////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////
-// Name: ScintillaWX.h
+// Name:
src/stc/
ScintillaWX.h
// Purpose: A wxWidgets 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
// Purpose: A wxWidgets 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
@@
-11,11
+11,12
@@
// Created: 13-Jan-2000
// RCS-ID: $Id$
// Copyright: (c) 2000 by Total Control Software
// Created: 13-Jan-2000
// RCS-ID: $Id$
// Copyright: (c) 2000 by Total Control Software
-// Licence: wxWindows licen
s
e
+// Licence: wxWindows licen
c
e
/////////////////////////////////////////////////////////////////////////////
#ifndef __ScintillaWX_h__
#define __ScintillaWX_h__
/////////////////////////////////////////////////////////////////////////////
#ifndef __ScintillaWX_h__
#define __ScintillaWX_h__
+#include "wx/defs.h"
//----------------------------------------------------------------------
//----------------------------------------------------------------------
@@
-23,17
+24,24
@@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
+#include <vector>
+#include <map>
+// These are all Scintilla headers
#include "Platform.h"
#include "Platform.h"
-
+#include "SplitVector.h"
+#include "Partitioning.h"
+#include "RunStyles.h"
#include "Scintilla.h"
#include "Scintilla.h"
-#include "CharClassify.h"
-#include "XPM.h"
+#include "ScintillaWidget.h"
#ifdef SCI_LEXER
#include "SciLexer.h"
#ifdef SCI_LEXER
#include "SciLexer.h"
-#include "PropSet.h"
+#include "PropSetSimple.h"
+#include "ILexer.h"
+#include "LexerModule.h"
+#include "LexAccessor.h"
#include "Accessor.h"
#include "Accessor.h"
-#include "
KeyWords
.h"
+#include "
WordList
.h"
#endif
#include "ContractionState.h"
#include "SVector.h"
#endif
#include "ContractionState.h"
#include "SVector.h"
@@
-41,12
+49,18
@@
#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"
#ifdef __WXMSW__
#include "ScintillaBase.h"
#ifdef __WXMSW__
@@
-58,15
+72,9
@@
//----------------------------------------------------------------------
//----------------------------------------------------------------------
-#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;
@@
-77,7
+85,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);
@@
-86,7
+94,7
@@
public:
void OnLeave();
private:
void OnLeave();
private:
- ScintillaWX* swx;
+ ScintillaWX*
m_
swx;
};
#endif
};
#endif
@@
-149,7
+157,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);
@@
-165,6
+172,7
@@
public:
// helpers
void FullPaint();
// helpers
void FullPaint();
+ void FullPaintDC(wxDC* dc);
bool CanPaste();
bool GetHideSelection() { return hideSelection; }
void DoScrollToLine(int line);
bool CanPaste();
bool GetHideSelection() { return hideSelection; }
void DoScrollToLine(int line);
@@
-181,7
+189,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;