Fixed some warnings in wxSTC

[wxWidgets.git] / wxPython / src / _defs.i

diff --git a/wxPython/src/_defs.i b/wxPython/src/_defs.i
index 1d29d12cedd43365efda2f3631b7fa15fc9022bd..4e393463b1cf0a1c3b6e7a6d6d02fdbb95ff598b 100644 (file)
--- a/wxPython/src/_defs.i
+++ b/wxPython/src/_defs.i
@@ -184,7 +184,6 @@ enum {
     wxBORDER,
     wxSIMPLE_BORDER,
     wxSTATIC_BORDER,
     wxBORDER,
     wxSIMPLE_BORDER,
     wxSTATIC_BORDER,

-    wxBORDER_MASK,

     wxTRANSPARENT_WINDOW,
     wxNO_BORDER,
     wxUSER_COLOURS,
     wxTRANSPARENT_WINDOW,
     wxNO_BORDER,
     wxUSER_COLOURS,


@@ -265,16 +264,19 @@ enum {
     wxPROCESS_ENTER,
     wxPASSWORD,
 
     wxPROCESS_ENTER,
     wxPASSWORD,
 

-    wxTE_PROCESS_ENTER,
-    wxTE_PROCESS_TAB,
-    wxTE_PASSWORD,

     wxTE_READONLY,
     wxTE_READONLY,

-    wxTE_RICH,

     wxTE_MULTILINE,
     wxTE_MULTILINE,

-    wxTE_AUTO_SCROLL,
+    wxTE_PROCESS_TAB,
+    wxTE_RICH,

     wxTE_NO_VSCROLL,
     wxTE_NO_VSCROLL,

+    wxTE_AUTO_SCROLL,
+    wxTE_PROCESS_ENTER,
+    wxTE_PASSWORD,

     wxTE_AUTO_URL,
     wxTE_NOHIDESEL,
     wxTE_AUTO_URL,
     wxTE_NOHIDESEL,

+    wxTE_DONTWRAP,
+    wxTE_LINEWRAP,
+    wxTE_WORDWRAP,

 
     wxCB_SIMPLE,
     wxCB_DROPDOWN,
 
     wxCB_SIMPLE,
     wxCB_DROPDOWN,


@@ -489,6 +491,19 @@ enum {
 };
 
 
 };
 
 

+enum wxBorder
+{
+    wxBORDER_DEFAULT,
+    wxBORDER_NONE,
+    wxBORDER_STATIC,
+    wxBORDER_SIMPLE,
+    wxBORDER_RAISED,
+    wxBORDER_SUNKEN,
+    wxBORDER_DOUBLE,
+    wxBORDER_MASK,
+};
+
+

 //  // Standard error codes
 //  enum  ErrCode
 //  {
 //  // Standard error codes
 //  enum  ErrCode
 //  {


@@ -871,6 +886,7 @@ enum wxEventType {
  wxEVT_COMMAND_TOOL_ENTER,
  wxEVT_SET_FOCUS,
  wxEVT_KILL_FOCUS,
  wxEVT_COMMAND_TOOL_ENTER,
  wxEVT_SET_FOCUS,
  wxEVT_KILL_FOCUS,

+ wxEVT_CHILD_FOCUS,

  wxEVT_MOUSEWHEEL,
 
 /* Mouse event types */
  wxEVT_MOUSEWHEEL,
 
 /* Mouse event types */