Don't do the wx cleanup if wxPython didn't do the initialization.

[wxWidgets.git] / src / stc / stc.h.in

diff --git a/src/stc/stc.h.in b/src/stc/stc.h.in
index 7865f8410604e35b36413fc02a1924abab1cea21..f7b01cb837257df98e527e0a1cc98e880a46087b 100644 (file)
--- a/src/stc/stc.h.in
+++ b/src/stc/stc.h.in
@@ -32,13 +32,6 @@
 %(VALUES)s
 
 // END of generated section
 %(VALUES)s
 
 // END of generated section

-//----------------------------------------------------------------------
-// Others
-
-#define wxSTC_MASK_FOLDERS ((1 << wxSTC_MARKNUM_FOLDER) | (1 << wxSTC_MARKNUM_FOLDEROPEN))
-
-
-

 //----------------------------------------------------------------------
 
 class  ScintillaWX;                      // forward declare
 //----------------------------------------------------------------------
 
 class  ScintillaWX;                      // forward declare


@@ -57,7 +50,7 @@ public:
     wxStyledTextCtrl(wxWindow *parent, wxWindowID id,
                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize, long style = 0,
     wxStyledTextCtrl(wxWindow *parent, wxWindowID id,
                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize, long style = 0,

-                     const char* name = "styledtext");
+                     const wxString& name = wxPySTCNameStr);

     %%pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
 
 #else
     %%pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
 
 #else


@@ -156,6 +149,11 @@ public:
     // Set the horizontal scrollbar to use instead of the ont that's built-in.
     void SetHScrollBar(wxScrollBar* bar) { m_hScrollBar = bar; }
 
     // Set the horizontal scrollbar to use instead of the ont that's built-in.
     void SetHScrollBar(wxScrollBar* bar) { m_hScrollBar = bar; }
 

+    // Can be used to prevent the EVT_CHAR handler from adding the char
+    bool GetLastKeydownProcessed() { return m_lastKeyDownConsumed; }
+    void SetLastKeydownProcessed(bool val) { m_lastKeyDownConsumed = val; }
+
+

 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------
 
 


@@ -217,7 +215,7 @@ public:
     void SetKey(int k)                    { m_key = k; }
     void SetModifiers(int m)              { m_modifiers = m; }
     void SetModificationType(int t)       { m_modificationType = t; }
     void SetKey(int k)                    { m_key = k; }
     void SetModifiers(int m)              { m_modifiers = m; }
     void SetModificationType(int t)       { m_modificationType = t; }

-    void SetText(const char* t)           { m_text = t; }
+    void SetText(const wxString& t)       { m_text = t; }

     void SetLength(int len)               { m_length = len; }
     void SetLinesAdded(int num)           { m_linesAdded = num; }
     void SetLine(int val)                 { m_line = val; }
     void SetLength(int len)               { m_length = len; }
     void SetLinesAdded(int num)           { m_linesAdded = num; }
     void SetLine(int val)                 { m_line = val; }