X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/98624b49d3abd7ebc1d5f8df4209f563b3e3323f..a4353f07c6b37712634d4b2d86527b647a08044f:/wxPython/src/msw/controls.py

diff --git a/wxPython/src/msw/controls.py b/wxPython/src/msw/controls.py
index a5ba51fdd9..4e06f17121 100644
--- a/wxPython/src/msw/controls.py
+++ b/wxPython/src/msw/controls.py
@@ -7,6 +7,8 @@ from windows import *
 
 from gdi import *
 
+from fonts import *
+
 from clip_dnd import *
 
 from events import *
@@ -81,6 +83,9 @@ class wxControlWithItemsPtr(wxControlPtr):
     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
@@ -139,19 +144,19 @@ class wxBitmapButtonPtr(wxButtonPtr):
         return val
     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)
-        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)
-        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)
-        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)
@@ -537,6 +542,12 @@ class wxCheckListBoxPtr(wxListBoxPtr):
     def GetItemHeight(self, *_args, **_kwargs):
         val = apply(controlsc.wxCheckListBox_GetItemHeight,(self,) + _args, _kwargs)
         return val
+    def HitTest(self, *_args, **_kwargs):
+        val = apply(controlsc.wxCheckListBox_HitTest,(self,) + _args, _kwargs)
+        return val
+    def HitTestXY(self, *_args, **_kwargs):
+        val = apply(controlsc.wxCheckListBox_HitTestXY,(self,) + _args, _kwargs)
+        return val
     def __repr__(self):
         return "<C wxCheckListBox instance at %s>" % (self.this,)
 class wxCheckListBox(wxCheckListBoxPtr):
@@ -581,15 +592,15 @@ class wxTextAttrPtr :
         return val
     def GetTextColour(self, *_args, **_kwargs):
         val = apply(controlsc.wxTextAttr_GetTextColour,(self,) + _args, _kwargs)
-        if val: val = wxColourPtr(val) 
+        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) 
+        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) 
+        if val: val = wxFontPtr(val) ; val.thisown = 1
         return val
     def IsDefault(self, *_args, **_kwargs):
         val = apply(controlsc.wxTextAttr_IsDefault,(self,) + _args, _kwargs)
@@ -617,6 +628,9 @@ class wxTextCtrlPtr(wxControlPtr):
     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
@@ -635,6 +649,9 @@ class wxTextCtrlPtr(wxControlPtr):
     def GetSelection(self, *_args, **_kwargs):
         val = apply(controlsc.wxTextCtrl_GetSelection,(self,) + _args, _kwargs)
         return val
+    def GetStringSelection(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_GetStringSelection,(self,) + _args, _kwargs)
+        return val
     def Clear(self, *_args, **_kwargs):
         val = apply(controlsc.wxTextCtrl_Clear,(self,) + _args, _kwargs)
         return val
@@ -662,6 +679,9 @@ class wxTextCtrlPtr(wxControlPtr):
     def AppendText(self, *_args, **_kwargs):
         val = apply(controlsc.wxTextCtrl_AppendText,(self,) + _args, _kwargs)
         return val
+    def EmulateKeyPress(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_EmulateKeyPress,(self,) + _args, _kwargs)
+        return val
     def SetStyle(self, *_args, **_kwargs):
         val = apply(controlsc.wxTextCtrl_SetStyle,(self,) + _args, _kwargs)
         return val
@@ -732,9 +752,18 @@ class wxTextCtrlPtr(wxControlPtr):
     def SetEditable(self, *_args, **_kwargs):
         val = apply(controlsc.wxTextCtrl_SetEditable,(self,) + _args, _kwargs)
         return val
+    def IsSingleLine(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_IsSingleLine,(self,) + _args, _kwargs)
+        return val
+    def IsMultiLine(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_IsMultiLine,(self,) + _args, _kwargs)
+        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):
@@ -774,6 +803,9 @@ class wxScrollBarPtr(wxControlPtr):
     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
@@ -845,7 +877,7 @@ class wxStaticBitmapPtr(wxControlPtr):
         return val
     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)
@@ -1133,6 +1165,11 @@ def wxButton_GetDefaultSize(*_args, **_kwargs):
     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 ------------------