Use an NSImageView instead of an NSView (nothing works yet)

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

diff --git a/wxPython/src/msw/wizard.py b/wxPython/src/msw/wizard.py
index 3891696b44d2204226024e3c3139c4f1419c0dc1..bd385ce0b96fa35ffdbc404578a35f82d74425ed 100644 (file)
--- a/wxPython/src/msw/wizard.py
+++ b/wxPython/src/msw/wizard.py
@@ -32,22 +32,25 @@ def EVT_WIZARD_CANCEL(win, id, func):
 def EVT_WIZARD_HELP(win, id, func):
     win.Connect(id, -1, wxEVT_WIZARD_HELP, func)
 
 def EVT_WIZARD_HELP(win, id, func):
     win.Connect(id, -1, wxEVT_WIZARD_HELP, func)
 

+def EVT_WIZARD_FINISHED(win, id, func):
+    win.Connect(id, -1, wxEVT_WIZARD_FINISHED, func)
+

 
 class wxWizardEventPtr(wxNotifyEventPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def GetDirection(self, *_args, **_kwargs):
 
 class wxWizardEventPtr(wxNotifyEventPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def GetDirection(self, *_args, **_kwargs):

-        val = apply(wizardc.wxWizardEvent_GetDirection,(self,) + _args, _kwargs)
+        val = wizardc.wxWizardEvent_GetDirection(self, *_args, **_kwargs)

         return val
     def GetPage(self, *_args, **_kwargs):
         return val
     def GetPage(self, *_args, **_kwargs):

-        val = apply(wizardc.wxWizardEvent_GetPage,(self,) + _args, _kwargs)
+        val = wizardc.wxWizardEvent_GetPage(self, *_args, **_kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxWizardEvent instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxWizardEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)

 class wxWizardEvent(wxWizardEventPtr):
     def __init__(self,*_args,**_kwargs):
 class wxWizardEvent(wxWizardEventPtr):
     def __init__(self,*_args,**_kwargs):

-        self.this = apply(wizardc.new_wxWizardEvent,_args,_kwargs)
+        self.this = wizardc.new_wxWizardEvent(*_args,**_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -58,23 +61,20 @@ class wxWizardPagePtr(wxPanelPtr):
         self.this = this
         self.thisown = 0
     def Create(self, *_args, **_kwargs):
         self.this = this
         self.thisown = 0
     def Create(self, *_args, **_kwargs):

-        val = apply(wizardc.wxWizardPage_Create,(self,) + _args, _kwargs)
-        return val
-    def Init(self, *_args, **_kwargs):
-        val = apply(wizardc.wxWizardPage_Init,(self,) + _args, _kwargs)
+        val = wizardc.wxWizardPage_Create(self, *_args, **_kwargs)

         return val
     def GetPrev(self, *_args, **_kwargs):
         return val
     def GetPrev(self, *_args, **_kwargs):

-        val = apply(wizardc.wxWizardPage_GetPrev,(self,) + _args, _kwargs)
+        val = wizardc.wxWizardPage_GetPrev(self, *_args, **_kwargs)

         return val
     def GetNext(self, *_args, **_kwargs):
         return val
     def GetNext(self, *_args, **_kwargs):

-        val = apply(wizardc.wxWizardPage_GetNext,(self,) + _args, _kwargs)
+        val = wizardc.wxWizardPage_GetNext(self, *_args, **_kwargs)

         return val
     def GetBitmap(self, *_args, **_kwargs):
         return val
     def GetBitmap(self, *_args, **_kwargs):

-        val = apply(wizardc.wxWizardPage_GetBitmap,(self,) + _args, _kwargs)
+        val = wizardc.wxWizardPage_GetBitmap(self, *_args, **_kwargs)

         if val: val = wxBitmapPtr(val) ; val.thisown = 1
         return val
     def __repr__(self):
         if val: val = wxBitmapPtr(val) ; val.thisown = 1
         return val
     def __repr__(self):

-        return "<C wxWizardPage instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxWizardPage instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)

 class wxWizardPage(wxWizardPagePtr):
     def __init__(self,this):
         self.this = this
 class wxWizardPage(wxWizardPagePtr):
     def __init__(self,this):
         self.this = this


@@ -87,73 +87,73 @@ class wxPyWizardPagePtr(wxWizardPagePtr):
         self.this = this
         self.thisown = 0
     def Create(self, *_args, **_kwargs):
         self.this = this
         self.thisown = 0
     def Create(self, *_args, **_kwargs):

-        val = apply(wizardc.wxPyWizardPage_Create,(self,) + _args, _kwargs)
+        val = wizardc.wxPyWizardPage_Create(self, *_args, **_kwargs)

         return val
     def _setCallbackInfo(self, *_args, **_kwargs):
         return val
     def _setCallbackInfo(self, *_args, **_kwargs):

-        val = apply(wizardc.wxPyWizardPage__setCallbackInfo,(self,) + _args, _kwargs)
+        val = wizardc.wxPyWizardPage__setCallbackInfo(self, *_args, **_kwargs)

         return val
     def base_DoMoveWindow(self, *_args, **_kwargs):
         return val
     def base_DoMoveWindow(self, *_args, **_kwargs):

-        val = apply(wizardc.wxPyWizardPage_base_DoMoveWindow,(self,) + _args, _kwargs)
+        val = wizardc.wxPyWizardPage_base_DoMoveWindow(self, *_args, **_kwargs)

         return val
     def base_DoSetSize(self, *_args, **_kwargs):
         return val
     def base_DoSetSize(self, *_args, **_kwargs):

-        val = apply(wizardc.wxPyWizardPage_base_DoSetSize,(self,) + _args, _kwargs)
+        val = wizardc.wxPyWizardPage_base_DoSetSize(self, *_args, **_kwargs)

         return val
     def base_DoSetClientSize(self, *_args, **_kwargs):
         return val
     def base_DoSetClientSize(self, *_args, **_kwargs):

-        val = apply(wizardc.wxPyWizardPage_base_DoSetClientSize,(self,) + _args, _kwargs)
+        val = wizardc.wxPyWizardPage_base_DoSetClientSize(self, *_args, **_kwargs)

         return val
     def base_DoSetVirtualSize(self, *_args, **_kwargs):
         return val
     def base_DoSetVirtualSize(self, *_args, **_kwargs):

-        val = apply(wizardc.wxPyWizardPage_base_DoSetVirtualSize,(self,) + _args, _kwargs)
+        val = wizardc.wxPyWizardPage_base_DoSetVirtualSize(self, *_args, **_kwargs)

         return val
     def base_DoGetSize(self, *_args, **_kwargs):
         return val
     def base_DoGetSize(self, *_args, **_kwargs):

-        val = apply(wizardc.wxPyWizardPage_base_DoGetSize,(self,) + _args, _kwargs)
+        val = wizardc.wxPyWizardPage_base_DoGetSize(self, *_args, **_kwargs)

         return val
     def base_DoGetClientSize(self, *_args, **_kwargs):
         return val
     def base_DoGetClientSize(self, *_args, **_kwargs):

-        val = apply(wizardc.wxPyWizardPage_base_DoGetClientSize,(self,) + _args, _kwargs)
+        val = wizardc.wxPyWizardPage_base_DoGetClientSize(self, *_args, **_kwargs)

         return val
     def base_DoGetPosition(self, *_args, **_kwargs):
         return val
     def base_DoGetPosition(self, *_args, **_kwargs):

-        val = apply(wizardc.wxPyWizardPage_base_DoGetPosition,(self,) + _args, _kwargs)
+        val = wizardc.wxPyWizardPage_base_DoGetPosition(self, *_args, **_kwargs)

         return val
     def base_DoGetVirtualSize(self, *_args, **_kwargs):
         return val
     def base_DoGetVirtualSize(self, *_args, **_kwargs):

-        val = apply(wizardc.wxPyWizardPage_base_DoGetVirtualSize,(self,) + _args, _kwargs)
+        val = wizardc.wxPyWizardPage_base_DoGetVirtualSize(self, *_args, **_kwargs)

         if val: val = wxSizePtr(val) ; val.thisown = 1
         return val
     def base_DoGetBestSize(self, *_args, **_kwargs):
         if val: val = wxSizePtr(val) ; val.thisown = 1
         return val
     def base_DoGetBestSize(self, *_args, **_kwargs):

-        val = apply(wizardc.wxPyWizardPage_base_DoGetBestSize,(self,) + _args, _kwargs)
+        val = wizardc.wxPyWizardPage_base_DoGetBestSize(self, *_args, **_kwargs)

         if val: val = wxSizePtr(val) ; val.thisown = 1
         return val
     def base_InitDialog(self, *_args, **_kwargs):
         if val: val = wxSizePtr(val) ; val.thisown = 1
         return val
     def base_InitDialog(self, *_args, **_kwargs):

-        val = apply(wizardc.wxPyWizardPage_base_InitDialog,(self,) + _args, _kwargs)
+        val = wizardc.wxPyWizardPage_base_InitDialog(self, *_args, **_kwargs)

         return val
     def base_TransferDataToWindow(self, *_args, **_kwargs):
         return val
     def base_TransferDataToWindow(self, *_args, **_kwargs):

-        val = apply(wizardc.wxPyWizardPage_base_TransferDataToWindow,(self,) + _args, _kwargs)
+        val = wizardc.wxPyWizardPage_base_TransferDataToWindow(self, *_args, **_kwargs)

         return val
     def base_TransferDataFromWindow(self, *_args, **_kwargs):
         return val
     def base_TransferDataFromWindow(self, *_args, **_kwargs):

-        val = apply(wizardc.wxPyWizardPage_base_TransferDataFromWindow,(self,) + _args, _kwargs)
+        val = wizardc.wxPyWizardPage_base_TransferDataFromWindow(self, *_args, **_kwargs)

         return val
     def base_Validate(self, *_args, **_kwargs):
         return val
     def base_Validate(self, *_args, **_kwargs):

-        val = apply(wizardc.wxPyWizardPage_base_Validate,(self,) + _args, _kwargs)
+        val = wizardc.wxPyWizardPage_base_Validate(self, *_args, **_kwargs)

         return val
     def base_AcceptsFocus(self, *_args, **_kwargs):
         return val
     def base_AcceptsFocus(self, *_args, **_kwargs):

-        val = apply(wizardc.wxPyWizardPage_base_AcceptsFocus,(self,) + _args, _kwargs)
+        val = wizardc.wxPyWizardPage_base_AcceptsFocus(self, *_args, **_kwargs)

         return val
     def base_AcceptsFocusFromKeyboard(self, *_args, **_kwargs):
         return val
     def base_AcceptsFocusFromKeyboard(self, *_args, **_kwargs):

-        val = apply(wizardc.wxPyWizardPage_base_AcceptsFocusFromKeyboard,(self,) + _args, _kwargs)
+        val = wizardc.wxPyWizardPage_base_AcceptsFocusFromKeyboard(self, *_args, **_kwargs)

         return val
     def base_GetMaxSize(self, *_args, **_kwargs):
         return val
     def base_GetMaxSize(self, *_args, **_kwargs):

-        val = apply(wizardc.wxPyWizardPage_base_GetMaxSize,(self,) + _args, _kwargs)
+        val = wizardc.wxPyWizardPage_base_GetMaxSize(self, *_args, **_kwargs)

         if val: val = wxSizePtr(val) ; val.thisown = 1
         return val
     def base_AddChild(self, *_args, **_kwargs):
         if val: val = wxSizePtr(val) ; val.thisown = 1
         return val
     def base_AddChild(self, *_args, **_kwargs):

-        val = apply(wizardc.wxPyWizardPage_base_AddChild,(self,) + _args, _kwargs)
+        val = wizardc.wxPyWizardPage_base_AddChild(self, *_args, **_kwargs)

         return val
     def base_RemoveChild(self, *_args, **_kwargs):
         return val
     def base_RemoveChild(self, *_args, **_kwargs):

-        val = apply(wizardc.wxPyWizardPage_base_RemoveChild,(self,) + _args, _kwargs)
+        val = wizardc.wxPyWizardPage_base_RemoveChild(self, *_args, **_kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxPyWizardPage instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxPyWizardPage instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)

 class wxPyWizardPage(wxPyWizardPagePtr):
     def __init__(self,*_args,**_kwargs):
 class wxPyWizardPage(wxPyWizardPagePtr):
     def __init__(self,*_args,**_kwargs):

-        self.this = apply(wizardc.new_wxPyWizardPage,_args,_kwargs)
+        self.this = wizardc.new_wxPyWizardPage(*_args,**_kwargs)

         self.thisown = 1
         self._setCallbackInfo(self, wxPyWizardPage)
         self._setOORInfo(self)
         self.thisown = 1
         self._setCallbackInfo(self, wxPyWizardPage)
         self._setOORInfo(self)


@@ -161,7 +161,7 @@ class wxPyWizardPage(wxPyWizardPagePtr):
 
 
 def wxPrePyWizardPage(*_args,**_kwargs):
 
 
 def wxPrePyWizardPage(*_args,**_kwargs):

-    val = wxPyWizardPagePtr(apply(wizardc.new_wxPrePyWizardPage,_args,_kwargs))
+    val = wxPyWizardPagePtr(wizardc.new_wxPrePyWizardPage(*_args,**_kwargs))

     val.thisown = 1
     val._setOORInfo(val)
     return val
     val.thisown = 1
     val._setOORInfo(val)
     return val


@@ -172,29 +172,26 @@ class wxWizardPageSimplePtr(wxWizardPagePtr):
         self.this = this
         self.thisown = 0
     def Create(self, *_args, **_kwargs):
         self.this = this
         self.thisown = 0
     def Create(self, *_args, **_kwargs):

-        val = apply(wizardc.wxWizardPageSimple_Create,(self,) + _args, _kwargs)
-        return val
-    def Init(self, *_args, **_kwargs):
-        val = apply(wizardc.wxWizardPageSimple_Init,(self,) + _args, _kwargs)
+        val = wizardc.wxWizardPageSimple_Create(self, *_args, **_kwargs)

         return val
     def SetPrev(self, *_args, **_kwargs):
         return val
     def SetPrev(self, *_args, **_kwargs):

-        val = apply(wizardc.wxWizardPageSimple_SetPrev,(self,) + _args, _kwargs)
+        val = wizardc.wxWizardPageSimple_SetPrev(self, *_args, **_kwargs)

         return val
     def SetNext(self, *_args, **_kwargs):
         return val
     def SetNext(self, *_args, **_kwargs):

-        val = apply(wizardc.wxWizardPageSimple_SetNext,(self,) + _args, _kwargs)
+        val = wizardc.wxWizardPageSimple_SetNext(self, *_args, **_kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxWizardPageSimple instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxWizardPageSimple instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)

 class wxWizardPageSimple(wxWizardPageSimplePtr):
     def __init__(self,*_args,**_kwargs):
 class wxWizardPageSimple(wxWizardPageSimplePtr):
     def __init__(self,*_args,**_kwargs):

-        self.this = apply(wizardc.new_wxWizardPageSimple,_args,_kwargs)
+        self.this = wizardc.new_wxWizardPageSimple(*_args,**_kwargs)

         self.thisown = 1
         self._setOORInfo(self)
 
 
 
 def wxPreWizardPageSimple(*_args,**_kwargs):
         self.thisown = 1
         self._setOORInfo(self)
 
 
 
 def wxPreWizardPageSimple(*_args,**_kwargs):

-    val = wxWizardPageSimplePtr(apply(wizardc.new_wxPreWizardPageSimple,_args,_kwargs))
+    val = wxWizardPageSimplePtr(wizardc.new_wxPreWizardPageSimple(*_args,**_kwargs))

     val.thisown = 1
     val._setOORInfo(val)
     return val
     val.thisown = 1
     val._setOORInfo(val)
     return val


@@ -205,45 +202,57 @@ class wxWizardPtr(wxDialogPtr):
         self.this = this
         self.thisown = 0
     def Create(self, *_args, **_kwargs):
         self.this = this
         self.thisown = 0
     def Create(self, *_args, **_kwargs):

-        val = apply(wizardc.wxWizard_Create,(self,) + _args, _kwargs)
+        val = wizardc.wxWizard_Create(self, *_args, **_kwargs)

         return val
     def Init(self, *_args, **_kwargs):
         return val
     def Init(self, *_args, **_kwargs):

-        val = apply(wizardc.wxWizard_Init,(self,) + _args, _kwargs)
+        val = wizardc.wxWizard_Init(self, *_args, **_kwargs)

         return val
     def RunWizard(self, *_args, **_kwargs):
         return val
     def RunWizard(self, *_args, **_kwargs):

-        val = apply(wizardc.wxWizard_RunWizard,(self,) + _args, _kwargs)
+        val = wizardc.wxWizard_RunWizard(self, *_args, **_kwargs)

         return val
     def GetCurrentPage(self, *_args, **_kwargs):
         return val
     def GetCurrentPage(self, *_args, **_kwargs):

-        val = apply(wizardc.wxWizard_GetCurrentPage,(self,) + _args, _kwargs)
+        val = wizardc.wxWizard_GetCurrentPage(self, *_args, **_kwargs)

         return val
     def SetPageSize(self, *_args, **_kwargs):
         return val
     def SetPageSize(self, *_args, **_kwargs):

-        val = apply(wizardc.wxWizard_SetPageSize,(self,) + _args, _kwargs)
+        val = wizardc.wxWizard_SetPageSize(self, *_args, **_kwargs)

         return val
     def GetPageSize(self, *_args, **_kwargs):
         return val
     def GetPageSize(self, *_args, **_kwargs):

-        val = apply(wizardc.wxWizard_GetPageSize,(self,) + _args, _kwargs)
+        val = wizardc.wxWizard_GetPageSize(self, *_args, **_kwargs)

         if val: val = wxSizePtr(val) ; val.thisown = 1
         return val
     def FitToPage(self, *_args, **_kwargs):
         if val: val = wxSizePtr(val) ; val.thisown = 1
         return val
     def FitToPage(self, *_args, **_kwargs):

-        val = apply(wizardc.wxWizard_FitToPage,(self,) + _args, _kwargs)
+        val = wizardc.wxWizard_FitToPage(self, *_args, **_kwargs)
+        return val
+    def GetPageAreaSizer(self, *_args, **_kwargs):
+        val = wizardc.wxWizard_GetPageAreaSizer(self, *_args, **_kwargs)
+        return val
+    def SetBorder(self, *_args, **_kwargs):
+        val = wizardc.wxWizard_SetBorder(self, *_args, **_kwargs)

         return val
     def IsRunning(self, *_args, **_kwargs):
         return val
     def IsRunning(self, *_args, **_kwargs):

-        val = apply(wizardc.wxWizard_IsRunning,(self,) + _args, _kwargs)
+        val = wizardc.wxWizard_IsRunning(self, *_args, **_kwargs)

         return val
     def ShowPage(self, *_args, **_kwargs):
         return val
     def ShowPage(self, *_args, **_kwargs):

-        val = apply(wizardc.wxWizard_ShowPage,(self,) + _args, _kwargs)
+        val = wizardc.wxWizard_ShowPage(self, *_args, **_kwargs)
+        return val
+    def HasNextPage(self, *_args, **_kwargs):
+        val = wizardc.wxWizard_HasNextPage(self, *_args, **_kwargs)
+        return val
+    def HasPrevPage(self, *_args, **_kwargs):
+        val = wizardc.wxWizard_HasPrevPage(self, *_args, **_kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxWizard instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxWizard instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)

 class wxWizard(wxWizardPtr):
     def __init__(self,*_args,**_kwargs):
 class wxWizard(wxWizardPtr):
     def __init__(self,*_args,**_kwargs):

-        self.this = apply(wizardc.new_wxWizard,_args,_kwargs)
+        self.this = wizardc.new_wxWizard(*_args,**_kwargs)

         self.thisown = 1
         self._setOORInfo(self)
 
 
 
 def wxPreWizard(*_args,**_kwargs):
         self.thisown = 1
         self._setOORInfo(self)
 
 
 
 def wxPreWizard(*_args,**_kwargs):

-    val = wxWizardPtr(apply(wizardc.new_wxPreWizard,_args,_kwargs))
+    val = wxWizardPtr(wizardc.new_wxPreWizard(*_args,**_kwargs))

     val.thisown = 1
     val._setOORInfo(val)
     return val
     val.thisown = 1
     val._setOORInfo(val)
     return val


@@ -264,6 +273,7 @@ wxEVT_WIZARD_PAGE_CHANGED = wizardc.wxEVT_WIZARD_PAGE_CHANGED
 wxEVT_WIZARD_PAGE_CHANGING = wizardc.wxEVT_WIZARD_PAGE_CHANGING
 wxEVT_WIZARD_CANCEL = wizardc.wxEVT_WIZARD_CANCEL
 wxEVT_WIZARD_HELP = wizardc.wxEVT_WIZARD_HELP
 wxEVT_WIZARD_PAGE_CHANGING = wizardc.wxEVT_WIZARD_PAGE_CHANGING
 wxEVT_WIZARD_CANCEL = wizardc.wxEVT_WIZARD_CANCEL
 wxEVT_WIZARD_HELP = wizardc.wxEVT_WIZARD_HELP

+wxEVT_WIZARD_FINISHED = wizardc.wxEVT_WIZARD_FINISHED

 
 
 #-------------- USER INCLUDE -----------------------
 
 
 #-------------- USER INCLUDE -----------------------


@@ -271,3 +281,7 @@ wxEVT_WIZARD_HELP = wizardc.wxEVT_WIZARD_HELP
 # Stuff these names into the wx namespace so wxPyConstructObject can find them
 import wx
 wx.wxWizardEventPtr         = wxWizardEventPtr
 # Stuff these names into the wx namespace so wxPyConstructObject can find them
 import wx
 wx.wxWizardEventPtr         = wxWizardEventPtr

+wx.wxWizardPagePtr          = wxWizardPagePtr
+wx.wxPyWizardPagePtr        = wxPyWizardPagePtr
+wx.wxWizardPageSimplePtr    = wxWizardPageSimplePtr
+wx.wxWizardPtr              = wxWizardPtr