AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add wxUSE_STC wrappers

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45517 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett 2007-04-17 05:48:09 +00:00
parent 70eca0fa29
commit 29825f5fc4
15 changed files with 93 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/wx/mac/setup0.h
View File

@ -567,6 +567,13 @@
// Recommended setting: 1
#define wxUSE_AUI 1
// Use wxStyledTextCtrl, a wxWidgets implementation of Scintilla.
//
// Default is 1
//
// Recommended setting: 1
#define wxUSE_STC 1
// Enable the new wxGraphicsPath and wxGraphicsContext classes for an advanced
// 2D drawing API. (Still somewhat experimental)
@ -1073,8 +1080,6 @@
// Use wxHTML-based help controller?
#define wxUSE_WXHTML_HELP 1
#define wxUSE_RESOURCES 0
// 0 for no wxGetResource/wxWriteResource
#define wxUSE_CONSTRAINTS 1
// 0 for no window layout constraint system

9
include/wx/motif/setup0.h
View File

@ -566,6 +566,13 @@
// Recommended setting: 1
#define wxUSE_AUI 1
// Use wxStyledTextCtrl, a wxWidgets implementation of Scintilla.
//
// Default is 1
//
// Recommended setting: 1
#define wxUSE_STC 1
// Enable the new wxGraphicsPath and wxGraphicsContext classes for an advanced
// 2D drawing API. (Still somewhat experimental)
@ -1072,8 +1079,6 @@
// Use wxHTML-based help controller?
#define wxUSE_WXHTML_HELP 1
#define wxUSE_RESOURCES 0
// 0 for no wxGetResource/wxWriteResource
#define wxUSE_CONSTRAINTS 1
// 0 for no window layout constraint system

9
include/wx/msw/setup0.h
View File

@ -566,6 +566,13 @@
// Recommended setting: 1
#define wxUSE_AUI 1
// Use wxStyledTextCtrl, a wxWidgets implementation of Scintilla.
//
// Default is 1
//
// Recommended setting: 1
#define wxUSE_STC 1
// Enable the new wxGraphicsPath and wxGraphicsContext classes for an advanced
// 2D drawing API. (Still somewhat experimental)
@ -1072,8 +1079,6 @@
// Use wxHTML-based help controller?
#define wxUSE_WXHTML_HELP 1
#define wxUSE_RESOURCES 0
// 0 for no wxGetResource/wxWriteResource
#define wxUSE_CONSTRAINTS 1
// 0 for no window layout constraint system

9
include/wx/msw/wince/setup.h
View File

@ -566,6 +566,13 @@
// Recommended setting: 1
#define wxUSE_AUI 1
// Use wxStyledTextCtrl, a wxWidgets implementation of Scintilla.
//
// Default is 1
//
// Recommended setting: 1
#define wxUSE_STC 1
// Enable the new wxGraphicsPath and wxGraphicsContext classes for an advanced
// 2D drawing API. (Still somewhat experimental)
@ -1072,8 +1079,6 @@
// Use wxHTML-based help controller?
#define wxUSE_WXHTML_HELP 1
#define wxUSE_RESOURCES 0
// 0 for no wxGetResource/wxWriteResource
#define wxUSE_CONSTRAINTS 1
// 0 for no window layout constraint system

9
include/wx/os2/setup0.h
View File

@ -566,6 +566,13 @@
// Recommended setting: 1
#define wxUSE_AUI 1
// Use wxStyledTextCtrl, a wxWidgets implementation of Scintilla.
//
// Default is 1
//
// Recommended setting: 1
#define wxUSE_STC 1
// Enable the new wxGraphicsPath and wxGraphicsContext classes for an advanced
// 2D drawing API. (Still somewhat experimental)
@ -1072,8 +1079,6 @@
// Use wxHTML-based help controller?
#define wxUSE_WXHTML_HELP 1
#define wxUSE_RESOURCES 0
// 0 for no wxGetResource/wxWriteResource
#define wxUSE_CONSTRAINTS 1
// 0 for no window layout constraint system

9
include/wx/palmos/setup0.h
View File

@ -566,6 +566,13 @@
// Recommended setting: 1
#define wxUSE_AUI 1
// Use wxStyledTextCtrl, a wxWidgets implementation of Scintilla.
//
// Default is 1
//
// Recommended setting: 1
#define wxUSE_STC 1
// Enable the new wxGraphicsPath and wxGraphicsContext classes for an advanced
// 2D drawing API. (Still somewhat experimental)
@ -1072,8 +1079,6 @@
// Use wxHTML-based help controller?
#define wxUSE_WXHTML_HELP 1
#define wxUSE_RESOURCES 0
// 0 for no wxGetResource/wxWriteResource
#define wxUSE_CONSTRAINTS 1
// 0 for no window layout constraint system

7
include/wx/setup_inc.h
View File

@ -562,6 +562,13 @@
// Recommended setting: 1
#define wxUSE_AUI 1
// Use wxStyledTextCtrl, a wxWidgets implementation of Scintilla.
//
// Default is 1
//
// Recommended setting: 1
#define wxUSE_STC 1
// Enable the new wxGraphicsPath and wxGraphicsContext classes for an advanced
// 2D drawing API. (Still somewhat experimental)

9
include/wx/stc/stc.h
View File

@ -20,10 +20,15 @@
#ifndef __stc_h__
#define __stc_h__
#include "wx/defs.h"
#include "wx/wx.h"
#if wxUSE_STC
#include "wx/control.h"
#include "wx/dnd.h"
#include "wx/stopwatch.h"
class WXDLLIMPEXP_CORE wxScrollBar;
#ifdef WXMAKINGDLL_STC
#define WXDLLIMPEXP_STC WXEXPORT
@ -3618,4 +3623,4 @@ inline const wxWX2MBbuf wx2stc(const wxString& str) {
//----------------------------------------------------------------------
#endif
#endif // wxUSE_STC

10
include/wx/univ/setup0.h
View File

@ -583,6 +583,13 @@
// Recommended setting: 1
#define wxUSE_AUI 1
// Use wxStyledTextCtrl, a wxWidgets implementation of Scintilla.
//
// Default is 1
//
// Recommended setting: 1
#define wxUSE_STC 1
// Enable the new wxGraphicsPath and wxGraphicsContext classes for an advanced
// 2D drawing API. (Still somewhat experimental)
@ -1119,9 +1126,6 @@
// Use wxHTML-based help controller
#define wxUSE_WXHTML_HELP 1
// Use resources
#define wxUSE_RESOURCES 0
// Window layout constraint system
#define wxUSE_CONSTRAINTS 1

5
setup.h.in
View File

@ -298,6 +298,8 @@
#define wxUSE_AUI 0
#define wxUSE_STC 0
#ifndef wxUSE_GRAPHICS_CONTEXT
#define wxUSE_GRAPHICS_CONTEXT 0
@ -909,9 +911,6 @@
/* define if you have vsscanf function */
#undef HAVE_VSSCANF
/* The number of bytes in a char. */
#undef SIZEOF_CHAR
/* The number of bytes in a wchar_t. */
#undef SIZEOF_WCHAR_T

6
src/stc/PlatWX.cpp
View File

@ -11,8 +11,12 @@
#pragma hdrstop
#endif
#if wxUSE_STC
#ifndef WX_PRECOMP
#include "wx/menu.h"
#include "wx/dcmemory.h"
#include "wx/settings.h"
#endif // WX_PRECOMP
#include <ctype.h>
@ -1568,3 +1572,5 @@ const wxWX2MBbuf wx2stc(const wxString& str)
}
#endif
#endif // wxUSE_STC

5
src/stc/ScintillaWX.cpp
View File

@ -21,8 +21,11 @@
#pragma hdrstop
#endif
#if wxUSE_STC
#ifndef WX_PRECOMP
#include "wx/scrolbar.h"
#include "wx/menu.h"
#endif // WX_PRECOMP
#include "wx/textbuf.h"
@ -1143,3 +1146,5 @@ bool ScintillaWX::GetUseAntiAliasing() {
//----------------------------------------------------------------------
//----------------------------------------------------------------------
#endif // wxUSE_STC

15
src/stc/stc.cpp
View File

@ -22,19 +22,21 @@
#pragma hdrstop
#endif
#if wxUSE_STC
#include "wx/stc/stc.h"
#ifndef WX_PRECOMP
#include "wx/wx.h"
#endif // WX_PRECOMP
#include <ctype.h>
#include "wx/wx.h"
#include "wx/tokenzr.h"
#include "wx/mstream.h"
#include "wx/image.h"
#include "wx/file.h"
#include "wx/stc/stc.h"
#include "ScintillaWX.h"
//----------------------------------------------------------------------
@ -3433,11 +3435,4 @@ wxStyledTextEvent::wxStyledTextEvent(const wxStyledTextEvent& event):
//----------------------------------------------------------------------
//----------------------------------------------------------------------
#endif // wxUSE_STC

15
src/stc/stc.cpp.in
View File

@ -22,19 +22,21 @@
#pragma hdrstop
#endif
#if wxUSE_STC
#include "wx/stc/stc.h"
#ifndef WX_PRECOMP
#include "wx/wx.h"
#endif // WX_PRECOMP
#include <ctype.h>
#include "wx/wx.h"
#include "wx/tokenzr.h"
#include "wx/mstream.h"
#include "wx/image.h"
#include "wx/file.h"
#include "wx/stc/stc.h"
#include "ScintillaWX.h"
//----------------------------------------------------------------------
@ -1071,11 +1073,4 @@ wxStyledTextEvent::wxStyledTextEvent(const wxStyledTextEvent& event):
//----------------------------------------------------------------------
//----------------------------------------------------------------------
#endif // wxUSE_STC

9
src/stc/stc.h.in
View File

@ -20,10 +20,15 @@
#ifndef __stc_h__
#define __stc_h__
#include "wx/defs.h"
#include "wx/wx.h"
#if wxUSE_STC
#include "wx/control.h"
#include "wx/dnd.h"
#include "wx/stopwatch.h"
class WXDLLIMPEXP_CORE wxScrollBar;
#ifdef WXMAKINGDLL_STC
#define WXDLLIMPEXP_STC WXEXPORT
@ -539,4 +544,4 @@ inline const wxWX2MBbuf wx2stc(const wxString& str) {
//----------------------------------------------------------------------
#endif
#endif // wxUSE_STC