X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0b9dfbc00e0251cdabc4c1a8d5c67bf28e8b28b2..3342663931cc6d203c1d2ded6da44a17347cb0e7:/include/wx/stc/stc.h

diff --git a/include/wx/stc/stc.h b/include/wx/stc/stc.h
index ab01bf1887..4512d0a592 100644
--- a/include/wx/stc/stc.h
+++ b/include/wx/stc/stc.h
@@ -24,6 +24,13 @@
 #include <wx/wx.h>
 #include <wx/dnd.h>
 
+//----------------------------------------------------------------------
+
+// Should a wxPopupWindow be used for the call tips and autocomplete windows?
+#ifndef wxSTC_USE_POPUP
+#define wxSTC_USE_POPUP 1
+#endif
+
 //----------------------------------------------------------------------
 // BEGIN generated section.  The following code is automatically generated
 //       by gen_iface.py.  Do not edit this file.  Edit stc.h.in instead
@@ -2024,6 +2031,39 @@ typedef void (wxEvtHandler::*wxStyledTextEventFunction)(wxStyledTextEvent&);
 #endif
 
 //----------------------------------------------------------------------
+// Utility functions used within wxSTC
+
+#ifndef SWIG
+
+inline wxString stc2wx(const char* str) {
+#if wxUSE_UNICODE
+    return wxString(str, wxConvUTF8);
+#else
+    return wxString(str);
+#endif
+}
+
+inline wxString stc2wx(const char* str, size_t len) {
+#if wxUSE_UNICODE
+    return wxString(str, wxConvUTF8, len);
+#else
+    return wxString(str, len);
+#endif
+}
+
+#if wxUSE_UNICODE
+inline const wxWX2MBbuf wx2stc(const wxString& str) {
+    return str.mb_str(wxConvUTF8);
+}
+#else
+inline const wxWX2MBbuf wx2stc(const wxString& str) {
+    return str.mbc_str();
+}
+#endif
+
+#endif
+
+
 //----------------------------------------------------------------------
 #endif