fixed bug in generation of thumb scroll events

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

diff --git a/wxPython/src/msw/gdi.py b/wxPython/src/msw/gdi.py
index 169e04a51b85450643d823921ba418a186a5f0a4..9ab2cec48ff89a0bdd4c6e3d553fe587c09af31b 100644 (file)
--- a/wxPython/src/msw/gdi.py
+++ b/wxPython/src/msw/gdi.py
@@ -2,6 +2,8 @@
 import gdic
 
 from misc import *
 import gdic
 
 from misc import *

+
+from fonts import *

 class wxGDIObjectPtr(wxObjectPtr):
     def __init__(self,this):
         self.this = this
 class wxGDIObjectPtr(wxObjectPtr):
     def __init__(self,this):
         self.this = this


@@ -197,6 +199,43 @@ class wxIcon(wxIconPtr):
 
 
 
 
 
 

+class wxIconBundlePtr :
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def __del__(self,gdic=gdic):
+        if self.thisown == 1 :
+            gdic.delete_wxIconBundle(self)
+    def AddIcon(self, *_args, **_kwargs):
+        val = apply(gdic.wxIconBundle_AddIcon,(self,) + _args, _kwargs)
+        return val
+    def AddIconFromFile(self, *_args, **_kwargs):
+        val = apply(gdic.wxIconBundle_AddIconFromFile,(self,) + _args, _kwargs)
+        return val
+    def GetIcon(self, *_args, **_kwargs):
+        val = apply(gdic.wxIconBundle_GetIcon,(self,) + _args, _kwargs)
+        if val: val = wxIconPtr(val) 
+        return val
+    def __repr__(self):
+        return "<C wxIconBundle instance at %s>" % (self.this,)
+class wxIconBundle(wxIconBundlePtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(gdic.new_wxIconBundle,_args,_kwargs)
+        self.thisown = 1
+
+
+
+def wxIconBundleFromFile(*_args,**_kwargs):
+    val = wxIconBundlePtr(apply(gdic.new_wxIconBundleFromFile,_args,_kwargs))
+    val.thisown = 1
+    return val
+
+def wxIconBundleFromIcon(*_args,**_kwargs):
+    val = wxIconBundlePtr(apply(gdic.new_wxIconBundleFromIcon,_args,_kwargs))
+    val.thisown = 1
+    return val
+
+

 class wxCursorPtr(wxGDIObjectPtr):
     def __init__(self,this):
         self.this = this
 class wxCursorPtr(wxGDIObjectPtr):
     def __init__(self,this):
         self.this = this


@@ -244,175 +283,6 @@ class wxCursor(wxCursorPtr):
 
 
 
 
 
 

-class wxNativeFontInfoPtr :
-    def __init__(self,this):
-        self.this = this
-        self.thisown = 0
-    def FromString(self, *_args, **_kwargs):
-        val = apply(gdic.wxNativeFontInfo_FromString,(self,) + _args, _kwargs)
-        return val
-    def ToString(self, *_args, **_kwargs):
-        val = apply(gdic.wxNativeFontInfo_ToString,(self,) + _args, _kwargs)
-        return val
-    def __str__(self, *_args, **_kwargs):
-        val = apply(gdic.wxNativeFontInfo___str__,(self,) + _args, _kwargs)
-        return val
-    def __repr__(self):
-        return "<C wxNativeFontInfo instance at %s>" % (self.this,)
-class wxNativeFontInfo(wxNativeFontInfoPtr):
-    def __init__(self,this):
-        self.this = this
-
-
-
-
-class wxFontMapperPtr :
-    def __init__(self,this):
-        self.this = this
-        self.thisown = 0
-    def __del__(self,gdic=gdic):
-        if self.thisown == 1 :
-            gdic.delete_wxFontMapper(self)
-    def GetAltForEncoding(self, *_args, **_kwargs):
-        val = apply(gdic.wxFontMapper_GetAltForEncoding,(self,) + _args, _kwargs)
-        return val
-    def IsEncodingAvailable(self, *_args, **_kwargs):
-        val = apply(gdic.wxFontMapper_IsEncodingAvailable,(self,) + _args, _kwargs)
-        return val
-    def CharsetToEncoding(self, *_args, **_kwargs):
-        val = apply(gdic.wxFontMapper_CharsetToEncoding,(self,) + _args, _kwargs)
-        return val
-    def SetDialogParent(self, *_args, **_kwargs):
-        val = apply(gdic.wxFontMapper_SetDialogParent,(self,) + _args, _kwargs)
-        return val
-    def SetDialogTitle(self, *_args, **_kwargs):
-        val = apply(gdic.wxFontMapper_SetDialogTitle,(self,) + _args, _kwargs)
-        return val
-    def SetConfig(self, *_args, **_kwargs):
-        val = apply(gdic.wxFontMapper_SetConfig,(self,) + _args, _kwargs)
-        return val
-    def SetConfigPath(self, *_args, **_kwargs):
-        val = apply(gdic.wxFontMapper_SetConfigPath,(self,) + _args, _kwargs)
-        return val
-    def __repr__(self):
-        return "<C wxFontMapper instance at %s>" % (self.this,)
-class wxFontMapper(wxFontMapperPtr):
-    def __init__(self,*_args,**_kwargs):
-        self.this = apply(gdic.new_wxFontMapper,_args,_kwargs)
-        self.thisown = 1
-
-
-
-
-class wxFontPtr(wxGDIObjectPtr):
-    def __init__(self,this):
-        self.this = this
-        self.thisown = 0
-    def __del__(self,gdic=gdic):
-        if self.thisown == 1 :
-            gdic.delete_wxFont(self)
-    def Ok(self, *_args, **_kwargs):
-        val = apply(gdic.wxFont_Ok,(self,) + _args, _kwargs)
-        return val
-    def GetPointSize(self, *_args, **_kwargs):
-        val = apply(gdic.wxFont_GetPointSize,(self,) + _args, _kwargs)
-        return val
-    def GetFamily(self, *_args, **_kwargs):
-        val = apply(gdic.wxFont_GetFamily,(self,) + _args, _kwargs)
-        return val
-    def GetStyle(self, *_args, **_kwargs):
-        val = apply(gdic.wxFont_GetStyle,(self,) + _args, _kwargs)
-        return val
-    def GetWeight(self, *_args, **_kwargs):
-        val = apply(gdic.wxFont_GetWeight,(self,) + _args, _kwargs)
-        return val
-    def GetUnderlined(self, *_args, **_kwargs):
-        val = apply(gdic.wxFont_GetUnderlined,(self,) + _args, _kwargs)
-        return val
-    def GetFaceName(self, *_args, **_kwargs):
-        val = apply(gdic.wxFont_GetFaceName,(self,) + _args, _kwargs)
-        return val
-    def GetEncoding(self, *_args, **_kwargs):
-        val = apply(gdic.wxFont_GetEncoding,(self,) + _args, _kwargs)
-        return val
-    def GetNativeFontInfo(self, *_args, **_kwargs):
-        val = apply(gdic.wxFont_GetNativeFontInfo,(self,) + _args, _kwargs)
-        if val: val = wxNativeFontInfoPtr(val) 
-        return val
-    def SetPointSize(self, *_args, **_kwargs):
-        val = apply(gdic.wxFont_SetPointSize,(self,) + _args, _kwargs)
-        return val
-    def SetFamily(self, *_args, **_kwargs):
-        val = apply(gdic.wxFont_SetFamily,(self,) + _args, _kwargs)
-        return val
-    def SetStyle(self, *_args, **_kwargs):
-        val = apply(gdic.wxFont_SetStyle,(self,) + _args, _kwargs)
-        return val
-    def SetWeight(self, *_args, **_kwargs):
-        val = apply(gdic.wxFont_SetWeight,(self,) + _args, _kwargs)
-        return val
-    def SetFaceName(self, *_args, **_kwargs):
-        val = apply(gdic.wxFont_SetFaceName,(self,) + _args, _kwargs)
-        return val
-    def SetUnderlined(self, *_args, **_kwargs):
-        val = apply(gdic.wxFont_SetUnderlined,(self,) + _args, _kwargs)
-        return val
-    def SetEncoding(self, *_args, **_kwargs):
-        val = apply(gdic.wxFont_SetEncoding,(self,) + _args, _kwargs)
-        return val
-    def SetNativeFontInfo(self, *_args, **_kwargs):
-        val = apply(gdic.wxFont_SetNativeFontInfo,(self,) + _args, _kwargs)
-        return val
-    def GetFamilyString(self, *_args, **_kwargs):
-        val = apply(gdic.wxFont_GetFamilyString,(self,) + _args, _kwargs)
-        return val
-    def GetStyleString(self, *_args, **_kwargs):
-        val = apply(gdic.wxFont_GetStyleString,(self,) + _args, _kwargs)
-        return val
-    def GetWeightString(self, *_args, **_kwargs):
-        val = apply(gdic.wxFont_GetWeightString,(self,) + _args, _kwargs)
-        return val
-    def __repr__(self):
-        return "<C wxFont instance at %s>" % (self.this,)
-class wxFont(wxFontPtr):
-    def __init__(self,*_args,**_kwargs):
-        self.this = apply(gdic.new_wxFont,_args,_kwargs)
-        self.thisown = 1
-
-
-
-def wxFontFromNativeInfo(*_args,**_kwargs):
-    val = wxFontPtr(apply(gdic.new_wxFontFromNativeInfo,_args,_kwargs))
-    val.thisown = 1
-    return val
-
-
-class wxFontListPtr(wxObjectPtr):
-    def __init__(self,this):
-        self.this = this
-        self.thisown = 0
-    def AddFont(self, *_args, **_kwargs):
-        val = apply(gdic.wxFontList_AddFont,(self,) + _args, _kwargs)
-        return val
-    def FindOrCreateFont(self, *_args, **_kwargs):
-        val = apply(gdic.wxFontList_FindOrCreateFont,(self,) + _args, _kwargs)
-        if val: val = wxFontPtr(val) 
-        return val
-    def RemoveFont(self, *_args, **_kwargs):
-        val = apply(gdic.wxFontList_RemoveFont,(self,) + _args, _kwargs)
-        return val
-    def GetCount(self, *_args, **_kwargs):
-        val = apply(gdic.wxFontList_GetCount,(self,) + _args, _kwargs)
-        return val
-    def __repr__(self):
-        return "<C wxFontList instance at %s>" % (self.this,)
-class wxFontList(wxFontListPtr):
-    def __init__(self,this):
-        self.this = this
-
-
-
-

 class wxColourPtr(wxObjectPtr):
     def __init__(self,this):
         self.this = this
 class wxColourPtr(wxObjectPtr):
     def __init__(self,this):
         self.this = this


@@ -696,6 +566,13 @@ class wxDCPtr(wxObjectPtr):
     def DrawIcon(self, *_args, **_kwargs):
         val = apply(gdic.wxDC_DrawIcon,(self,) + _args, _kwargs)
         return val
     def DrawIcon(self, *_args, **_kwargs):
         val = apply(gdic.wxDC_DrawIcon,(self,) + _args, _kwargs)
         return val

+    def DrawLabel(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_DrawLabel,(self,) + _args, _kwargs)
+        return val
+    def DrawImageLabel(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_DrawImageLabel,(self,) + _args, _kwargs)
+        if val: val = wxRectPtr(val) ; val.thisown = 1
+        return val

     def DrawLine(self, *_args, **_kwargs):
         val = apply(gdic.wxDC_DrawLine,(self,) + _args, _kwargs)
         return val
     def DrawLine(self, *_args, **_kwargs):
         val = apply(gdic.wxDC_DrawLine,(self,) + _args, _kwargs)
         return val


@@ -976,6 +853,44 @@ class wxMemoryDC(wxMemoryDCPtr):
 
 
 
 
 
 

+class wxBufferedDCPtr(wxMemoryDCPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def UnMask(self, *_args, **_kwargs):
+        val = apply(gdic.wxBufferedDC_UnMask,(self,) + _args, _kwargs)
+        return val
+    def __repr__(self):
+        return "<C wxBufferedDC instance at %s>" % (self.this,)
+class wxBufferedDC(wxBufferedDCPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(gdic.new_wxBufferedDC,_args,_kwargs)
+        self.thisown = 1
+        self._dc = _args[0] # save a ref so the other dc won't be deleted before self
+
+
+
+def wxBufferedDCInternalBuffer(*_args,**_kwargs):
+    val = wxBufferedDCPtr(apply(gdic.new_wxBufferedDCInternalBuffer,_args,_kwargs))
+    val.thisown = 1
+    val._dc = _args[0] # save a ref so the other dc won't be deleted before self
+    return val
+
+
+class wxBufferedPaintDCPtr(wxBufferedDCPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def __repr__(self):
+        return "<C wxBufferedPaintDC instance at %s>" % (self.this,)
+class wxBufferedPaintDC(wxBufferedPaintDCPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(gdic.new_wxBufferedPaintDC,_args,_kwargs)
+        self.thisown = 1
+
+
+
+

 class wxScreenDCPtr(wxDCPtr):
     def __init__(self,this):
         self.this = this
 class wxScreenDCPtr(wxDCPtr):
     def __init__(self,this):
         self.this = this


@@ -1175,6 +1090,9 @@ class wxRegionPtr(wxGDIObjectPtr):
     def Clear(self, *_args, **_kwargs):
         val = apply(gdic.wxRegion_Clear,(self,) + _args, _kwargs)
         return val
     def Clear(self, *_args, **_kwargs):
         val = apply(gdic.wxRegion_Clear,(self,) + _args, _kwargs)
         return val

+    def Offset(self, *_args, **_kwargs):
+        val = apply(gdic.wxRegion_Offset,(self,) + _args, _kwargs)
+        return val

     def Contains(self, *_args, **_kwargs):
         val = apply(gdic.wxRegion_Contains,(self,) + _args, _kwargs)
         return val
     def Contains(self, *_args, **_kwargs):
         val = apply(gdic.wxRegion_Contains,(self,) + _args, _kwargs)
         return val


@@ -1327,6 +1245,11 @@ def wxIconFromXPMData(*_args, **_kwargs):
     if val: val = wxIconPtr(val); val.thisown = 1
     return val
 
     if val: val = wxIconPtr(val); val.thisown = 1
     return val
 

+def wxIconFromBitmap(*_args, **_kwargs):
+    val = apply(gdic.wxIconFromBitmap,_args,_kwargs)
+    if val: val = wxIconPtr(val); val.thisown = 1
+    return val
+

 def wxStockCursor(*_args, **_kwargs):
     val = apply(gdic.wxStockCursor,_args,_kwargs)
     if val: val = wxCursorPtr(val); val.thisown = 1
 def wxStockCursor(*_args, **_kwargs):
     val = apply(gdic.wxStockCursor,_args,_kwargs)
     if val: val = wxCursorPtr(val); val.thisown = 1


@@ -1342,80 +1265,10 @@ def wxMemoryDCFromDC(*_args, **_kwargs):
     if val: val = wxMemoryDCPtr(val); val.thisown = 1
     return val
 
     if val: val = wxMemoryDCPtr(val); val.thisown = 1
     return val
 

-wxFontMapper_GetEncodingName = gdic.wxFontMapper_GetEncodingName
-
-wxFontMapper_GetEncodingDescription = gdic.wxFontMapper_GetEncodingDescription
-
-wxFontMapper_GetDefaultConfigPath = gdic.wxFontMapper_GetDefaultConfigPath
-
-wxFont_GetDefaultEncoding = gdic.wxFont_GetDefaultEncoding
-
-wxFont_SetDefaultEncoding = gdic.wxFont_SetDefaultEncoding
-

 
 
 #-------------- VARIABLE WRAPPERS ------------------
 
 
 
 #-------------- VARIABLE WRAPPERS ------------------
 

-wxFONTFAMILY_DEFAULT = gdic.wxFONTFAMILY_DEFAULT
-wxFONTFAMILY_DECORATIVE = gdic.wxFONTFAMILY_DECORATIVE
-wxFONTFAMILY_ROMAN = gdic.wxFONTFAMILY_ROMAN
-wxFONTFAMILY_SCRIPT = gdic.wxFONTFAMILY_SCRIPT
-wxFONTFAMILY_SWISS = gdic.wxFONTFAMILY_SWISS
-wxFONTFAMILY_MODERN = gdic.wxFONTFAMILY_MODERN
-wxFONTFAMILY_TELETYPE = gdic.wxFONTFAMILY_TELETYPE
-wxFONTFAMILY_MAX = gdic.wxFONTFAMILY_MAX
-wxFONTSTYLE_NORMAL = gdic.wxFONTSTYLE_NORMAL
-wxFONTSTYLE_ITALIC = gdic.wxFONTSTYLE_ITALIC
-wxFONTSTYLE_SLANT = gdic.wxFONTSTYLE_SLANT
-wxFONTSTYLE_MAX = gdic.wxFONTSTYLE_MAX
-wxFONTWEIGHT_NORMAL = gdic.wxFONTWEIGHT_NORMAL
-wxFONTWEIGHT_LIGHT = gdic.wxFONTWEIGHT_LIGHT
-wxFONTWEIGHT_BOLD = gdic.wxFONTWEIGHT_BOLD
-wxFONTWEIGHT_MAX = gdic.wxFONTWEIGHT_MAX
-wxFONTENCODING_SYSTEM = gdic.wxFONTENCODING_SYSTEM
-wxFONTENCODING_DEFAULT = gdic.wxFONTENCODING_DEFAULT
-wxFONTENCODING_ISO8859_1 = gdic.wxFONTENCODING_ISO8859_1
-wxFONTENCODING_ISO8859_2 = gdic.wxFONTENCODING_ISO8859_2
-wxFONTENCODING_ISO8859_3 = gdic.wxFONTENCODING_ISO8859_3
-wxFONTENCODING_ISO8859_4 = gdic.wxFONTENCODING_ISO8859_4
-wxFONTENCODING_ISO8859_5 = gdic.wxFONTENCODING_ISO8859_5
-wxFONTENCODING_ISO8859_6 = gdic.wxFONTENCODING_ISO8859_6
-wxFONTENCODING_ISO8859_7 = gdic.wxFONTENCODING_ISO8859_7
-wxFONTENCODING_ISO8859_8 = gdic.wxFONTENCODING_ISO8859_8
-wxFONTENCODING_ISO8859_9 = gdic.wxFONTENCODING_ISO8859_9
-wxFONTENCODING_ISO8859_10 = gdic.wxFONTENCODING_ISO8859_10
-wxFONTENCODING_ISO8859_11 = gdic.wxFONTENCODING_ISO8859_11
-wxFONTENCODING_ISO8859_12 = gdic.wxFONTENCODING_ISO8859_12
-wxFONTENCODING_ISO8859_13 = gdic.wxFONTENCODING_ISO8859_13
-wxFONTENCODING_ISO8859_14 = gdic.wxFONTENCODING_ISO8859_14
-wxFONTENCODING_ISO8859_15 = gdic.wxFONTENCODING_ISO8859_15
-wxFONTENCODING_ISO8859_MAX = gdic.wxFONTENCODING_ISO8859_MAX
-wxFONTENCODING_KOI8 = gdic.wxFONTENCODING_KOI8
-wxFONTENCODING_ALTERNATIVE = gdic.wxFONTENCODING_ALTERNATIVE
-wxFONTENCODING_BULGARIAN = gdic.wxFONTENCODING_BULGARIAN
-wxFONTENCODING_CP437 = gdic.wxFONTENCODING_CP437
-wxFONTENCODING_CP850 = gdic.wxFONTENCODING_CP850
-wxFONTENCODING_CP852 = gdic.wxFONTENCODING_CP852
-wxFONTENCODING_CP855 = gdic.wxFONTENCODING_CP855
-wxFONTENCODING_CP866 = gdic.wxFONTENCODING_CP866
-wxFONTENCODING_CP874 = gdic.wxFONTENCODING_CP874
-wxFONTENCODING_CP932 = gdic.wxFONTENCODING_CP932
-wxFONTENCODING_CP936 = gdic.wxFONTENCODING_CP936
-wxFONTENCODING_CP949 = gdic.wxFONTENCODING_CP949
-wxFONTENCODING_CP950 = gdic.wxFONTENCODING_CP950
-wxFONTENCODING_CP1250 = gdic.wxFONTENCODING_CP1250
-wxFONTENCODING_CP1251 = gdic.wxFONTENCODING_CP1251
-wxFONTENCODING_CP1252 = gdic.wxFONTENCODING_CP1252
-wxFONTENCODING_CP1253 = gdic.wxFONTENCODING_CP1253
-wxFONTENCODING_CP1254 = gdic.wxFONTENCODING_CP1254
-wxFONTENCODING_CP1255 = gdic.wxFONTENCODING_CP1255
-wxFONTENCODING_CP1256 = gdic.wxFONTENCODING_CP1256
-wxFONTENCODING_CP1257 = gdic.wxFONTENCODING_CP1257
-wxFONTENCODING_CP12_MAX = gdic.wxFONTENCODING_CP12_MAX
-wxFONTENCODING_UTF7 = gdic.wxFONTENCODING_UTF7
-wxFONTENCODING_UTF8 = gdic.wxFONTENCODING_UTF8
-wxFONTENCODING_UNICODE = gdic.wxFONTENCODING_UNICODE
-wxFONTENCODING_MAX = gdic.wxFONTENCODING_MAX

 wxIMAGELIST_DRAW_NORMAL = gdic.wxIMAGELIST_DRAW_NORMAL
 wxIMAGELIST_DRAW_TRANSPARENT = gdic.wxIMAGELIST_DRAW_TRANSPARENT
 wxIMAGELIST_DRAW_SELECTED = gdic.wxIMAGELIST_DRAW_SELECTED
 wxIMAGELIST_DRAW_NORMAL = gdic.wxIMAGELIST_DRAW_NORMAL
 wxIMAGELIST_DRAW_TRANSPARENT = gdic.wxIMAGELIST_DRAW_TRANSPARENT
 wxIMAGELIST_DRAW_SELECTED = gdic.wxIMAGELIST_DRAW_SELECTED