applied SourceForge patch # 544164 (hidden virtual method in wxMenuBar)

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

diff --git a/wxPython/src/mac/misc2.py b/wxPython/src/mac/misc2.py
index aad17d6eac36955fe26aa1bedfde9e309235e91f..3cb4e32448c021e311fd3d6847ae71baec22f375 100644 (file)
--- a/wxPython/src/mac/misc2.py
+++ b/wxPython/src/mac/misc2.py
@@ -1006,14 +1006,6 @@ def wxGetClientDisplayRect(*_args, **_kwargs):
 
 wxSetCursor = misc2c.wxSetCursor
 
 
 wxSetCursor = misc2c.wxSetCursor
 

-def wxFindWindowByLabel(*_args, **_kwargs):
-    val = apply(misc2c.wxFindWindowByLabel,_args,_kwargs)
-    return val
-
-def wxFindWindowByName(*_args, **_kwargs):
-    val = apply(misc2c.wxFindWindowByName,_args,_kwargs)
-    return val
-

 wxBeginBusyCursor = misc2c.wxBeginBusyCursor
 
 def wxGetActiveWindow(*_args, **_kwargs):
 wxBeginBusyCursor = misc2c.wxBeginBusyCursor
 
 def wxGetActiveWindow(*_args, **_kwargs):


@@ -1103,6 +1095,8 @@ wxLogStatusFrame = misc2c.wxLogStatusFrame
 
 wxLogSysError = misc2c.wxLogSysError
 
 
 wxLogSysError = misc2c.wxLogSysError
 

+wxSafeShowMessage = misc2c.wxSafeShowMessage
+

 wxExecute = misc2c.wxExecute
 
 def wxWaveData(*_args, **_kwargs):
 wxExecute = misc2c.wxExecute
 
 def wxWaveData(*_args, **_kwargs):


@@ -1124,6 +1118,10 @@ wxSystemSettings_GetMetric = misc2c.wxSystemSettings_GetMetric
 
 wxSystemSettings_HasFeature = misc2c.wxSystemSettings_HasFeature
 
 
 wxSystemSettings_HasFeature = misc2c.wxSystemSettings_HasFeature
 

+wxSystemSettings_GetScreenType = misc2c.wxSystemSettings_GetScreenType
+
+wxSystemSettings_SetScreenType = misc2c.wxSystemSettings_SetScreenType
+

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


@@ -1264,10 +1262,10 @@ 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
 wxSYS_SCREEN_NONE = misc2c.wxSYS_SCREEN_NONE
 wxSYS_CAN_DRAW_FRAME_DECORATIONS = misc2c.wxSYS_CAN_DRAW_FRAME_DECORATIONS
 wxSYS_CAN_ICONIZE_FRAME = misc2c.wxSYS_CAN_ICONIZE_FRAME
 wxSYS_SCREEN_NONE = misc2c.wxSYS_SCREEN_NONE

-wxSYS_SCREEN_DESKTOP = misc2c.wxSYS_SCREEN_DESKTOP
-wxSYS_SCREEN_SMALL = misc2c.wxSYS_SCREEN_SMALL
-wxSYS_SCREEN_PDA = misc2c.wxSYS_SCREEN_PDA

 wxSYS_SCREEN_TINY = misc2c.wxSYS_SCREEN_TINY
 wxSYS_SCREEN_TINY = misc2c.wxSYS_SCREEN_TINY

+wxSYS_SCREEN_PDA = misc2c.wxSYS_SCREEN_PDA
+wxSYS_SCREEN_SMALL = misc2c.wxSYS_SCREEN_SMALL
+wxSYS_SCREEN_DESKTOP = misc2c.wxSYS_SCREEN_DESKTOP

 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