add wxUSE_STC wrappers

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45517 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/mac/setup0.h b/include/wx/mac/setup0.h
index d4b8896cdc647e142dcc723b234f503c51ed96e9..dbf2ba1d597af4e877354acfa3037e3eccf103c2 100644 (file)
--- a/include/wx/mac/setup0.h
+++ b/include/wx/mac/setup0.h
@@ -567,6 +567,13 @@
 // Recommended setting: 1
 #define wxUSE_AUI       1
 
 // 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)
 
 // 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
 
 // 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
 
 #define wxUSE_CONSTRAINTS 1
                                 // 0 for no window layout constraint system
 

diff --git a/include/wx/motif/setup0.h b/include/wx/motif/setup0.h
index 25ef8c3cb82d72554be8ba8a09c0e5f746379ed9..cf89a3b21300a71a1fceb70daa4206bb24782f65 100644 (file)
--- a/include/wx/motif/setup0.h
+++ b/include/wx/motif/setup0.h
@@ -566,6 +566,13 @@
 // Recommended setting: 1
 #define wxUSE_AUI       1
 
 // 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)
 
 // 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
 
 // 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
 
 #define wxUSE_CONSTRAINTS 1
                                 // 0 for no window layout constraint system
 

diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index a88f1b49b61094b1d7ce8a4f5f88788c99005070..cdfae5026798730ecc7d5156a8d310a90501c57f 100644 (file)
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -566,6 +566,13 @@
 // Recommended setting: 1
 #define wxUSE_AUI       1
 
 // 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)
 
 // 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
 
 // 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
 
 #define wxUSE_CONSTRAINTS 1
                                 // 0 for no window layout constraint system
 

diff --git a/include/wx/msw/wince/setup.h b/include/wx/msw/wince/setup.h
index 645c6a0f684156b4440200f4fee29c248b8aebf0..0e24d68dcdcdb36e0ffdab67df680e5bedf7d9bd 100644 (file)
--- a/include/wx/msw/wince/setup.h
+++ b/include/wx/msw/wince/setup.h
@@ -566,6 +566,13 @@
 // Recommended setting: 1
 #define wxUSE_AUI       1
 
 // 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)
 
 // 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
 
 // 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
 
 #define wxUSE_CONSTRAINTS 1
                                 // 0 for no window layout constraint system
 

diff --git a/include/wx/os2/setup0.h b/include/wx/os2/setup0.h
index 8d0e95131a0461f68a37159ac2c439a940356623..a0fca2ada9fa285c9a636898de84623ba73a007c 100644 (file)
--- a/include/wx/os2/setup0.h
+++ b/include/wx/os2/setup0.h
@@ -566,6 +566,13 @@
 // Recommended setting: 1
 #define wxUSE_AUI       1
 
 // 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)
 
 // 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
 
 // 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
 
 #define wxUSE_CONSTRAINTS 1
                                 // 0 for no window layout constraint system
 

diff --git a/include/wx/palmos/setup0.h b/include/wx/palmos/setup0.h
index 5ac424e7fbb5ca668a3a04fb64b048cc255521ea..563f0e4bf9f875a6129af4cb93ef2205d608d786 100644 (file)
--- a/include/wx/palmos/setup0.h
+++ b/include/wx/palmos/setup0.h
@@ -566,6 +566,13 @@
 // Recommended setting: 1
 #define wxUSE_AUI       1
 
 // 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)
 
 // 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
 
 // 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
 
 #define wxUSE_CONSTRAINTS 1
                                 // 0 for no window layout constraint system
 

diff --git a/include/wx/setup_inc.h b/include/wx/setup_inc.h
index 827dbf7422e6f9b0e08473ac5e443b64c7e2237b..282c4032826c6d2b86621351c1024320798c513b 100644 (file)
--- a/include/wx/setup_inc.h
+++ b/include/wx/setup_inc.h
@@ -562,6 +562,13 @@
 // Recommended setting: 1
 #define wxUSE_AUI       1
 
 // 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)
 
 // Enable the new wxGraphicsPath and wxGraphicsContext classes for an advanced
 // 2D drawing API.  (Still somewhat experimental)

diff --git a/include/wx/stc/stc.h b/include/wx/stc/stc.h
index a48accc7f414b76ef965ff2c62c14c8b195bafa8..10a2e656ab8d17c69f6c2509620e1e3d37b244e2 100644 (file)
--- a/include/wx/stc/stc.h
+++ b/include/wx/stc/stc.h
@@ -20,10 +20,15 @@
 #ifndef __stc_h__
 #define __stc_h__
 
 #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/dnd.h"

+#include "wx/stopwatch.h"

 
 

+class WXDLLIMPEXP_CORE wxScrollBar;

 
 #ifdef WXMAKINGDLL_STC
     #define WXDLLIMPEXP_STC WXEXPORT
 
 #ifdef WXMAKINGDLL_STC
     #define WXDLLIMPEXP_STC WXEXPORT


@@ -3618,4 +3623,4 @@ inline const wxWX2MBbuf wx2stc(const wxString& str) {
 //----------------------------------------------------------------------
 #endif
 
 //----------------------------------------------------------------------
 #endif
 

-
+#endif // wxUSE_STC

diff --git a/include/wx/univ/setup0.h b/include/wx/univ/setup0.h
index 83843b71e3d9a31d558c59b5034f2aafe96b9877..dbc1332c13c3add5fb90f258981760f8d6b73a6d 100644 (file)
--- a/include/wx/univ/setup0.h
+++ b/include/wx/univ/setup0.h
@@ -583,6 +583,13 @@
 // Recommended setting: 1
 #define wxUSE_AUI       1
 
 // 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)
 
 // 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 wxHTML-based help controller
 #define wxUSE_WXHTML_HELP 1
 

-// Use resources
-#define wxUSE_RESOURCES 0
-

 // Window layout constraint system
 #define wxUSE_CONSTRAINTS 1
 
 // Window layout constraint system
 #define wxUSE_CONSTRAINTS 1
 

diff --git a/setup.h.in b/setup.h.in
index d4e09cd1e873505cda9d13e89bbf41fd5efb9d26..1e990974c10373a087a521b20a758ca2c8db9282 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -298,6 +298,8 @@
 
 #define wxUSE_AUI       0
 
 
 #define wxUSE_AUI       0
 

+#define wxUSE_STC 0
+

 
 #ifndef wxUSE_GRAPHICS_CONTEXT
 #define wxUSE_GRAPHICS_CONTEXT 0
 
 #ifndef wxUSE_GRAPHICS_CONTEXT
 #define wxUSE_GRAPHICS_CONTEXT 0


@@ -909,9 +911,6 @@
 /* define if you have vsscanf function */
 #undef HAVE_VSSCANF
 
 /* 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
 
 /* The number of bytes in a wchar_t.  */
 #undef SIZEOF_WCHAR_T
 

diff --git a/src/stc/PlatWX.cpp b/src/stc/PlatWX.cpp
index 111230d8de597fb935f077eb0c3e11487d0b2831..095d031fb3150bdaa52c5d377dfb065ebdefac3f 100644 (file)
--- a/src/stc/PlatWX.cpp
+++ b/src/stc/PlatWX.cpp
@@ -11,8 +11,12 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_STC

 
 #ifndef WX_PRECOMP
 
 #ifndef WX_PRECOMP

+    #include "wx/menu.h"
+    #include "wx/dcmemory.h"
+    #include "wx/settings.h"

 #endif // WX_PRECOMP
 
 #include <ctype.h>
 #endif // WX_PRECOMP
 
 #include <ctype.h>


@@ -1568,3 +1572,5 @@ const wxWX2MBbuf wx2stc(const wxString& str)
 }
 
 #endif
 }
 
 #endif

+
+#endif // wxUSE_STC

diff --git a/src/stc/ScintillaWX.cpp b/src/stc/ScintillaWX.cpp
index 1fdd2515c53209caf22c490644c1641792659eee..dfd62a5da8e88a23daabd4ccc431fb0af4bd68a7 100644 (file)
--- a/src/stc/ScintillaWX.cpp
+++ b/src/stc/ScintillaWX.cpp
@@ -21,8 +21,11 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_STC

 
 #ifndef WX_PRECOMP
 
 #ifndef WX_PRECOMP

+    #include "wx/scrolbar.h"
+    #include "wx/menu.h"

 #endif // WX_PRECOMP
 
 #include "wx/textbuf.h"
 #endif // WX_PRECOMP
 
 #include "wx/textbuf.h"


@@ -1143,3 +1146,5 @@ bool ScintillaWX::GetUseAntiAliasing() {
 
 //----------------------------------------------------------------------
 //----------------------------------------------------------------------
 
 //----------------------------------------------------------------------
 //----------------------------------------------------------------------

+
+#endif // wxUSE_STC

diff --git a/src/stc/stc.cpp b/src/stc/stc.cpp
index c7a5b60f890ff232a00282142568a051fa0c487f..5f72b1de7134bd152487d22b0651d47509b0e440 100644 (file)
--- a/src/stc/stc.cpp
+++ b/src/stc/stc.cpp
@@ -22,19 +22,21 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_STC
+
+#include "wx/stc/stc.h"

 
 #ifndef WX_PRECOMP
 
 #ifndef WX_PRECOMP

+    #include "wx/wx.h"

 #endif // WX_PRECOMP
 
 #include <ctype.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/tokenzr.h"
 #include "wx/mstream.h"
 #include "wx/image.h"
 #include "wx/file.h"
 

-#include "wx/stc/stc.h"

 #include "ScintillaWX.h"
 
 //----------------------------------------------------------------------
 #include "ScintillaWX.h"
 
 //----------------------------------------------------------------------


@@ -3433,11 +3435,4 @@ wxStyledTextEvent::wxStyledTextEvent(const wxStyledTextEvent& event):
 //----------------------------------------------------------------------
 //----------------------------------------------------------------------
 
 //----------------------------------------------------------------------
 //----------------------------------------------------------------------
 

-
-
-
-
-
-
-
-
+#endif // wxUSE_STC

diff --git a/src/stc/stc.cpp.in b/src/stc/stc.cpp.in
index e9f068b8e07c039d7f94564e61704cdd487380c4..592e6da131fda58cd00dedd231adecd199b02e4f 100644 (file)
--- a/src/stc/stc.cpp.in
+++ b/src/stc/stc.cpp.in
@@ -22,19 +22,21 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_STC
+
+#include "wx/stc/stc.h"

 
 #ifndef WX_PRECOMP
 
 #ifndef WX_PRECOMP

+    #include "wx/wx.h"

 #endif // WX_PRECOMP
 
 #include <ctype.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/tokenzr.h"
 #include "wx/mstream.h"
 #include "wx/image.h"
 #include "wx/file.h"
 

-#include "wx/stc/stc.h"

 #include "ScintillaWX.h"
 
 //----------------------------------------------------------------------
 #include "ScintillaWX.h"
 
 //----------------------------------------------------------------------


@@ -1071,11 +1073,4 @@ wxStyledTextEvent::wxStyledTextEvent(const wxStyledTextEvent& event):
 //----------------------------------------------------------------------
 //----------------------------------------------------------------------
 
 //----------------------------------------------------------------------
 //----------------------------------------------------------------------
 

-
-
-
-
-
-
-
-
+#endif // wxUSE_STC

diff --git a/src/stc/stc.h.in b/src/stc/stc.h.in
index 9dd1d5dfbdd2187d3ff12bbbc27245fb342bea8c..66686107c98f748e07d7278db418e6a5030a633f 100644 (file)
--- a/src/stc/stc.h.in
+++ b/src/stc/stc.h.in
@@ -20,10 +20,15 @@
 #ifndef __stc_h__
 #define __stc_h__
 
 #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/dnd.h"

+#include "wx/stopwatch.h"

 
 

+class WXDLLIMPEXP_CORE wxScrollBar;

 
 #ifdef WXMAKINGDLL_STC
     #define WXDLLIMPEXP_STC WXEXPORT
 
 #ifdef WXMAKINGDLL_STC
     #define WXDLLIMPEXP_STC WXEXPORT


@@ -539,4 +544,4 @@ inline const wxWX2MBbuf wx2stc(const wxString& str) {
 //----------------------------------------------------------------------
 #endif
 
 //----------------------------------------------------------------------
 #endif
 

-
+#endif // wxUSE_STC