X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/68320e40cde2ceaac4645db9ae2989e3101fde45..47eea71e188b7b412f319e729c2a0d8f07eacaf9:/wxPython/src/msw/misc2.py?ds=sidebyside

diff --git a/wxPython/src/msw/misc2.py b/wxPython/src/msw/misc2.py
index 135de3b950..26c88e98f2 100644
--- a/wxPython/src/msw/misc2.py
+++ b/wxPython/src/msw/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
@@ -367,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
@@ -458,23 +424,6 @@ class wxLogWindow(wxLogWindowPtr):
 
 
 
-class wxLogNullPtr :
-    def __init__(self,this):
-        self.this = this
-        self.thisown = 0
-    def __del__(self,misc2c=misc2c):
-        if self.thisown == 1 :
-            misc2c.delete_wxLogNull(self)
-    def __repr__(self):
-        return "<C wxLogNull instance at %s>" % (self.this,)
-class wxLogNull(wxLogNullPtr):
-    def __init__(self,*_args,**_kwargs):
-        self.this = apply(misc2c.new_wxLogNull,_args,_kwargs)
-        self.thisown = 1
-
-
-
-
 class wxLogChainPtr(wxLogPtr):
     def __init__(self,this):
         self.this = this
@@ -502,6 +451,23 @@ class wxLogChain(wxLogChainPtr):
 
 
 
+class wxLogNullPtr :
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def __del__(self,misc2c=misc2c):
+        if self.thisown == 1 :
+            misc2c.delete_wxLogNull(self)
+    def __repr__(self):
+        return "<C wxLogNull instance at %s>" % (self.this,)
+class wxLogNull(wxLogNullPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(misc2c.new_wxLogNull,_args,_kwargs)
+        self.thisown = 1
+
+
+
+
 class wxPyLogPtr(wxLogPtr):
     def __init__(self,this):
         self.this = this
@@ -934,6 +900,24 @@ class wxMimeTypesManager(wxMimeTypesManagerPtr):
 
 
 
+class wxArtProviderPtr(wxObjectPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def _setCallbackInfo(self, *_args, **_kwargs):
+        val = apply(misc2c.wxArtProvider__setCallbackInfo,(self,) + _args, _kwargs)
+        return val
+    def __repr__(self):
+        return "<C wxArtProvider instance at %s>" % (self.this,)
+class wxArtProvider(wxArtProviderPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(misc2c.new_wxArtProvider,_args,_kwargs)
+        self.thisown = 1
+        self._setCallbackInfo(self, wxArtProvider)
+
+
+
+
 class wxFileHistoryPtr(wxObjectPtr):
     def __init__(self,this):
         self.this = this
@@ -965,8 +949,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)
@@ -993,6 +977,12 @@ class wxFileHistory(wxFileHistoryPtr):
 
 wxFileSelector = misc2c.wxFileSelector
 
+wxLoadFileSelector = misc2c.wxLoadFileSelector
+
+wxSaveFileSelector = misc2c.wxSaveFileSelector
+
+wxDirSelector = misc2c.wxDirSelector
+
 wxGetTextFromUser = misc2c.wxGetTextFromUser
 
 wxGetPasswordFromUser = misc2c.wxGetPasswordFromUser
@@ -1034,14 +1024,6 @@ def wxGetClientDisplayRect(*_args, **_kwargs):
 
 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):
@@ -1060,6 +1042,10 @@ wxCheckForInterrupt = misc2c.wxCheckForInterrupt
 
 wxFlushEvents = misc2c.wxFlushEvents
 
+def wxGetTopLevelParent(*_args, **_kwargs):
+    val = apply(misc2c.wxGetTopLevelParent,_args,_kwargs)
+    return val
+
 wxResourceAddIdentifier = misc2c.wxResourceAddIdentifier
 
 wxResourceClear = misc2c.wxResourceClear
@@ -1133,6 +1119,14 @@ wxLogStatusFrame = misc2c.wxLogStatusFrame
 
 wxLogSysError = misc2c.wxLogSysError
 
+wxLogTrace = misc2c.wxLogTrace
+
+wxLogTraceMask = misc2c.wxLogTraceMask
+
+wxLogGeneric = misc2c.wxLogGeneric
+
+wxSafeShowMessage = misc2c.wxSafeShowMessage
+
 wxExecute = misc2c.wxExecute
 
 def wxWaveData(*_args, **_kwargs):
@@ -1154,6 +1148,10 @@ wxSystemSettings_GetMetric = misc2c.wxSystemSettings_GetMetric
 
 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
@@ -1180,6 +1178,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
@@ -1202,6 +1202,24 @@ wxFileType_ExpandCommand = misc2c.wxFileType_ExpandCommand
 
 wxMimeTypesManager_IsOfType = misc2c.wxMimeTypesManager_IsOfType
 
+wxArtProvider_PushProvider = misc2c.wxArtProvider_PushProvider
+
+wxArtProvider_PopProvider = misc2c.wxArtProvider_PopProvider
+
+wxArtProvider_RemoveProvider = misc2c.wxArtProvider_RemoveProvider
+
+def wxArtProvider_GetBitmap(*_args, **_kwargs):
+    val = apply(misc2c.wxArtProvider_GetBitmap,_args,_kwargs)
+    if val: val = wxBitmapPtr(val); val.thisown = 1
+    return val
+
+def wxArtProvider_GetIcon(*_args, **_kwargs):
+    val = apply(misc2c.wxArtProvider_GetIcon,_args,_kwargs)
+    if val: val = wxIconPtr(val); val.thisown = 1
+    return val
+
+wxArtProvider_CleanUpProviders = misc2c.wxArtProvider_CleanUpProviders
+
 
 
 #-------------- VARIABLE WRAPPERS ------------------
@@ -1216,6 +1234,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
@@ -1230,22 +1249,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
@@ -1285,6 +1309,11 @@ 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
+wxSYS_SCREEN_NONE = misc2c.wxSYS_SCREEN_NONE
+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
@@ -1295,7 +1324,28 @@ wxLOG_Debug = misc2c.wxLOG_Debug
 wxLOG_Trace = misc2c.wxLOG_Trace
 wxLOG_Progress = misc2c.wxLOG_Progress
 wxLOG_User = misc2c.wxLOG_User
+wxTRACE_MemAlloc = misc2c.wxTRACE_MemAlloc
+wxTRACE_Messages = misc2c.wxTRACE_Messages
+wxTRACE_ResAlloc = misc2c.wxTRACE_ResAlloc
+wxTRACE_RefCount = misc2c.wxTRACE_RefCount
+wxTRACE_OleCalls = misc2c.wxTRACE_OleCalls
+wxTraceMemAlloc = misc2c.wxTraceMemAlloc
+wxTraceMessages = misc2c.wxTraceMessages
+wxTraceResAlloc = misc2c.wxTraceResAlloc
+wxTraceRefCount = misc2c.wxTraceRefCount
+wxTraceOleCalls = misc2c.wxTraceOleCalls
 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
+wxJOYSTICK1 = misc2c.wxJOYSTICK1
+wxJOYSTICK2 = misc2c.wxJOYSTICK2
+wxJOY_BUTTON_ANY = misc2c.wxJOY_BUTTON_ANY
+wxJOY_BUTTON1 = misc2c.wxJOY_BUTTON1
+wxJOY_BUTTON2 = misc2c.wxJOY_BUTTON2
+wxJOY_BUTTON3 = misc2c.wxJOY_BUTTON3
+wxJOY_BUTTON4 = misc2c.wxJOY_BUTTON4
 wxMAILCAP_STANDARD = misc2c.wxMAILCAP_STANDARD
 wxMAILCAP_NETSCAPE = misc2c.wxMAILCAP_NETSCAPE
 wxMAILCAP_KDE = misc2c.wxMAILCAP_KDE
@@ -1303,3 +1353,40 @@ wxMAILCAP_GNOME = misc2c.wxMAILCAP_GNOME
 wxMAILCAP_ALL = misc2c.wxMAILCAP_ALL
 cvar = misc2c.cvar
 wxTheMimeTypesManager = wxMimeTypesManagerPtr(misc2c.cvar.wxTheMimeTypesManager)
+wxART_TOOLBAR = misc2c.wxART_TOOLBAR
+wxART_MENU = misc2c.wxART_MENU
+wxART_FRAME_ICON = misc2c.wxART_FRAME_ICON
+wxART_CMN_DIALOG = misc2c.wxART_CMN_DIALOG
+wxART_HELP_BROWSER = misc2c.wxART_HELP_BROWSER
+wxART_MESSAGE_BOX = misc2c.wxART_MESSAGE_BOX
+wxART_OTHER = misc2c.wxART_OTHER
+wxART_ADD_BOOKMARK = misc2c.wxART_ADD_BOOKMARK
+wxART_DEL_BOOKMARK = misc2c.wxART_DEL_BOOKMARK
+wxART_HELP_SIDE_PANEL = misc2c.wxART_HELP_SIDE_PANEL
+wxART_HELP_SETTINGS = misc2c.wxART_HELP_SETTINGS
+wxART_HELP_BOOK = misc2c.wxART_HELP_BOOK
+wxART_HELP_FOLDER = misc2c.wxART_HELP_FOLDER
+wxART_HELP_PAGE = misc2c.wxART_HELP_PAGE
+wxART_GO_BACK = misc2c.wxART_GO_BACK
+wxART_GO_FORWARD = misc2c.wxART_GO_FORWARD
+wxART_GO_UP = misc2c.wxART_GO_UP
+wxART_GO_DOWN = misc2c.wxART_GO_DOWN
+wxART_GO_TO_PARENT = misc2c.wxART_GO_TO_PARENT
+wxART_GO_HOME = misc2c.wxART_GO_HOME
+wxART_FILE_OPEN = misc2c.wxART_FILE_OPEN
+wxART_PRINT = misc2c.wxART_PRINT
+wxART_HELP = misc2c.wxART_HELP
+wxART_TIP = misc2c.wxART_TIP
+wxART_REPORT_VIEW = misc2c.wxART_REPORT_VIEW
+wxART_LIST_VIEW = misc2c.wxART_LIST_VIEW
+wxART_NEW_DIR = misc2c.wxART_NEW_DIR
+wxART_FOLDER = misc2c.wxART_FOLDER
+wxART_GO_DIR_UP = misc2c.wxART_GO_DIR_UP
+wxART_EXECUTABLE_FILE = misc2c.wxART_EXECUTABLE_FILE
+wxART_NORMAL_FILE = misc2c.wxART_NORMAL_FILE
+wxART_TICK_MARK = misc2c.wxART_TICK_MARK
+wxART_CROSS_MARK = misc2c.wxART_CROSS_MARK
+wxART_ERROR = misc2c.wxART_ERROR
+wxART_QUESTION = misc2c.wxART_QUESTION
+wxART_WARNING = misc2c.wxART_WARNING
+wxART_INFORMATION = misc2c.wxART_INFORMATION