fixed bug in generation of thumb scroll events

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

diff --git a/wxPython/src/msw/controls.py b/wxPython/src/msw/controls.py
index 563bd1a11688200cb52c508c5526763908ed9625..ccdd4ce7f73b0e7bcaee42d6f9e6b3fed1339145 100644 (file)
--- a/wxPython/src/msw/controls.py
+++ b/wxPython/src/msw/controls.py
@@ -7,6 +7,8 @@ from windows import *
 
 from gdi import *
 
 
 from gdi import *
 

+from fonts import *
+

 from clip_dnd import *
 
 from events 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 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
     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)
         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)
         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)


@@ -581,15 +586,15 @@ class wxTextAttrPtr :
         return val
     def GetTextColour(self, *_args, **_kwargs):
         val = apply(controlsc.wxTextAttr_GetTextColour,(self,) + _args, _kwargs)
         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)
         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)
         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)
         return val
     def IsDefault(self, *_args, **_kwargs):
         val = apply(controlsc.wxTextAttr_IsDefault,(self,) + _args, _kwargs)


@@ -617,6 +622,9 @@ class wxTextCtrlPtr(wxControlPtr):
     def SetValue(self, *_args, **_kwargs):
         val = apply(controlsc.wxTextCtrl_SetValue,(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)
         return val


@@ -665,6 +673,9 @@ 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 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
     def SetStyle(self, *_args, **_kwargs):
         val = apply(controlsc.wxTextCtrl_SetStyle,(self,) + _args, _kwargs)
         return val


@@ -738,6 +749,9 @@ class wxTextCtrlPtr(wxControlPtr):
     def write(self, *_args, **_kwargs):
         val = apply(controlsc.wxTextCtrl_write,(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):
     def __repr__(self):
         return "<C wxTextCtrl instance at %s>" % (self.this,)
 class wxTextCtrl(wxTextCtrlPtr):


@@ -777,6 +791,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


@@ -848,7 +865,7 @@ class wxStaticBitmapPtr(wxControlPtr):
         return val
     def GetBitmap(self, *_args, **_kwargs):
         val = apply(controlsc.wxStaticBitmap_GetBitmap,(self,) + _args, _kwargs)
         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)
         return val
     def SetBitmap(self, *_args, **_kwargs):
         val = apply(controlsc.wxStaticBitmap_SetBitmap,(self,) + _args, _kwargs)


@@ -1136,6 +1153,11 @@ 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 ------------------
 
 
 #-------------- VARIABLE WRAPPERS ------------------