X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8ab979d7382a718bc0e20a7798f2da4b02286c89..d5c9047acf66ae7ee2aed4778832b6887095ce7a:/utils/wxPython/src/msw/windows.py

diff --git a/utils/wxPython/src/msw/windows.py b/utils/wxPython/src/msw/windows.py
index f4efa42f01..ca35b3c304 100644
--- a/utils/wxPython/src/msw/windows.py
+++ b/utils/wxPython/src/msw/windows.py
@@ -4,6 +4,7 @@ import windowsc
 from misc import *
 
 from gdi import *
+import wxp
 class wxEvtHandlerPtr :
     def __init__(self,this):
         self.this = this
@@ -274,92 +275,7 @@ class wxWindow(wxWindowPtr):
         args = tuple(argl)
         self.this = apply(windowsc.new_wxWindow,(arg0.this,arg1,)+args)
         self.thisown = 1
-
-
-
-
-class wxFramePtr(wxWindowPtr):
-    def __init__(self,this):
-        self.this = this
-        self.thisown = 0
-    def Centre(self,*args):
-        val = apply(windowsc.wxFrame_Centre,(self.this,)+args)
-        return val
-    def Command(self,arg0):
-        val = windowsc.wxFrame_Command(self.this,arg0)
-        return val
-    def CreateStatusBar(self,*args):
-        val = apply(windowsc.wxFrame_CreateStatusBar,(self.this,)+args)
-        return val
-    def GetMenuBar(self):
-        val = windowsc.wxFrame_GetMenuBar(self.this)
-        val = wxMenuBarPtr(val)
-        return val
-    def GetStatusBar(self):
-        val = windowsc.wxFrame_GetStatusBar(self.this)
-        return val
-    def GetTitle(self):
-        val = windowsc.wxFrame_GetTitle(self.this)
-        return val
-    def Iconize(self,arg0):
-        val = windowsc.wxFrame_Iconize(self.this,arg0)
-        return val
-    def IsIconized(self):
-        val = windowsc.wxFrame_IsIconized(self.this)
-        return val
-    def Maximize(self,arg0):
-        val = windowsc.wxFrame_Maximize(self.this,arg0)
-        return val
-    def SetAcceleratorTable(self,arg0):
-        val = windowsc.wxFrame_SetAcceleratorTable(self.this,arg0.this)
-        return val
-    def SetIcon(self,arg0):
-        val = windowsc.wxFrame_SetIcon(self.this,arg0.this)
-        return val
-    def SetMenuBar(self,arg0):
-        val = windowsc.wxFrame_SetMenuBar(self.this,arg0.this)
-        return val
-    def SetStatusText(self,arg0,*args):
-        val = apply(windowsc.wxFrame_SetStatusText,(self.this,arg0,)+args)
-        return val
-    def SetStatusWidths(self,arg0,*args):
-        val = apply(windowsc.wxFrame_SetStatusWidths,(self.this,arg0,)+args)
-        return val
-    def SetTitle(self,arg0):
-        val = windowsc.wxFrame_SetTitle(self.this,arg0)
-        return val
-    def __repr__(self):
-        return "<C wxFrame instance>"
-class wxFrame(wxFramePtr):
-    def __init__(self,arg0,arg1,arg2,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(windowsc.new_wxFrame,(arg0.this,arg1,arg2,)+args)
-        self.thisown = 1
-
-
-
-
-class wxMiniFramePtr(wxFramePtr):
-    def __init__(self,this):
-        self.this = this
-        self.thisown = 0
-    def __repr__(self):
-        return "<C wxMiniFrame instance>"
-class wxMiniFrame(wxMiniFramePtr):
-    def __init__(self,arg0,arg1,arg2,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(windowsc.new_wxMiniFrame,(arg0.this,arg1,arg2,)+args)
-        self.thisown = 1
+        wxp._StdWindowCallbacks(self)
 
 
 
@@ -383,6 +299,7 @@ class wxPanel(wxPanelPtr):
         args = tuple(argl)
         self.this = apply(windowsc.new_wxPanel,(arg0.this,arg1,)+args)
         self.thisown = 1
+        wxp._StdWindowCallbacks(self)
 
 
 
@@ -433,6 +350,7 @@ class wxDialog(wxDialogPtr):
         args = tuple(argl)
         self.this = apply(windowsc.new_wxDialog,(arg0.this,arg1,arg2,)+args)
         self.thisown = 1
+        wxp._StdDialogCallbacks(self)
 
 
 
@@ -477,6 +395,8 @@ class wxScrolledWindow(wxScrolledWindowPtr):
         args = tuple(argl)
         self.this = apply(windowsc.new_wxScrolledWindow,(arg0.this,)+args)
         self.thisown = 1
+        wxp._StdWindowCallbacks(self)
+        wxp._StdOnScrollCallbacks(self)