corrections to dynamic loading for Darwin

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

diff --git a/wxPython/src/mac/misc2.py b/wxPython/src/mac/misc2.py
index 3e9fbe9a5498cb1b954092213b4ffd7ce629b839..ca7c61f44d258896a497d40b9eef8dbd679a85d6 100644 (file)
--- a/wxPython/src/mac/misc2.py
+++ b/wxPython/src/mac/misc2.py
@@ -14,6 +14,19 @@ from events import *
 from streams import *
 
 from utils import *
 from streams import *
 
 from utils import *

+class wxSystemSettingsPtr :
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def __repr__(self):
+        return "<C wxSystemSettings instance at %s>" % (self.this,)
+class wxSystemSettings(wxSystemSettingsPtr):
+    def __init__(self,this):
+        self.this = this
+
+
+
+

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


@@ -123,7 +136,7 @@ class wxFontEnumerator(wxFontEnumeratorPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(misc2c.new_wxFontEnumerator,_args,_kwargs)
         self.thisown = 1
     def __init__(self,*_args,**_kwargs):
         self.this = apply(misc2c.new_wxFontEnumerator,_args,_kwargs)
         self.thisown = 1

-        self._setCallbackInfo(self, wxFontEnumerator)
+        self._setCallbackInfo(self, wxFontEnumerator, 0)

 
 
 
 
 
 


@@ -319,6 +332,9 @@ class wxStopWatchPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     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
     def Start(self, *_args, **_kwargs):
         val = apply(misc2c.wxStopWatch_Start,(self,) + _args, _kwargs)
         return val


@@ -1066,18 +1082,6 @@ wxResourceParseFile = misc2c.wxResourceParseFile
 
 wxResourceParseString = misc2c.wxResourceParseString
 
 
 wxResourceParseString = misc2c.wxResourceParseString
 

-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
-

 wxCaret_GetBlinkTime = misc2c.wxCaret_GetBlinkTime
 
 wxCaret_SetBlinkTime = misc2c.wxCaret_SetBlinkTime
 wxCaret_GetBlinkTime = misc2c.wxCaret_GetBlinkTime
 
 wxCaret_SetBlinkTime = misc2c.wxCaret_SetBlinkTime


@@ -1130,6 +1134,20 @@ def wxWaveData(*_args, **_kwargs):
     if val: val = wxWavePtr(val); val.thisown = 1
     return val
 
     if val: val = wxWavePtr(val); val.thisown = 1
     return val
 

+def wxSystemSettings_GetColour(*_args, **_kwargs):
+    val = apply(misc2c.wxSystemSettings_GetColour,_args,_kwargs)
+    if val: val = wxColourPtr(val); val.thisown = 1
+    return val
+
+def wxSystemSettings_GetFont(*_args, **_kwargs):
+    val = apply(misc2c.wxSystemSettings_GetFont,_args,_kwargs)
+    if val: val = wxFontPtr(val); val.thisown = 1
+    return val
+
+wxSystemSettings_GetMetric = misc2c.wxSystemSettings_GetMetric
+
+wxSystemSettings_HasFeature = misc2c.wxSystemSettings_HasFeature
+

 wxToolTip_Enable = misc2c.wxToolTip_Enable
 
 wxToolTip_SetDelay = misc2c.wxToolTip_SetDelay
 wxToolTip_Enable = misc2c.wxToolTip_Enable
 
 wxToolTip_SetDelay = misc2c.wxToolTip_SetDelay


@@ -1182,16 +1200,6 @@ wxMimeTypesManager_IsOfType = misc2c.wxMimeTypesManager_IsOfType
 
 #-------------- VARIABLE WRAPPERS ------------------
 
 
 #-------------- VARIABLE WRAPPERS ------------------
 

-wxSYS_WHITE_BRUSH = misc2c.wxSYS_WHITE_BRUSH
-wxSYS_LTGRAY_BRUSH = misc2c.wxSYS_LTGRAY_BRUSH
-wxSYS_GRAY_BRUSH = misc2c.wxSYS_GRAY_BRUSH
-wxSYS_DKGRAY_BRUSH = misc2c.wxSYS_DKGRAY_BRUSH
-wxSYS_BLACK_BRUSH = misc2c.wxSYS_BLACK_BRUSH
-wxSYS_NULL_BRUSH = misc2c.wxSYS_NULL_BRUSH
-wxSYS_HOLLOW_BRUSH = misc2c.wxSYS_HOLLOW_BRUSH
-wxSYS_WHITE_PEN = misc2c.wxSYS_WHITE_PEN
-wxSYS_BLACK_PEN = misc2c.wxSYS_BLACK_PEN
-wxSYS_NULL_PEN = misc2c.wxSYS_NULL_PEN

 wxSYS_OEM_FIXED_FONT = misc2c.wxSYS_OEM_FIXED_FONT
 wxSYS_ANSI_FIXED_FONT = misc2c.wxSYS_ANSI_FIXED_FONT
 wxSYS_ANSI_VAR_FONT = misc2c.wxSYS_ANSI_VAR_FONT
 wxSYS_OEM_FIXED_FONT = misc2c.wxSYS_OEM_FIXED_FONT
 wxSYS_ANSI_FIXED_FONT = misc2c.wxSYS_ANSI_FIXED_FONT
 wxSYS_ANSI_VAR_FONT = misc2c.wxSYS_ANSI_VAR_FONT


@@ -1202,6 +1210,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_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
 wxSYS_COLOUR_ACTIVECAPTION = misc2c.wxSYS_COLOUR_ACTIVECAPTION
 wxSYS_COLOUR_INACTIVECAPTION = misc2c.wxSYS_COLOUR_INACTIVECAPTION
 wxSYS_COLOUR_MENU = misc2c.wxSYS_COLOUR_MENU


@@ -1216,21 +1225,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_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_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_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_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_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_LISTBOX = misc2c.wxSYS_COLOUR_LISTBOX
+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
 wxSYS_MOUSE_BUTTONS = misc2c.wxSYS_MOUSE_BUTTONS
 wxSYS_BORDER_X = misc2c.wxSYS_BORDER_X
 wxSYS_BORDER_Y = misc2c.wxSYS_BORDER_Y


@@ -1268,6 +1283,8 @@ wxSYS_NETWORK_PRESENT = misc2c.wxSYS_NETWORK_PRESENT
 wxSYS_PENWINDOWS_PRESENT = misc2c.wxSYS_PENWINDOWS_PRESENT
 wxSYS_SHOW_SOUNDS = misc2c.wxSYS_SHOW_SOUNDS
 wxSYS_SWAP_BUTTONS = misc2c.wxSYS_SWAP_BUTTONS
 wxSYS_PENWINDOWS_PRESENT = misc2c.wxSYS_PENWINDOWS_PRESENT
 wxSYS_SHOW_SOUNDS = misc2c.wxSYS_SHOW_SOUNDS
 wxSYS_SWAP_BUTTONS = misc2c.wxSYS_SWAP_BUTTONS

+wxSYS_CAN_DRAW_FRAME_DECORATIONS = misc2c.wxSYS_CAN_DRAW_FRAME_DECORATIONS
+wxSYS_CAN_ICONIZE_FRAME = misc2c.wxSYS_CAN_ICONIZE_FRAME

 wxLOG_FatalError = misc2c.wxLOG_FatalError
 wxLOG_Error = misc2c.wxLOG_Error
 wxLOG_Warning = misc2c.wxLOG_Warning
 wxLOG_FatalError = misc2c.wxLOG_FatalError
 wxLOG_Error = misc2c.wxLOG_Error
 wxLOG_Warning = misc2c.wxLOG_Warning