don't treat changing focus to popup's child as loosing it

[wxWidgets.git] / wxPython / src / msw / controls.py

diff --git a/wxPython/src/msw/controls.py b/wxPython/src/msw/controls.py
index 3e6a27009705808b7b15eb97b0840cd7922d6741..2e769952d82ef91fb7b92a02c00aa1168d6d8782 100644 (file)
--- a/wxPython/src/msw/controls.py
+++ b/wxPython/src/msw/controls.py
@@ -15,6 +15,9 @@ class wxControlPtr(wxWindowPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

+    def Create(self, *_args, **_kwargs):
+        val = apply(controlsc.wxControl_Create,(self,) + _args, _kwargs)
+        return val

     def Command(self, *_args, **_kwargs):
         val = apply(controlsc.wxControl_Command,(self,) + _args, _kwargs)
         return val
     def Command(self, *_args, **_kwargs):
         val = apply(controlsc.wxControl_Command,(self,) + _args, _kwargs)
         return val


@@ -30,7 +33,63 @@ class wxControl(wxControlPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controlsc.new_wxControl,_args,_kwargs)
         self.thisown = 1
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controlsc.new_wxControl,_args,_kwargs)
         self.thisown = 1

-        #wx._StdWindowCallbacks(self)
+        self._setOORInfo(self)
+
+
+
+def wxPreControl(*_args,**_kwargs):
+    val = wxControlPtr(apply(controlsc.new_wxPreControl,_args,_kwargs))
+    val.thisown = 1
+    val._setOORInfo(val)
+    return val
+
+
+class wxControlWithItemsPtr(wxControlPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def Delete(self, *_args, **_kwargs):
+        val = apply(controlsc.wxControlWithItems_Delete,(self,) + _args, _kwargs)
+        return val
+    def GetCount(self, *_args, **_kwargs):
+        val = apply(controlsc.wxControlWithItems_GetCount,(self,) + _args, _kwargs)
+        return val
+    def GetString(self, *_args, **_kwargs):
+        val = apply(controlsc.wxControlWithItems_GetString,(self,) + _args, _kwargs)
+        return val
+    def SetString(self, *_args, **_kwargs):
+        val = apply(controlsc.wxControlWithItems_SetString,(self,) + _args, _kwargs)
+        return val
+    def FindString(self, *_args, **_kwargs):
+        val = apply(controlsc.wxControlWithItems_FindString,(self,) + _args, _kwargs)
+        return val
+    def Select(self, *_args, **_kwargs):
+        val = apply(controlsc.wxControlWithItems_Select,(self,) + _args, _kwargs)
+        return val
+    def GetSelection(self, *_args, **_kwargs):
+        val = apply(controlsc.wxControlWithItems_GetSelection,(self,) + _args, _kwargs)
+        return val
+    def GetStringSelection(self, *_args, **_kwargs):
+        val = apply(controlsc.wxControlWithItems_GetStringSelection,(self,) + _args, _kwargs)
+        return val
+    def Append(self, *_args, **_kwargs):
+        val = apply(controlsc.wxControlWithItems_Append,(self,) + _args, _kwargs)
+        return val
+    def GetClientData(self, *_args, **_kwargs):
+        val = apply(controlsc.wxControlWithItems_GetClientData,(self,) + _args, _kwargs)
+        return val
+    def SetClientData(self, *_args, **_kwargs):
+        val = apply(controlsc.wxControlWithItems_SetClientData,(self,) + _args, _kwargs)
+        return val
+    def AppendItems(self, *_args, **_kwargs):
+        val = apply(controlsc.wxControlWithItems_AppendItems,(self,) + _args, _kwargs)
+        return val
+    def __repr__(self):
+        return "<C wxControlWithItems instance at %s>" % (self.this,)
+    Number = GetCount
+class wxControlWithItems(wxControlWithItemsPtr):
+    def __init__(self,this):
+        self.this = this

 
 
 
 
 
 


@@ -39,6 +98,9 @@ class wxButtonPtr(wxControlPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

+    def Create(self, *_args, **_kwargs):
+        val = apply(controlsc.wxButton_Create,(self,) + _args, _kwargs)
+        return val

     def SetDefault(self, *_args, **_kwargs):
         val = apply(controlsc.wxButton_SetDefault,(self,) + _args, _kwargs)
         return val
     def SetDefault(self, *_args, **_kwargs):
         val = apply(controlsc.wxButton_SetDefault,(self,) + _args, _kwargs)
         return val


@@ -48,36 +110,51 @@ class wxButtonPtr(wxControlPtr):
     def SetForegroundColour(self, *_args, **_kwargs):
         val = apply(controlsc.wxButton_SetForegroundColour,(self,) + _args, _kwargs)
         return val
     def SetForegroundColour(self, *_args, **_kwargs):
         val = apply(controlsc.wxButton_SetForegroundColour,(self,) + _args, _kwargs)
         return val

+    def SetImageLabel(self, *_args, **_kwargs):
+        val = apply(controlsc.wxButton_SetImageLabel,(self,) + _args, _kwargs)
+        return val
+    def SetImageMargins(self, *_args, **_kwargs):
+        val = apply(controlsc.wxButton_SetImageMargins,(self,) + _args, _kwargs)
+        return val

     def __repr__(self):
         return "<C wxButton instance at %s>" % (self.this,)
 class wxButton(wxButtonPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controlsc.new_wxButton,_args,_kwargs)
         self.thisown = 1
     def __repr__(self):
         return "<C wxButton instance at %s>" % (self.this,)
 class wxButton(wxButtonPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controlsc.new_wxButton,_args,_kwargs)
         self.thisown = 1

-        #wx._StdWindowCallbacks(self)
+        self._setOORInfo(self)
+

 
 
 
 

+def wxPreButton(*_args,**_kwargs):
+    val = wxButtonPtr(apply(controlsc.new_wxPreButton,_args,_kwargs))
+    val.thisown = 1
+    val._setOORInfo(val)
+    return val

 
 
 class wxBitmapButtonPtr(wxButtonPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
 
 
 class wxBitmapButtonPtr(wxButtonPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0

+    def Create(self, *_args, **_kwargs):
+        val = apply(controlsc.wxBitmapButton_Create,(self,) + _args, _kwargs)
+        return val

     def GetBitmapLabel(self, *_args, **_kwargs):
         val = apply(controlsc.wxBitmapButton_GetBitmapLabel,(self,) + _args, _kwargs)
     def GetBitmapLabel(self, *_args, **_kwargs):
         val = apply(controlsc.wxBitmapButton_GetBitmapLabel,(self,) + _args, _kwargs)

-        if val: val = wxBitmapPtr(val) 
+        if val: val = wxBitmapPtr(val) ; val.thisown = 1

         return val
     def GetBitmapDisabled(self, *_args, **_kwargs):
         val = apply(controlsc.wxBitmapButton_GetBitmapDisabled,(self,) + _args, _kwargs)
         return val
     def GetBitmapDisabled(self, *_args, **_kwargs):
         val = apply(controlsc.wxBitmapButton_GetBitmapDisabled,(self,) + _args, _kwargs)

-        if val: val = wxBitmapPtr(val) 
+        if val: val = wxBitmapPtr(val) ; val.thisown = 1

         return val
     def GetBitmapFocus(self, *_args, **_kwargs):
         val = apply(controlsc.wxBitmapButton_GetBitmapFocus,(self,) + _args, _kwargs)
         return val
     def GetBitmapFocus(self, *_args, **_kwargs):
         val = apply(controlsc.wxBitmapButton_GetBitmapFocus,(self,) + _args, _kwargs)

-        if val: val = wxBitmapPtr(val) 
+        if val: val = wxBitmapPtr(val) ; val.thisown = 1

         return val
     def GetBitmapSelected(self, *_args, **_kwargs):
         val = apply(controlsc.wxBitmapButton_GetBitmapSelected,(self,) + _args, _kwargs)
         return val
     def GetBitmapSelected(self, *_args, **_kwargs):
         val = apply(controlsc.wxBitmapButton_GetBitmapSelected,(self,) + _args, _kwargs)

-        if val: val = wxBitmapPtr(val) 
+        if val: val = wxBitmapPtr(val) ; val.thisown = 1

         return val
     def SetBitmapDisabled(self, *_args, **_kwargs):
         val = apply(controlsc.wxBitmapButton_SetBitmapDisabled,(self,) + _args, _kwargs)
         return val
     def SetBitmapDisabled(self, *_args, **_kwargs):
         val = apply(controlsc.wxBitmapButton_SetBitmapDisabled,(self,) + _args, _kwargs)


@@ -106,15 +183,24 @@ class wxBitmapButton(wxBitmapButtonPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controlsc.new_wxBitmapButton,_args,_kwargs)
         self.thisown = 1
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controlsc.new_wxBitmapButton,_args,_kwargs)
         self.thisown = 1

-        #wx._StdWindowCallbacks(self)
+        self._setOORInfo(self)

 
 
 
 
 
 

+def wxPreBitmapButton(*_args,**_kwargs):
+    val = wxBitmapButtonPtr(apply(controlsc.new_wxPreBitmapButton,_args,_kwargs))
+    val.thisown = 1
+    val._setOORInfo(val)
+    return val
+

 
 class wxCheckBoxPtr(wxControlPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
 
 class wxCheckBoxPtr(wxControlPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0

+    def Create(self, *_args, **_kwargs):
+        val = apply(controlsc.wxCheckBox_Create,(self,) + _args, _kwargs)
+        return val

     def GetValue(self, *_args, **_kwargs):
         val = apply(controlsc.wxCheckBox_GetValue,(self,) + _args, _kwargs)
         return val
     def GetValue(self, *_args, **_kwargs):
         val = apply(controlsc.wxCheckBox_GetValue,(self,) + _args, _kwargs)
         return val


@@ -127,39 +213,30 @@ class wxCheckBox(wxCheckBoxPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controlsc.new_wxCheckBox,_args,_kwargs)
         self.thisown = 1
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controlsc.new_wxCheckBox,_args,_kwargs)
         self.thisown = 1

-        #wx._StdWindowCallbacks(self)
+        self._setOORInfo(self)

 
 
 
 
 
 

+def wxPreCheckBox(*_args,**_kwargs):
+    val = wxCheckBoxPtr(apply(controlsc.new_wxPreCheckBox,_args,_kwargs))
+    val.thisown = 1
+    val._setOORInfo(val)
+    return val
+

 
 

-class wxChoicePtr(wxControlPtr):
+class wxChoicePtr(wxControlWithItemsPtr):

     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def Append(self, *_args, **_kwargs):
-        val = apply(controlsc.wxChoice_Append,(self,) + _args, _kwargs)
+    def Create(self, *_args, **_kwargs):
+        val = apply(controlsc.wxChoice_Create,(self,) + _args, _kwargs)

         return val
     def Clear(self, *_args, **_kwargs):
         val = apply(controlsc.wxChoice_Clear,(self,) + _args, _kwargs)
         return val
         return val
     def Clear(self, *_args, **_kwargs):
         val = apply(controlsc.wxChoice_Clear,(self,) + _args, _kwargs)
         return val

-    def FindString(self, *_args, **_kwargs):
-        val = apply(controlsc.wxChoice_FindString,(self,) + _args, _kwargs)
-        return val

     def GetColumns(self, *_args, **_kwargs):
         val = apply(controlsc.wxChoice_GetColumns,(self,) + _args, _kwargs)
         return val
     def GetColumns(self, *_args, **_kwargs):
         val = apply(controlsc.wxChoice_GetColumns,(self,) + _args, _kwargs)
         return val

-    def GetSelection(self, *_args, **_kwargs):
-        val = apply(controlsc.wxChoice_GetSelection,(self,) + _args, _kwargs)
-        return val
-    def GetString(self, *_args, **_kwargs):
-        val = apply(controlsc.wxChoice_GetString,(self,) + _args, _kwargs)
-        return val
-    def GetStringSelection(self, *_args, **_kwargs):
-        val = apply(controlsc.wxChoice_GetStringSelection,(self,) + _args, _kwargs)
-        return val
-    def Number(self, *_args, **_kwargs):
-        val = apply(controlsc.wxChoice_Number,(self,) + _args, _kwargs)
-        return val

     def SetColumns(self, *_args, **_kwargs):
         val = apply(controlsc.wxChoice_SetColumns,(self,) + _args, _kwargs)
         return val
     def SetColumns(self, *_args, **_kwargs):
         val = apply(controlsc.wxChoice_SetColumns,(self,) + _args, _kwargs)
         return val


@@ -169,26 +246,35 @@ class wxChoicePtr(wxControlPtr):
     def SetStringSelection(self, *_args, **_kwargs):
         val = apply(controlsc.wxChoice_SetStringSelection,(self,) + _args, _kwargs)
         return val
     def SetStringSelection(self, *_args, **_kwargs):
         val = apply(controlsc.wxChoice_SetStringSelection,(self,) + _args, _kwargs)
         return val

+    def SetString(self, *_args, **_kwargs):
+        val = apply(controlsc.wxChoice_SetString,(self,) + _args, _kwargs)
+        return val

     def __repr__(self):
         return "<C wxChoice instance at %s>" % (self.this,)
     def __repr__(self):
         return "<C wxChoice instance at %s>" % (self.this,)

+    
+    Select = SetSelection
+    

 class wxChoice(wxChoicePtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controlsc.new_wxChoice,_args,_kwargs)
         self.thisown = 1
 class wxChoice(wxChoicePtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controlsc.new_wxChoice,_args,_kwargs)
         self.thisown = 1

-        #wx._StdWindowCallbacks(self)
+        self._setOORInfo(self)

 
 
 
 
 
 

+def wxPreChoice(*_args,**_kwargs):
+    val = wxChoicePtr(apply(controlsc.new_wxPreChoice,_args,_kwargs))
+    val.thisown = 1
+    val._setOORInfo(val)
+    return val
+

 
 class wxComboBoxPtr(wxChoicePtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
 
 class wxComboBoxPtr(wxChoicePtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def Append(self, *_args, **_kwargs):
-        val = apply(controlsc.wxComboBox_Append,(self,) + _args, _kwargs)
-        return val
-    def Clear(self, *_args, **_kwargs):
-        val = apply(controlsc.wxComboBox_Clear,(self,) + _args, _kwargs)
+    def Create(self, *_args, **_kwargs):
+        val = apply(controlsc.wxComboBox_Create,(self,) + _args, _kwargs)

         return val
     def Copy(self, *_args, **_kwargs):
         val = apply(controlsc.wxComboBox_Copy,(self,) + _args, _kwargs)
         return val
     def Copy(self, *_args, **_kwargs):
         val = apply(controlsc.wxComboBox_Copy,(self,) + _args, _kwargs)


@@ -196,33 +282,15 @@ class wxComboBoxPtr(wxChoicePtr):
     def Cut(self, *_args, **_kwargs):
         val = apply(controlsc.wxComboBox_Cut,(self,) + _args, _kwargs)
         return val
     def Cut(self, *_args, **_kwargs):
         val = apply(controlsc.wxComboBox_Cut,(self,) + _args, _kwargs)
         return val

-    def Delete(self, *_args, **_kwargs):
-        val = apply(controlsc.wxComboBox_Delete,(self,) + _args, _kwargs)
-        return val
-    def FindString(self, *_args, **_kwargs):
-        val = apply(controlsc.wxComboBox_FindString,(self,) + _args, _kwargs)
-        return val

     def GetInsertionPoint(self, *_args, **_kwargs):
         val = apply(controlsc.wxComboBox_GetInsertionPoint,(self,) + _args, _kwargs)
         return val
     def GetLastPosition(self, *_args, **_kwargs):
         val = apply(controlsc.wxComboBox_GetLastPosition,(self,) + _args, _kwargs)
         return val
     def GetInsertionPoint(self, *_args, **_kwargs):
         val = apply(controlsc.wxComboBox_GetInsertionPoint,(self,) + _args, _kwargs)
         return val
     def GetLastPosition(self, *_args, **_kwargs):
         val = apply(controlsc.wxComboBox_GetLastPosition,(self,) + _args, _kwargs)
         return val

-    def GetSelection(self, *_args, **_kwargs):
-        val = apply(controlsc.wxComboBox_GetSelection,(self,) + _args, _kwargs)
-        return val
-    def GetString(self, *_args, **_kwargs):
-        val = apply(controlsc.wxComboBox_GetString,(self,) + _args, _kwargs)
-        return val
-    def GetStringSelection(self, *_args, **_kwargs):
-        val = apply(controlsc.wxComboBox_GetStringSelection,(self,) + _args, _kwargs)
-        return val

     def GetValue(self, *_args, **_kwargs):
         val = apply(controlsc.wxComboBox_GetValue,(self,) + _args, _kwargs)
         return val
     def GetValue(self, *_args, **_kwargs):
         val = apply(controlsc.wxComboBox_GetValue,(self,) + _args, _kwargs)
         return val

-    def Number(self, *_args, **_kwargs):
-        val = apply(controlsc.wxComboBox_Number,(self,) + _args, _kwargs)
-        return val

     def Paste(self, *_args, **_kwargs):
         val = apply(controlsc.wxComboBox_Paste,(self,) + _args, _kwargs)
         return val
     def Paste(self, *_args, **_kwargs):
         val = apply(controlsc.wxComboBox_Paste,(self,) + _args, _kwargs)
         return val


@@ -247,21 +315,33 @@ class wxComboBoxPtr(wxChoicePtr):
     def SetValue(self, *_args, **_kwargs):
         val = apply(controlsc.wxComboBox_SetValue,(self,) + _args, _kwargs)
         return val
     def SetValue(self, *_args, **_kwargs):
         val = apply(controlsc.wxComboBox_SetValue,(self,) + _args, _kwargs)
         return val

+    def SetEditable(self, *_args, **_kwargs):
+        val = apply(controlsc.wxComboBox_SetEditable,(self,) + _args, _kwargs)
+        return val

     def __repr__(self):
         return "<C wxComboBox instance at %s>" % (self.this,)
 class wxComboBox(wxComboBoxPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controlsc.new_wxComboBox,_args,_kwargs)
         self.thisown = 1
     def __repr__(self):
         return "<C wxComboBox instance at %s>" % (self.this,)
 class wxComboBox(wxComboBoxPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controlsc.new_wxComboBox,_args,_kwargs)
         self.thisown = 1

-        #wx._StdWindowCallbacks(self)
+        self._setOORInfo(self)
+

 
 
 
 

+def wxPreComboBox(*_args,**_kwargs):
+    val = wxComboBoxPtr(apply(controlsc.new_wxPreComboBox,_args,_kwargs))
+    val.thisown = 1
+    val._setOORInfo(val)
+    return val

 
 
 class wxGaugePtr(wxControlPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
 
 
 class wxGaugePtr(wxControlPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0

+    def Create(self, *_args, **_kwargs):
+        val = apply(controlsc.wxGauge_Create,(self,) + _args, _kwargs)
+        return val

     def GetBezelFace(self, *_args, **_kwargs):
         val = apply(controlsc.wxGauge_GetBezelFace,(self,) + _args, _kwargs)
         return val
     def GetBezelFace(self, *_args, **_kwargs):
         val = apply(controlsc.wxGauge_GetBezelFace,(self,) + _args, _kwargs)
         return val


@@ -292,43 +372,72 @@ class wxGauge(wxGaugePtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controlsc.new_wxGauge,_args,_kwargs)
         self.thisown = 1
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controlsc.new_wxGauge,_args,_kwargs)
         self.thisown = 1

-        #wx._StdWindowCallbacks(self)
+        self._setOORInfo(self)

 
 
 
 
 
 

+def wxPreGauge(*_args,**_kwargs):
+    val = wxGaugePtr(apply(controlsc.new_wxPreGauge,_args,_kwargs))
+    val.thisown = 1
+    val._setOORInfo(val)
+    return val
+

 
 class wxStaticBoxPtr(wxControlPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
 
 class wxStaticBoxPtr(wxControlPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0

+    def Create(self, *_args, **_kwargs):
+        val = apply(controlsc.wxStaticBox_Create,(self,) + _args, _kwargs)
+        return val

     def __repr__(self):
         return "<C wxStaticBox instance at %s>" % (self.this,)
 class wxStaticBox(wxStaticBoxPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controlsc.new_wxStaticBox,_args,_kwargs)
         self.thisown = 1
     def __repr__(self):
         return "<C wxStaticBox instance at %s>" % (self.this,)
 class wxStaticBox(wxStaticBoxPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controlsc.new_wxStaticBox,_args,_kwargs)
         self.thisown = 1

+        self._setOORInfo(self)

 
 
 
 
 
 

+def wxPreStaticBox(*_args,**_kwargs):
+    val = wxStaticBoxPtr(apply(controlsc.new_wxPreStaticBox,_args,_kwargs))
+    val.thisown = 1
+    val._setOORInfo(val)
+    return val
+

 
 class wxStaticLinePtr(wxControlPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
 
 class wxStaticLinePtr(wxControlPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0

+    def Create(self, *_args, **_kwargs):
+        val = apply(controlsc.wxStaticLine_Create,(self,) + _args, _kwargs)
+        return val

     def __repr__(self):
         return "<C wxStaticLine instance at %s>" % (self.this,)
 class wxStaticLine(wxStaticLinePtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controlsc.new_wxStaticLine,_args,_kwargs)
         self.thisown = 1
     def __repr__(self):
         return "<C wxStaticLine instance at %s>" % (self.this,)
 class wxStaticLine(wxStaticLinePtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controlsc.new_wxStaticLine,_args,_kwargs)
         self.thisown = 1

+        self._setOORInfo(self)
+

 
 
 
 

+def wxPreStaticLine(*_args,**_kwargs):
+    val = wxStaticLinePtr(apply(controlsc.new_wxPreStaticLine,_args,_kwargs))
+    val.thisown = 1
+    val._setOORInfo(val)
+    return val

 
 
 class wxStaticTextPtr(wxControlPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
 
 
 class wxStaticTextPtr(wxControlPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0

+    def Create(self, *_args, **_kwargs):
+        val = apply(controlsc.wxStaticText_Create,(self,) + _args, _kwargs)
+        return val

     def GetLabel(self, *_args, **_kwargs):
         val = apply(controlsc.wxStaticText_GetLabel,(self,) + _args, _kwargs)
         return val
     def GetLabel(self, *_args, **_kwargs):
         val = apply(controlsc.wxStaticText_GetLabel,(self,) + _args, _kwargs)
         return val


@@ -341,47 +450,38 @@ class wxStaticText(wxStaticTextPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controlsc.new_wxStaticText,_args,_kwargs)
         self.thisown = 1
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controlsc.new_wxStaticText,_args,_kwargs)
         self.thisown = 1

-        #wx._StdWindowCallbacks(self)
+        self._setOORInfo(self)

 
 
 
 
 
 

+def wxPreStaticText(*_args,**_kwargs):
+    val = wxStaticTextPtr(apply(controlsc.new_wxPreStaticText,_args,_kwargs))
+    val.thisown = 1
+    val._setOORInfo(val)
+    return val

 
 

-class wxListBoxPtr(wxControlPtr):
+
+class wxListBoxPtr(wxControlWithItemsPtr):

     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def Append(self, *_args, **_kwargs):
-        val = apply(controlsc.wxListBox_Append,(self,) + _args, _kwargs)
+    def Create(self, *_args, **_kwargs):
+        val = apply(controlsc.wxListBox_Create,(self,) + _args, _kwargs)

         return val
     def Clear(self, *_args, **_kwargs):
         val = apply(controlsc.wxListBox_Clear,(self,) + _args, _kwargs)
         return val
         return val
     def Clear(self, *_args, **_kwargs):
         val = apply(controlsc.wxListBox_Clear,(self,) + _args, _kwargs)
         return val

-    def Delete(self, *_args, **_kwargs):
-        val = apply(controlsc.wxListBox_Delete,(self,) + _args, _kwargs)
-        return val

     def Deselect(self, *_args, **_kwargs):
         val = apply(controlsc.wxListBox_Deselect,(self,) + _args, _kwargs)
         return val
     def Deselect(self, *_args, **_kwargs):
         val = apply(controlsc.wxListBox_Deselect,(self,) + _args, _kwargs)
         return val

-    def FindString(self, *_args, **_kwargs):
-        val = apply(controlsc.wxListBox_FindString,(self,) + _args, _kwargs)
-        return val
-    def GetSelection(self, *_args, **_kwargs):
-        val = apply(controlsc.wxListBox_GetSelection,(self,) + _args, _kwargs)
-        return val

     def GetSelections(self, *_args, **_kwargs):
         val = apply(controlsc.wxListBox_GetSelections,(self,) + _args, _kwargs)
         return val
     def InsertItems(self, *_args, **_kwargs):
         val = apply(controlsc.wxListBox_InsertItems,(self,) + _args, _kwargs)
         return val
     def GetSelections(self, *_args, **_kwargs):
         val = apply(controlsc.wxListBox_GetSelections,(self,) + _args, _kwargs)
         return val
     def InsertItems(self, *_args, **_kwargs):
         val = apply(controlsc.wxListBox_InsertItems,(self,) + _args, _kwargs)
         return val

-    def GetString(self, *_args, **_kwargs):
-        val = apply(controlsc.wxListBox_GetString,(self,) + _args, _kwargs)
-        return val
-    def GetStringSelection(self, *_args, **_kwargs):
-        val = apply(controlsc.wxListBox_GetStringSelection,(self,) + _args, _kwargs)
-        return val
-    def Number(self, *_args, **_kwargs):
-        val = apply(controlsc.wxListBox_Number,(self,) + _args, _kwargs)
+    def IsSelected(self, *_args, **_kwargs):
+        val = apply(controlsc.wxListBox_IsSelected,(self,) + _args, _kwargs)

         return val
     def Selected(self, *_args, **_kwargs):
         val = apply(controlsc.wxListBox_Selected,(self,) + _args, _kwargs)
         return val
     def Selected(self, *_args, **_kwargs):
         val = apply(controlsc.wxListBox_Selected,(self,) + _args, _kwargs)


@@ -410,15 +510,24 @@ class wxListBox(wxListBoxPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controlsc.new_wxListBox,_args,_kwargs)
         self.thisown = 1
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controlsc.new_wxListBox,_args,_kwargs)
         self.thisown = 1

-        #wx._StdWindowCallbacks(self)
+        self._setOORInfo(self)

 
 
 
 
 
 

+def wxPreListBox(*_args,**_kwargs):
+    val = wxListBoxPtr(apply(controlsc.new_wxPreListBox,_args,_kwargs))
+    val.thisown = 1
+    val._setOORInfo(val)
+    return val
+

 
 class wxCheckListBoxPtr(wxListBoxPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
 
 class wxCheckListBoxPtr(wxListBoxPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0

+    def Create(self, *_args, **_kwargs):
+        val = apply(controlsc.wxCheckListBox_Create,(self,) + _args, _kwargs)
+        return val

     def IsChecked(self, *_args, **_kwargs):
         val = apply(controlsc.wxCheckListBox_IsChecked,(self,) + _args, _kwargs)
         return val
     def IsChecked(self, *_args, **_kwargs):
         val = apply(controlsc.wxCheckListBox_IsChecked,(self,) + _args, _kwargs)
         return val


@@ -437,32 +546,82 @@ class wxCheckListBox(wxCheckListBoxPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controlsc.new_wxCheckListBox,_args,_kwargs)
         self.thisown = 1
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controlsc.new_wxCheckListBox,_args,_kwargs)
         self.thisown = 1

-        #wx._StdWindowCallbacks(self)
+        self._setOORInfo(self)

 
 
 
 
 
 

+def wxPreCheckListBox(*_args,**_kwargs):
+    val = wxCheckListBoxPtr(apply(controlsc.new_wxPreCheckListBox,_args,_kwargs))
+    val.thisown = 1
+    val._setOORInfo(val)
+    return val

 
 

-class wxTextCtrlPtr(wxControlPtr):
+
+class wxTextAttrPtr :

     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def Clear(self, *_args, **_kwargs):
-        val = apply(controlsc.wxTextCtrl_Clear,(self,) + _args, _kwargs)
+    def __del__(self,controlsc=controlsc):
+        if self.thisown == 1 :
+            controlsc.delete_wxTextAttr(self)
+    def SetTextColour(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextAttr_SetTextColour,(self,) + _args, _kwargs)

         return val
         return val

-    def Copy(self, *_args, **_kwargs):
-        val = apply(controlsc.wxTextCtrl_Copy,(self,) + _args, _kwargs)
+    def SetBackgroundColour(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextAttr_SetBackgroundColour,(self,) + _args, _kwargs)

         return val
         return val

-    def Cut(self, *_args, **_kwargs):
-        val = apply(controlsc.wxTextCtrl_Cut,(self,) + _args, _kwargs)
+    def SetFont(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextAttr_SetFont,(self,) + _args, _kwargs)

         return val
         return val

-    def DiscardEdits(self, *_args, **_kwargs):
-        val = apply(controlsc.wxTextCtrl_DiscardEdits,(self,) + _args, _kwargs)
+    def HasTextColour(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextAttr_HasTextColour,(self,) + _args, _kwargs)

         return val
         return val

-    def GetInsertionPoint(self, *_args, **_kwargs):
-        val = apply(controlsc.wxTextCtrl_GetInsertionPoint,(self,) + _args, _kwargs)
+    def HasBackgroundColour(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextAttr_HasBackgroundColour,(self,) + _args, _kwargs)

         return val
         return val

-    def GetLastPosition(self, *_args, **_kwargs):
-        val = apply(controlsc.wxTextCtrl_GetLastPosition,(self,) + _args, _kwargs)
+    def HasFont(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextAttr_HasFont,(self,) + _args, _kwargs)
+        return val
+    def GetTextColour(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextAttr_GetTextColour,(self,) + _args, _kwargs)
+        if val: val = wxColourPtr(val) ; val.thisown = 1
+        return val
+    def GetBackgroundColour(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextAttr_GetBackgroundColour,(self,) + _args, _kwargs)
+        if val: val = wxColourPtr(val) ; val.thisown = 1
+        return val
+    def GetFont(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextAttr_GetFont,(self,) + _args, _kwargs)
+        if val: val = wxFontPtr(val) ; val.thisown = 1
+        return val
+    def IsDefault(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextAttr_IsDefault,(self,) + _args, _kwargs)
+        return val
+    def __repr__(self):
+        return "<C wxTextAttr instance at %s>" % (self.this,)
+class wxTextAttr(wxTextAttrPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(controlsc.new_wxTextAttr,_args,_kwargs)
+        self.thisown = 1
+
+
+
+
+class wxTextCtrlPtr(wxControlPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def Create(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_Create,(self,) + _args, _kwargs)
+        return val
+    def GetValue(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_GetValue,(self,) + _args, _kwargs)
+        return val
+    def SetValue(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_SetValue,(self,) + _args, _kwargs)
+        return val
+    def GetRange(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_GetRange,(self,) + _args, _kwargs)

         return val
     def GetLineLength(self, *_args, **_kwargs):
         val = apply(controlsc.wxTextCtrl_GetLineLength,(self,) + _args, _kwargs)
         return val
     def GetLineLength(self, *_args, **_kwargs):
         val = apply(controlsc.wxTextCtrl_GetLineLength,(self,) + _args, _kwargs)


@@ -473,47 +632,38 @@ class wxTextCtrlPtr(wxControlPtr):
     def GetNumberOfLines(self, *_args, **_kwargs):
         val = apply(controlsc.wxTextCtrl_GetNumberOfLines,(self,) + _args, _kwargs)
         return val
     def GetNumberOfLines(self, *_args, **_kwargs):
         val = apply(controlsc.wxTextCtrl_GetNumberOfLines,(self,) + _args, _kwargs)
         return val

-    def GetValue(self, *_args, **_kwargs):
-        val = apply(controlsc.wxTextCtrl_GetValue,(self,) + _args, _kwargs)
-        return val

     def IsModified(self, *_args, **_kwargs):
         val = apply(controlsc.wxTextCtrl_IsModified,(self,) + _args, _kwargs)
         return val
     def IsModified(self, *_args, **_kwargs):
         val = apply(controlsc.wxTextCtrl_IsModified,(self,) + _args, _kwargs)
         return val

-    def LoadFile(self, *_args, **_kwargs):
-        val = apply(controlsc.wxTextCtrl_LoadFile,(self,) + _args, _kwargs)
+    def IsEditable(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_IsEditable,(self,) + _args, _kwargs)

         return val
         return val

-    def Paste(self, *_args, **_kwargs):
-        val = apply(controlsc.wxTextCtrl_Paste,(self,) + _args, _kwargs)
+    def GetSelection(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_GetSelection,(self,) + _args, _kwargs)

         return val
         return val

-    def PositionToXY(self, *_args, **_kwargs):
-        val = apply(controlsc.wxTextCtrl_PositionToXY,(self,) + _args, _kwargs)
+    def GetStringSelection(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_GetStringSelection,(self,) + _args, _kwargs)

         return val
         return val

-    def Remove(self, *_args, **_kwargs):
-        val = apply(controlsc.wxTextCtrl_Remove,(self,) + _args, _kwargs)
+    def Clear(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_Clear,(self,) + _args, _kwargs)

         return val
     def Replace(self, *_args, **_kwargs):
         val = apply(controlsc.wxTextCtrl_Replace,(self,) + _args, _kwargs)
         return val
         return val
     def Replace(self, *_args, **_kwargs):
         val = apply(controlsc.wxTextCtrl_Replace,(self,) + _args, _kwargs)
         return val

-    def SaveFile(self, *_args, **_kwargs):
-        val = apply(controlsc.wxTextCtrl_SaveFile,(self,) + _args, _kwargs)
-        return val
-    def SetEditable(self, *_args, **_kwargs):
-        val = apply(controlsc.wxTextCtrl_SetEditable,(self,) + _args, _kwargs)
-        return val
-    def SetInsertionPoint(self, *_args, **_kwargs):
-        val = apply(controlsc.wxTextCtrl_SetInsertionPoint,(self,) + _args, _kwargs)
+    def Remove(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_Remove,(self,) + _args, _kwargs)

         return val
         return val

-    def SetInsertionPointEnd(self, *_args, **_kwargs):
-        val = apply(controlsc.wxTextCtrl_SetInsertionPointEnd,(self,) + _args, _kwargs)
+    def LoadFile(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_LoadFile,(self,) + _args, _kwargs)

         return val
         return val

-    def SetSelection(self, *_args, **_kwargs):
-        val = apply(controlsc.wxTextCtrl_SetSelection,(self,) + _args, _kwargs)
+    def SaveFile(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_SaveFile,(self,) + _args, _kwargs)

         return val
         return val

-    def SetValue(self, *_args, **_kwargs):
-        val = apply(controlsc.wxTextCtrl_SetValue,(self,) + _args, _kwargs)
+    def DiscardEdits(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_DiscardEdits,(self,) + _args, _kwargs)

         return val
         return val

-    def ShowPosition(self, *_args, **_kwargs):
-        val = apply(controlsc.wxTextCtrl_ShowPosition,(self,) + _args, _kwargs)
+    def SetMaxLength(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_SetMaxLength,(self,) + _args, _kwargs)

         return val
     def WriteText(self, *_args, **_kwargs):
         val = apply(controlsc.wxTextCtrl_WriteText,(self,) + _args, _kwargs)
         return val
     def WriteText(self, *_args, **_kwargs):
         val = apply(controlsc.wxTextCtrl_WriteText,(self,) + _args, _kwargs)


@@ -521,9 +671,34 @@ class wxTextCtrlPtr(wxControlPtr):
     def AppendText(self, *_args, **_kwargs):
         val = apply(controlsc.wxTextCtrl_AppendText,(self,) + _args, _kwargs)
         return val
     def AppendText(self, *_args, **_kwargs):
         val = apply(controlsc.wxTextCtrl_AppendText,(self,) + _args, _kwargs)
         return val

+    def SetStyle(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_SetStyle,(self,) + _args, _kwargs)
+        return val
+    def SetDefaultStyle(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_SetDefaultStyle,(self,) + _args, _kwargs)
+        return val
+    def GetDefaultStyle(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_GetDefaultStyle,(self,) + _args, _kwargs)
+        if val: val = wxTextAttrPtr(val) 
+        return val

     def XYToPosition(self, *_args, **_kwargs):
         val = apply(controlsc.wxTextCtrl_XYToPosition,(self,) + _args, _kwargs)
         return val
     def XYToPosition(self, *_args, **_kwargs):
         val = apply(controlsc.wxTextCtrl_XYToPosition,(self,) + _args, _kwargs)
         return val

+    def PositionToXY(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_PositionToXY,(self,) + _args, _kwargs)
+        return val
+    def ShowPosition(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_ShowPosition,(self,) + _args, _kwargs)
+        return val
+    def Copy(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_Copy,(self,) + _args, _kwargs)
+        return val
+    def Cut(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_Cut,(self,) + _args, _kwargs)
+        return val
+    def Paste(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_Paste,(self,) + _args, _kwargs)
+        return val

     def CanCopy(self, *_args, **_kwargs):
         val = apply(controlsc.wxTextCtrl_CanCopy,(self,) + _args, _kwargs)
         return val
     def CanCopy(self, *_args, **_kwargs):
         val = apply(controlsc.wxTextCtrl_CanCopy,(self,) + _args, _kwargs)
         return val


@@ -533,42 +708,69 @@ class wxTextCtrlPtr(wxControlPtr):
     def CanPaste(self, *_args, **_kwargs):
         val = apply(controlsc.wxTextCtrl_CanPaste,(self,) + _args, _kwargs)
         return val
     def CanPaste(self, *_args, **_kwargs):
         val = apply(controlsc.wxTextCtrl_CanPaste,(self,) + _args, _kwargs)
         return val

-    def CanRedo(self, *_args, **_kwargs):
-        val = apply(controlsc.wxTextCtrl_CanRedo,(self,) + _args, _kwargs)
+    def Undo(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_Undo,(self,) + _args, _kwargs)
+        return val
+    def Redo(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_Redo,(self,) + _args, _kwargs)

         return val
     def CanUndo(self, *_args, **_kwargs):
         val = apply(controlsc.wxTextCtrl_CanUndo,(self,) + _args, _kwargs)
         return val
         return val
     def CanUndo(self, *_args, **_kwargs):
         val = apply(controlsc.wxTextCtrl_CanUndo,(self,) + _args, _kwargs)
         return val

-    def GetSelection(self, *_args, **_kwargs):
-        val = apply(controlsc.wxTextCtrl_GetSelection,(self,) + _args, _kwargs)
+    def CanRedo(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_CanRedo,(self,) + _args, _kwargs)

         return val
         return val

-    def IsEditable(self, *_args, **_kwargs):
-        val = apply(controlsc.wxTextCtrl_IsEditable,(self,) + _args, _kwargs)
+    def SetInsertionPoint(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_SetInsertionPoint,(self,) + _args, _kwargs)

         return val
         return val

-    def Undo(self, *_args, **_kwargs):
-        val = apply(controlsc.wxTextCtrl_Undo,(self,) + _args, _kwargs)
+    def SetInsertionPointEnd(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_SetInsertionPointEnd,(self,) + _args, _kwargs)

         return val
         return val

-    def Redo(self, *_args, **_kwargs):
-        val = apply(controlsc.wxTextCtrl_Redo,(self,) + _args, _kwargs)
+    def GetInsertionPoint(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_GetInsertionPoint,(self,) + _args, _kwargs)
+        return val
+    def GetLastPosition(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_GetLastPosition,(self,) + _args, _kwargs)
+        return val
+    def SetSelection(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_SetSelection,(self,) + _args, _kwargs)
+        return val
+    def SelectAll(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_SelectAll,(self,) + _args, _kwargs)
+        return val
+    def SetEditable(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_SetEditable,(self,) + _args, _kwargs)

         return val
     def write(self, *_args, **_kwargs):
         val = apply(controlsc.wxTextCtrl_write,(self,) + _args, _kwargs)
         return val
         return val
     def write(self, *_args, **_kwargs):
         val = apply(controlsc.wxTextCtrl_write,(self,) + _args, _kwargs)
         return val

+    def GetString(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_GetString,(self,) + _args, _kwargs)
+        return val

     def __repr__(self):
         return "<C wxTextCtrl instance at %s>" % (self.this,)
 class wxTextCtrl(wxTextCtrlPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controlsc.new_wxTextCtrl,_args,_kwargs)
         self.thisown = 1
     def __repr__(self):
         return "<C wxTextCtrl instance at %s>" % (self.this,)
 class wxTextCtrl(wxTextCtrlPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controlsc.new_wxTextCtrl,_args,_kwargs)
         self.thisown = 1

-        #wx._StdWindowCallbacks(self)
+        self._setOORInfo(self)

 
 
 
 
 
 

+def wxPreTextCtrl(*_args,**_kwargs):
+    val = wxTextCtrlPtr(apply(controlsc.new_wxPreTextCtrl,_args,_kwargs))
+    val.thisown = 1
+    val._setOORInfo(val)
+    return val
+

 
 class wxScrollBarPtr(wxControlPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
 
 class wxScrollBarPtr(wxControlPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0

+    def Create(self, *_args, **_kwargs):
+        val = apply(controlsc.wxScrollBar_Create,(self,) + _args, _kwargs)
+        return val

     def GetRange(self, *_args, **_kwargs):
         val = apply(controlsc.wxScrollBar_GetRange,(self,) + _args, _kwargs)
         return val
     def GetRange(self, *_args, **_kwargs):
         val = apply(controlsc.wxScrollBar_GetRange,(self,) + _args, _kwargs)
         return val


@@ -584,6 +786,9 @@ class wxScrollBarPtr(wxControlPtr):
     def GetThumbLength(self, *_args, **_kwargs):
         val = apply(controlsc.wxScrollBar_GetThumbLength,(self,) + _args, _kwargs)
         return val
     def GetThumbLength(self, *_args, **_kwargs):
         val = apply(controlsc.wxScrollBar_GetThumbLength,(self,) + _args, _kwargs)
         return val

+    def IsVertical(self, *_args, **_kwargs):
+        val = apply(controlsc.wxScrollBar_IsVertical,(self,) + _args, _kwargs)
+        return val

     def SetThumbPosition(self, *_args, **_kwargs):
         val = apply(controlsc.wxScrollBar_SetThumbPosition,(self,) + _args, _kwargs)
         return val
     def SetThumbPosition(self, *_args, **_kwargs):
         val = apply(controlsc.wxScrollBar_SetThumbPosition,(self,) + _args, _kwargs)
         return val


@@ -596,15 +801,24 @@ class wxScrollBar(wxScrollBarPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controlsc.new_wxScrollBar,_args,_kwargs)
         self.thisown = 1
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controlsc.new_wxScrollBar,_args,_kwargs)
         self.thisown = 1

-        #wx._StdWindowCallbacks(self)
+        self._setOORInfo(self)

 
 
 
 
 
 

+def wxPreScrollBar(*_args,**_kwargs):
+    val = wxScrollBarPtr(apply(controlsc.new_wxPreScrollBar,_args,_kwargs))
+    val.thisown = 1
+    val._setOORInfo(val)
+    return val
+

 
 class wxSpinButtonPtr(wxControlPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
 
 class wxSpinButtonPtr(wxControlPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0

+    def Create(self, *_args, **_kwargs):
+        val = apply(controlsc.wxSpinButton_Create,(self,) + _args, _kwargs)
+        return val

     def GetMax(self, *_args, **_kwargs):
         val = apply(controlsc.wxSpinButton_GetMax,(self,) + _args, _kwargs)
         return val
     def GetMax(self, *_args, **_kwargs):
         val = apply(controlsc.wxSpinButton_GetMax,(self,) + _args, _kwargs)
         return val


@@ -626,17 +840,27 @@ class wxSpinButton(wxSpinButtonPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controlsc.new_wxSpinButton,_args,_kwargs)
         self.thisown = 1
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controlsc.new_wxSpinButton,_args,_kwargs)
         self.thisown = 1

+        self._setOORInfo(self)

 
 
 
 
 
 

+def wxPreSpinButton(*_args,**_kwargs):
+    val = wxSpinButtonPtr(apply(controlsc.new_wxPreSpinButton,_args,_kwargs))
+    val.thisown = 1
+    val._setOORInfo(val)
+    return val
+

 
 class wxStaticBitmapPtr(wxControlPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
 
 class wxStaticBitmapPtr(wxControlPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0

+    def Create(self, *_args, **_kwargs):
+        val = apply(controlsc.wxStaticBitmap_Create,(self,) + _args, _kwargs)
+        return val

     def GetBitmap(self, *_args, **_kwargs):
         val = apply(controlsc.wxStaticBitmap_GetBitmap,(self,) + _args, _kwargs)
     def GetBitmap(self, *_args, **_kwargs):
         val = apply(controlsc.wxStaticBitmap_GetBitmap,(self,) + _args, _kwargs)

-        if val: val = wxBitmapPtr(val) 
+        if val: val = wxBitmapPtr(val) ; val.thisown = 1

         return val
     def SetBitmap(self, *_args, **_kwargs):
         val = apply(controlsc.wxStaticBitmap_SetBitmap,(self,) + _args, _kwargs)
         return val
     def SetBitmap(self, *_args, **_kwargs):
         val = apply(controlsc.wxStaticBitmap_SetBitmap,(self,) + _args, _kwargs)


@@ -650,15 +874,24 @@ class wxStaticBitmap(wxStaticBitmapPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controlsc.new_wxStaticBitmap,_args,_kwargs)
         self.thisown = 1
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controlsc.new_wxStaticBitmap,_args,_kwargs)
         self.thisown = 1

-        #wx._StdWindowCallbacks(self)
+        self._setOORInfo(self)
+

 
 
 
 

+def wxPreStaticBitmap(*_args,**_kwargs):
+    val = wxStaticBitmapPtr(apply(controlsc.new_wxPreStaticBitmap,_args,_kwargs))
+    val.thisown = 1
+    val._setOORInfo(val)
+    return val

 
 
 class wxRadioBoxPtr(wxControlPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
 
 
 class wxRadioBoxPtr(wxControlPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0

+    def Create(self, *_args, **_kwargs):
+        val = apply(controlsc.wxRadioBox_Create,(self,) + _args, _kwargs)
+        return val

     def Enable(self, *_args, **_kwargs):
         val = apply(controlsc.wxRadioBox_Enable,(self,) + _args, _kwargs)
         return val
     def Enable(self, *_args, **_kwargs):
         val = apply(controlsc.wxRadioBox_Enable,(self,) + _args, _kwargs)
         return val


@@ -668,23 +901,26 @@ class wxRadioBoxPtr(wxControlPtr):
     def FindString(self, *_args, **_kwargs):
         val = apply(controlsc.wxRadioBox_FindString,(self,) + _args, _kwargs)
         return val
     def FindString(self, *_args, **_kwargs):
         val = apply(controlsc.wxRadioBox_FindString,(self,) + _args, _kwargs)
         return val

-    def GetItemLabel(self, *_args, **_kwargs):
-        val = apply(controlsc.wxRadioBox_GetItemLabel,(self,) + _args, _kwargs)
+    def GetString(self, *_args, **_kwargs):
+        val = apply(controlsc.wxRadioBox_GetString,(self,) + _args, _kwargs)
+        return val
+    def SetString(self, *_args, **_kwargs):
+        val = apply(controlsc.wxRadioBox_SetString,(self,) + _args, _kwargs)
+        return val
+    def GetColumnCount(self, *_args, **_kwargs):
+        val = apply(controlsc.wxRadioBox_GetColumnCount,(self,) + _args, _kwargs)
+        return val
+    def GetRowCount(self, *_args, **_kwargs):
+        val = apply(controlsc.wxRadioBox_GetRowCount,(self,) + _args, _kwargs)

         return val
     def GetSelection(self, *_args, **_kwargs):
         val = apply(controlsc.wxRadioBox_GetSelection,(self,) + _args, _kwargs)
         return val
         return val
     def GetSelection(self, *_args, **_kwargs):
         val = apply(controlsc.wxRadioBox_GetSelection,(self,) + _args, _kwargs)
         return val

-    def GetString(self, *_args, **_kwargs):
-        val = apply(controlsc.wxRadioBox_GetString,(self,) + _args, _kwargs)
-        return val

     def GetStringSelection(self, *_args, **_kwargs):
         val = apply(controlsc.wxRadioBox_GetStringSelection,(self,) + _args, _kwargs)
         return val
     def GetStringSelection(self, *_args, **_kwargs):
         val = apply(controlsc.wxRadioBox_GetStringSelection,(self,) + _args, _kwargs)
         return val

-    def Number(self, *_args, **_kwargs):
-        val = apply(controlsc.wxRadioBox_Number,(self,) + _args, _kwargs)
-        return val
-    def SetItemLabel(self, *_args, **_kwargs):
-        val = apply(controlsc.wxRadioBox_SetItemLabel,(self,) + _args, _kwargs)
+    def GetCount(self, *_args, **_kwargs):
+        val = apply(controlsc.wxRadioBox_GetCount,(self,) + _args, _kwargs)

         return val
     def SetSelection(self, *_args, **_kwargs):
         val = apply(controlsc.wxRadioBox_SetSelection,(self,) + _args, _kwargs)
         return val
     def SetSelection(self, *_args, **_kwargs):
         val = apply(controlsc.wxRadioBox_SetSelection,(self,) + _args, _kwargs)


@@ -700,19 +936,33 @@ class wxRadioBoxPtr(wxControlPtr):
         return val
     def __repr__(self):
         return "<C wxRadioBox instance at %s>" % (self.this,)
         return val
     def __repr__(self):
         return "<C wxRadioBox instance at %s>" % (self.this,)

+    
+    GetItemLabel = GetString
+    SetItemLabel = SetString
+    
+    Number = GetCount

 class wxRadioBox(wxRadioBoxPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controlsc.new_wxRadioBox,_args,_kwargs)
         self.thisown = 1
 class wxRadioBox(wxRadioBoxPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controlsc.new_wxRadioBox,_args,_kwargs)
         self.thisown = 1

-        #wx._StdWindowCallbacks(self)
+        self._setOORInfo(self)

 
 
 
 
 
 

+def wxPreRadioBox(*_args,**_kwargs):
+    val = wxRadioBoxPtr(apply(controlsc.new_wxPreRadioBox,_args,_kwargs))
+    val.thisown = 1
+    val._setOORInfo(val)
+    return val
+

 
 class wxRadioButtonPtr(wxControlPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
 
 class wxRadioButtonPtr(wxControlPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0

+    def Create(self, *_args, **_kwargs):
+        val = apply(controlsc.wxRadioButton_Create,(self,) + _args, _kwargs)
+        return val

     def GetValue(self, *_args, **_kwargs):
         val = apply(controlsc.wxRadioButton_GetValue,(self,) + _args, _kwargs)
         return val
     def GetValue(self, *_args, **_kwargs):
         val = apply(controlsc.wxRadioButton_GetValue,(self,) + _args, _kwargs)
         return val


@@ -725,15 +975,24 @@ class wxRadioButton(wxRadioButtonPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controlsc.new_wxRadioButton,_args,_kwargs)
         self.thisown = 1
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controlsc.new_wxRadioButton,_args,_kwargs)
         self.thisown = 1

-        #wx._StdWindowCallbacks(self)
+        self._setOORInfo(self)

 
 
 
 
 
 

+def wxPreRadioButton(*_args,**_kwargs):
+    val = wxRadioButtonPtr(apply(controlsc.new_wxPreRadioButton,_args,_kwargs))
+    val.thisown = 1
+    val._setOORInfo(val)
+    return val
+

 
 class wxSliderPtr(wxControlPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
 
 class wxSliderPtr(wxControlPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0

+    def Create(self, *_args, **_kwargs):
+        val = apply(controlsc.wxSlider_Create,(self,) + _args, _kwargs)
+        return val

     def ClearSel(self, *_args, **_kwargs):
         val = apply(controlsc.wxSlider_ClearSel,(self,) + _args, _kwargs)
         return val
     def ClearSel(self, *_args, **_kwargs):
         val = apply(controlsc.wxSlider_ClearSel,(self,) + _args, _kwargs)
         return val


@@ -797,24 +1056,88 @@ class wxSlider(wxSliderPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controlsc.new_wxSlider,_args,_kwargs)
         self.thisown = 1
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controlsc.new_wxSlider,_args,_kwargs)
         self.thisown = 1

-        #wx._StdWindowCallbacks(self)
+        self._setOORInfo(self)
+

 
 
 
 

+def wxPreSlider(*_args,**_kwargs):
+    val = wxSliderPtr(apply(controlsc.new_wxPreSlider,_args,_kwargs))
+    val.thisown = 1
+    val._setOORInfo(val)
+    return val

 
 
 class wxSpinCtrlPtr(wxSpinButtonPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
 
 
 class wxSpinCtrlPtr(wxSpinButtonPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0

+    def Create(self, *_args, **_kwargs):
+        val = apply(controlsc.wxSpinCtrl_Create,(self,) + _args, _kwargs)
+        return val
+    def GetMax(self, *_args, **_kwargs):
+        val = apply(controlsc.wxSpinCtrl_GetMax,(self,) + _args, _kwargs)
+        return val
+    def GetMin(self, *_args, **_kwargs):
+        val = apply(controlsc.wxSpinCtrl_GetMin,(self,) + _args, _kwargs)
+        return val
+    def GetValue(self, *_args, **_kwargs):
+        val = apply(controlsc.wxSpinCtrl_GetValue,(self,) + _args, _kwargs)
+        return val
+    def SetRange(self, *_args, **_kwargs):
+        val = apply(controlsc.wxSpinCtrl_SetRange,(self,) + _args, _kwargs)
+        return val
+    def SetValue(self, *_args, **_kwargs):
+        val = apply(controlsc.wxSpinCtrl_SetValue,(self,) + _args, _kwargs)
+        return val

     def __repr__(self):
         return "<C wxSpinCtrl instance at %s>" % (self.this,)
 class wxSpinCtrl(wxSpinCtrlPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controlsc.new_wxSpinCtrl,_args,_kwargs)
         self.thisown = 1
     def __repr__(self):
         return "<C wxSpinCtrl instance at %s>" % (self.this,)
 class wxSpinCtrl(wxSpinCtrlPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controlsc.new_wxSpinCtrl,_args,_kwargs)
         self.thisown = 1

+        self._setOORInfo(self)

 
 
 
 
 
 

+def wxPreSpinCtrl(*_args,**_kwargs):
+    val = wxSpinCtrlPtr(apply(controlsc.new_wxPreSpinCtrl,_args,_kwargs))
+    val.thisown = 1
+    val._setOORInfo(val)
+    return val
+
+
+class wxToggleButtonPtr(wxControlPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def Create(self, *_args, **_kwargs):
+        val = apply(controlsc.wxToggleButton_Create,(self,) + _args, _kwargs)
+        return val
+    def SetValue(self, *_args, **_kwargs):
+        val = apply(controlsc.wxToggleButton_SetValue,(self,) + _args, _kwargs)
+        return val
+    def GetValue(self, *_args, **_kwargs):
+        val = apply(controlsc.wxToggleButton_GetValue,(self,) + _args, _kwargs)
+        return val
+    def SetLabel(self, *_args, **_kwargs):
+        val = apply(controlsc.wxToggleButton_SetLabel,(self,) + _args, _kwargs)
+        return val
+    def __repr__(self):
+        return "<C wxToggleButton instance at %s>" % (self.this,)
+class wxToggleButton(wxToggleButtonPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(controlsc.new_wxToggleButton,_args,_kwargs)
+        self.thisown = 1
+        self._setOORInfo(self)
+
+
+
+def wxPreToggleButton(*_args,**_kwargs):
+    val = wxToggleButtonPtr(apply(controlsc.new_wxPreToggleButton,_args,_kwargs))
+    val.thisown = 1
+    val._setOORInfo(val)
+    return val
+

 
 
 
 
 
 


@@ -825,9 +1148,15 @@ def wxButton_GetDefaultSize(*_args, **_kwargs):
     if val: val = wxSizePtr(val); val.thisown = 1
     return val
 
     if val: val = wxSizePtr(val); val.thisown = 1
     return val
 

+def wxTextAttr_Combine(*_args, **_kwargs):
+    val = apply(controlsc.wxTextAttr_Combine,_args,_kwargs)
+    if val: val = wxTextAttrPtr(val); val.thisown = 1
+    return val
+

 
 
 #-------------- VARIABLE WRAPPERS ------------------
 
 cvar = controlsc.cvar
 wxDefaultValidator = wxValidatorPtr(controlsc.cvar.wxDefaultValidator)
 
 
 #-------------- VARIABLE WRAPPERS ------------------
 
 cvar = controlsc.cvar
 wxDefaultValidator = wxValidatorPtr(controlsc.cvar.wxDefaultValidator)

+wxEVT_COMMAND_TOGGLEBUTTON_CLICKED = controlsc.wxEVT_COMMAND_TOGGLEBUTTON_CLICKED