aboutsummaryrefslogtreecommitdiffhomepage
path: root/win32/ScintillaWin.cxx
diff options
context:
space:
mode:
authornyamatongwe <devnull@localhost>2008-06-29 09:18:49 +0000
committernyamatongwe <devnull@localhost>2008-06-29 09:18:49 +0000
commitff418c5610a1e43014ad61308170edca5ae6bc9e (patch)
tree641f3e3b4b1237131a62c7089333109d3e4a80b8 /win32/ScintillaWin.cxx
parentacf7e38fb64dc16869b1d8b3bbb8f285053be90c (diff)
downloadscintilla-mirror-ff418c5610a1e43014ad61308170edca5ae6bc9e.tar.gz
Simon Steele's modification to allow replacing the regular
expression implementation.
Diffstat (limited to 'win32/ScintillaWin.cxx')
-rw-r--r--win32/ScintillaWin.cxx8
1 files changed, 6 insertions, 2 deletions
diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx
index e55892b62..9568aa85d 100644
--- a/win32/ScintillaWin.cxx
+++ b/win32/ScintillaWin.cxx
@@ -99,6 +99,10 @@ extern void Platform_Finalise();
const TCHAR scintillaClassName[] = TEXT("Scintilla");
const TCHAR callClassName[] = TEXT("CallTip");
+#ifdef SCI_NAMESPACE
+using namespace Scintilla;
+#endif
+
class ScintillaWin; // Forward declaration for COM interface subobjects
/**
@@ -2247,7 +2251,7 @@ bool ScintillaWin::Register(HINSTANCE hInstance_) {
WNDCLASSEXW wndclass;
wndclass.cbSize = sizeof(wndclass);
wndclass.style = CS_GLOBALCLASS | CS_HREDRAW | CS_VREDRAW;
- wndclass.lpfnWndProc = ::ScintillaWin::SWndProc;
+ wndclass.lpfnWndProc = ScintillaWin::SWndProc;
wndclass.cbClsExtra = 0;
wndclass.cbWndExtra = sizeof(ScintillaWin *);
wndclass.hInstance = hInstance;
@@ -2264,7 +2268,7 @@ bool ScintillaWin::Register(HINSTANCE hInstance_) {
WNDCLASSEX wndclass;
wndclass.cbSize = sizeof(wndclass);
wndclass.style = CS_GLOBALCLASS | CS_HREDRAW | CS_VREDRAW;
- wndclass.lpfnWndProc = ::ScintillaWin::SWndProc;
+ wndclass.lpfnWndProc = ScintillaWin::SWndProc;
wndclass.cbClsExtra = 0;
wndclass.cbWndExtra = sizeof(ScintillaWin *);
wndclass.hInstance = hInstance;