fixed bug in generation of thumb scroll events

[wxWidgets.git] / wxPython / src / mac / misc2.py

diff --git a/wxPython/src/mac/misc2.py b/wxPython/src/mac/misc2.py
index 090bc7b8da11c350c1ad59668a8b4776ed4b3821..ed4dcf89ef19e681b16301b31c92c83f5e24eca8 100644 (file)
--- a/wxPython/src/mac/misc2.py
+++ b/wxPython/src/mac/misc2.py
@@ -7,6 +7,8 @@ from misc import *
 
 from gdi import *
 
+from fonts import *
+
 from clip_dnd import *
 
 from events import *
@@ -108,39 +110,6 @@ class wxCaret(wxCaretPtr):
 
 
 
-class wxFontEnumeratorPtr :
-    def __init__(self,this):
-        self.this = this
-        self.thisown = 0
-    def __del__(self,misc2c=misc2c):
-        if self.thisown == 1 :
-            misc2c.delete_wxFontEnumerator(self)
-    def _setCallbackInfo(self, *_args, **_kwargs):
-        val = apply(misc2c.wxFontEnumerator__setCallbackInfo,(self,) + _args, _kwargs)
-        return val
-    def EnumerateFacenames(self, *_args, **_kwargs):
-        val = apply(misc2c.wxFontEnumerator_EnumerateFacenames,(self,) + _args, _kwargs)
-        return val
-    def EnumerateEncodings(self, *_args, **_kwargs):
-        val = apply(misc2c.wxFontEnumerator_EnumerateEncodings,(self,) + _args, _kwargs)
-        return val
-    def GetEncodings(self, *_args, **_kwargs):
-        val = apply(misc2c.wxFontEnumerator_GetEncodings,(self,) + _args, _kwargs)
-        return val
-    def GetFacenames(self, *_args, **_kwargs):
-        val = apply(misc2c.wxFontEnumerator_GetFacenames,(self,) + _args, _kwargs)
-        return val
-    def __repr__(self):
-        return "<C wxFontEnumerator instance at %s>" % (self.this,)
-class wxFontEnumerator(wxFontEnumeratorPtr):
-    def __init__(self,*_args,**_kwargs):
-        self.this = apply(misc2c.new_wxFontEnumerator,_args,_kwargs)
-        self.thisown = 1
-        self._setCallbackInfo(self, wxFontEnumerator, 0)
-
-
-
-
 class wxBusyCursorPtr :
     def __init__(self,this):
         self.this = this
@@ -332,6 +301,9 @@ class wxStopWatchPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
+    def __del__(self,misc2c=misc2c):
+        if self.thisown == 1 :
+            misc2c.delete_wxStopWatch(self)
     def Start(self, *_args, **_kwargs):
         val = apply(misc2c.wxStopWatch_Start,(self,) + _args, _kwargs)
         return val
@@ -364,9 +336,6 @@ class wxLogPtr :
     def HasPendingMessages(self, *_args, **_kwargs):
         val = apply(misc2c.wxLog_HasPendingMessages,(self,) + _args, _kwargs)
         return val
-    def SetVerbose(self, *_args, **_kwargs):
-        val = apply(misc2c.wxLog_SetVerbose,(self,) + _args, _kwargs)
-        return val
     def GetVerbose(self, *_args, **_kwargs):
         val = apply(misc2c.wxLog_GetVerbose,(self,) + _args, _kwargs)
         return val
@@ -962,8 +931,8 @@ class wxFileHistoryPtr(wxObjectPtr):
     def AddFilesToMenu(self, *_args, **_kwargs):
         val = apply(misc2c.wxFileHistory_AddFilesToMenu,(self,) + _args, _kwargs)
         return val
-    def AddFilesToSingleMenu(self, *_args, **_kwargs):
-        val = apply(misc2c.wxFileHistory_AddFilesToSingleMenu,(self,) + _args, _kwargs)
+    def AddFilesToThisMenu(self, *_args, **_kwargs):
+        val = apply(misc2c.wxFileHistory_AddFilesToThisMenu,(self,) + _args, _kwargs)
         return val
     def GetHistoryFile(self, *_args, **_kwargs):
         val = apply(misc2c.wxFileHistory_GetHistoryFile,(self,) + _args, _kwargs)
@@ -990,6 +959,12 @@ class wxFileHistory(wxFileHistoryPtr):
 
 wxFileSelector = misc2c.wxFileSelector
 
+wxLoadFileSelector = misc2c.wxLoadFileSelector
+
+wxSaveFileSelector = misc2c.wxSaveFileSelector
+
+wxDirSelector = misc2c.wxDirSelector
+
 wxGetTextFromUser = misc2c.wxGetTextFromUser
 
 wxGetPasswordFromUser = misc2c.wxGetPasswordFromUser
@@ -1145,18 +1120,6 @@ wxSystemSettings_GetMetric = misc2c.wxSystemSettings_GetMetric
 
 wxSystemSettings_HasFeature = misc2c.wxSystemSettings_HasFeature
 
-def wxSystemSettings_GetSystemColour(*_args, **_kwargs):
-    val = apply(misc2c.wxSystemSettings_GetSystemColour,_args,_kwargs)
-    if val: val = wxColourPtr(val); val.thisown = 1
-    return val
-
-def wxSystemSettings_GetSystemFont(*_args, **_kwargs):
-    val = apply(misc2c.wxSystemSettings_GetSystemFont,_args,_kwargs)
-    if val: val = wxFontPtr(val); val.thisown = 1
-    return val
-
-wxSystemSettings_GetSystemMetric = misc2c.wxSystemSettings_GetSystemMetric
-
 wxToolTip_Enable = misc2c.wxToolTip_Enable
 
 wxToolTip_SetDelay = misc2c.wxToolTip_SetDelay
@@ -1183,6 +1146,8 @@ wxLog_Suspend = misc2c.wxLog_Suspend
 
 wxLog_Resume = misc2c.wxLog_Resume
 
+wxLog_SetVerbose = misc2c.wxLog_SetVerbose
+
 wxLog_DontCreateOnDemand = misc2c.wxLog_DontCreateOnDemand
 
 wxLog_SetTraceMask = misc2c.wxLog_SetTraceMask
@@ -1219,6 +1184,7 @@ wxSYS_SYSTEM_FIXED_FONT = misc2c.wxSYS_SYSTEM_FIXED_FONT
 wxSYS_DEFAULT_GUI_FONT = misc2c.wxSYS_DEFAULT_GUI_FONT
 wxSYS_COLOUR_SCROLLBAR = misc2c.wxSYS_COLOUR_SCROLLBAR
 wxSYS_COLOUR_BACKGROUND = misc2c.wxSYS_COLOUR_BACKGROUND
+wxSYS_COLOUR_DESKTOP = misc2c.wxSYS_COLOUR_DESKTOP
 wxSYS_COLOUR_ACTIVECAPTION = misc2c.wxSYS_COLOUR_ACTIVECAPTION
 wxSYS_COLOUR_INACTIVECAPTION = misc2c.wxSYS_COLOUR_INACTIVECAPTION
 wxSYS_COLOUR_MENU = misc2c.wxSYS_COLOUR_MENU
@@ -1233,22 +1199,27 @@ wxSYS_COLOUR_APPWORKSPACE = misc2c.wxSYS_COLOUR_APPWORKSPACE
 wxSYS_COLOUR_HIGHLIGHT = misc2c.wxSYS_COLOUR_HIGHLIGHT
 wxSYS_COLOUR_HIGHLIGHTTEXT = misc2c.wxSYS_COLOUR_HIGHLIGHTTEXT
 wxSYS_COLOUR_BTNFACE = misc2c.wxSYS_COLOUR_BTNFACE
+wxSYS_COLOUR_3DFACE = misc2c.wxSYS_COLOUR_3DFACE
 wxSYS_COLOUR_BTNSHADOW = misc2c.wxSYS_COLOUR_BTNSHADOW
+wxSYS_COLOUR_3DSHADOW = misc2c.wxSYS_COLOUR_3DSHADOW
 wxSYS_COLOUR_GRAYTEXT = misc2c.wxSYS_COLOUR_GRAYTEXT
 wxSYS_COLOUR_BTNTEXT = misc2c.wxSYS_COLOUR_BTNTEXT
 wxSYS_COLOUR_INACTIVECAPTIONTEXT = misc2c.wxSYS_COLOUR_INACTIVECAPTIONTEXT
 wxSYS_COLOUR_BTNHIGHLIGHT = misc2c.wxSYS_COLOUR_BTNHIGHLIGHT
+wxSYS_COLOUR_BTNHILIGHT = misc2c.wxSYS_COLOUR_BTNHILIGHT
+wxSYS_COLOUR_3DHIGHLIGHT = misc2c.wxSYS_COLOUR_3DHIGHLIGHT
+wxSYS_COLOUR_3DHILIGHT = misc2c.wxSYS_COLOUR_3DHILIGHT
 wxSYS_COLOUR_3DDKSHADOW = misc2c.wxSYS_COLOUR_3DDKSHADOW
 wxSYS_COLOUR_3DLIGHT = misc2c.wxSYS_COLOUR_3DLIGHT
 wxSYS_COLOUR_INFOTEXT = misc2c.wxSYS_COLOUR_INFOTEXT
 wxSYS_COLOUR_INFOBK = misc2c.wxSYS_COLOUR_INFOBK
 wxSYS_COLOUR_LISTBOX = misc2c.wxSYS_COLOUR_LISTBOX
-wxSYS_COLOUR_DESKTOP = misc2c.wxSYS_COLOUR_DESKTOP
-wxSYS_COLOUR_3DFACE = misc2c.wxSYS_COLOUR_3DFACE
-wxSYS_COLOUR_3DSHADOW = misc2c.wxSYS_COLOUR_3DSHADOW
-wxSYS_COLOUR_3DHIGHLIGHT = misc2c.wxSYS_COLOUR_3DHIGHLIGHT
-wxSYS_COLOUR_3DHILIGHT = misc2c.wxSYS_COLOUR_3DHILIGHT
-wxSYS_COLOUR_BTNHILIGHT = misc2c.wxSYS_COLOUR_BTNHILIGHT
+wxSYS_COLOUR_HOTLIGHT = misc2c.wxSYS_COLOUR_HOTLIGHT
+wxSYS_COLOUR_GRADIENTACTIVECAPTION = misc2c.wxSYS_COLOUR_GRADIENTACTIVECAPTION
+wxSYS_COLOUR_GRADIENTINACTIVECAPTION = misc2c.wxSYS_COLOUR_GRADIENTINACTIVECAPTION
+wxSYS_COLOUR_MENUHILIGHT = misc2c.wxSYS_COLOUR_MENUHILIGHT
+wxSYS_COLOUR_MENUBAR = misc2c.wxSYS_COLOUR_MENUBAR
+wxSYS_COLOUR_MAX = misc2c.wxSYS_COLOUR_MAX
 wxSYS_MOUSE_BUTTONS = misc2c.wxSYS_MOUSE_BUTTONS
 wxSYS_BORDER_X = misc2c.wxSYS_BORDER_X
 wxSYS_BORDER_Y = misc2c.wxSYS_BORDER_Y
@@ -1299,6 +1270,10 @@ wxLOG_Trace = misc2c.wxLOG_Trace
 wxLOG_Progress = misc2c.wxLOG_Progress
 wxLOG_User = misc2c.wxLOG_User
 wxEVT_END_PROCESS = misc2c.wxEVT_END_PROCESS
+wxEXEC_ASYNC = misc2c.wxEXEC_ASYNC
+wxEXEC_SYNC = misc2c.wxEXEC_SYNC
+wxEXEC_NOHIDE = misc2c.wxEXEC_NOHIDE
+wxEXEC_MAKE_GROUP_LEADER = misc2c.wxEXEC_MAKE_GROUP_LEADER
 wxMAILCAP_STANDARD = misc2c.wxMAILCAP_STANDARD
 wxMAILCAP_NETSCAPE = misc2c.wxMAILCAP_NETSCAPE
 wxMAILCAP_KDE = misc2c.wxMAILCAP_KDE