wxCheckListBox doesn't require wxUSE_OWNER_DRAWN when using WXUNIVERSAL

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

diff --git a/wxPython/src/_defs.i b/wxPython/src/_defs.i
index c372c37d7554a08373555f5e23bbf2a5f9288339..800002497aeab521fffeb44cbcc72f01115f597a 100644 (file)
--- a/wxPython/src/_defs.i
+++ b/wxPython/src/_defs.i
@@ -259,21 +259,6 @@ typedef unsigned long   wxUIntPtr;
     %enddef
 #endif
 
-#ifdef _DO_FULL_DOCS
-    %define RenameDocCtorStr(newname, docstr, details, decl)
-        %feature("docstring") decl docstr details;
-        %rename(newname) decl;
-        decl
-    %enddef
-#else
-    %define RenameDocCtorStr(newname, docstr, details, decl)
-        %feature("docstring") decl docstr;
-        %rename(newname) decl;
-        decl
-    %enddef
-#endif
-        
-
         
 // Set the autodoc string for a constructor decl and then define the decl too.
 // Must use the full declaration of the item.
@@ -425,7 +410,9 @@ enum {
     wxSTATIC_BORDER,
     wxTRANSPARENT_WINDOW,
     wxNO_BORDER,
-
+    wxDEFAULT_CONTROL_BORDER,
+    wxDEFAULT_STATUSBAR_STYLE,
+    
     wxTAB_TRAVERSAL,
     wxWANTS_CHARS,
     wxPOPUP_WINDOW,
@@ -690,13 +677,6 @@ enum {
 };
 
 
-#ifdef __WXGTK__
-#define wxDEFAULT_STATUSBAR_STYLE wxST_SIZEGRIP|wxFULL_REPAINT_ON_RESIZE
-#else
-#define wxDEFAULT_STATUSBAR_STYLE wxST_SIZEGRIP
-#endif
-
-
 
 enum wxGeometryCentre
 {
@@ -805,6 +785,8 @@ enum {
   wxUSER_DASH,
   wxTRANSPARENT,
   wxSTIPPLE,
+  wxSTIPPLE_MASK,
+  wxSTIPPLE_MASK_OPAQUE,
   wxBDIAGONAL_HATCH,
   wxCROSSDIAG_HATCH,
   wxFDIAGONAL_HATCH,