wxPython 2.1b1: Very minor changes needed for wxGTK

[wxWidgets.git] / utils / wxPython / src / msw / cmndlgs.py

diff --git a/utils/wxPython/src/msw/cmndlgs.py b/utils/wxPython/src/msw/cmndlgs.py
index 5b58c4e34014e9303ad3fb8b5925eabb0bfb32e6..f8fa89db18e69e8cf736a022f01aa5ec0382db22 100644 (file)
--- a/utils/wxPython/src/msw/cmndlgs.py
+++ b/utils/wxPython/src/msw/cmndlgs.py
@@ -6,6 +6,15 @@ from misc import *
 from gdi import *
 
 from windows import *
 from gdi import *
 
 from windows import *

+
+from frames import *
+
+from stattool import *
+
+from controls import *
+
+from events import *
+import wx

 class wxColourDataPtr :
     def __init__(self,this):
         self.this = this
 class wxColourDataPtr :
     def __init__(self,this):
         self.this = this


@@ -65,7 +74,7 @@ class wxColourDialog(wxColourDialogPtr):
         args = tuple(argl)
         self.this = apply(cmndlgsc.new_wxColourDialog,(arg0.this,)+args)
         self.thisown = 1
         args = tuple(argl)
         self.this = apply(cmndlgsc.new_wxColourDialog,(arg0.this,)+args)
         self.thisown = 1

-        wxp._StdDialogCallbacks(self)
+        wx._StdDialogCallbacks(self)

 
 
 
 
 
 


@@ -102,7 +111,7 @@ class wxDirDialog(wxDirDialogPtr):
         args = tuple(argl)
         self.this = apply(cmndlgsc.new_wxDirDialog,(arg0.this,)+args)
         self.thisown = 1
         args = tuple(argl)
         self.this = apply(cmndlgsc.new_wxDirDialog,(arg0.this,)+args)
         self.thisown = 1

-        wxp._StdDialogCallbacks(self)
+        wx._StdDialogCallbacks(self)

 
 
 
 
 
 


@@ -166,7 +175,7 @@ class wxFileDialog(wxFileDialogPtr):
         args = tuple(argl)
         self.this = apply(cmndlgsc.new_wxFileDialog,(arg0.this,)+args)
         self.thisown = 1
         args = tuple(argl)
         self.this = apply(cmndlgsc.new_wxFileDialog,(arg0.this,)+args)
         self.thisown = 1

-        wxp._StdDialogCallbacks(self)
+        wx._StdDialogCallbacks(self)

 
 
 
 
 
 


@@ -197,7 +206,7 @@ class wxSingleChoiceDialog(wxSingleChoiceDialogPtr):
         args = tuple(argl)
         self.this = apply(cmndlgsc.new_wxSingleChoiceDialog,(arg0.this,arg1,arg2,arg3,)+args)
         self.thisown = 1
         args = tuple(argl)
         self.this = apply(cmndlgsc.new_wxSingleChoiceDialog,(arg0.this,arg1,arg2,arg3,)+args)
         self.thisown = 1

-        wxp._StdDialogCallbacks(self)
+        wx._StdDialogCallbacks(self)

 
 
 
 
 
 


@@ -225,7 +234,7 @@ class wxTextEntryDialog(wxTextEntryDialogPtr):
         args = tuple(argl)
         self.this = apply(cmndlgsc.new_wxTextEntryDialog,(arg0.this,arg1,)+args)
         self.thisown = 1
         args = tuple(argl)
         self.this = apply(cmndlgsc.new_wxTextEntryDialog,(arg0.this,arg1,)+args)
         self.thisown = 1

-        wxp._StdDialogCallbacks(self)
+        wx._StdDialogCallbacks(self)

 
 
 
 
 
 


@@ -312,271 +321,53 @@ class wxFontDialog(wxFontDialogPtr):
         args = tuple(argl)
         self.this = apply(cmndlgsc.new_wxFontDialog,(arg0.this,)+args)
         self.thisown = 1
         args = tuple(argl)
         self.this = apply(cmndlgsc.new_wxFontDialog,(arg0.this,)+args)
         self.thisown = 1

-        wxp._StdDialogCallbacks(self)
-
-
-
-
-class wxPageSetupDataPtr :
-    def __init__(self,this):
-        self.this = this
-        self.thisown = 0
-    def __del__(self):
-        if self.thisown == 1 :
-            cmndlgsc.delete_wxPageSetupData(self.this)
-    def EnableHelp(self,arg0):
-        val = cmndlgsc.wxPageSetupData_EnableHelp(self.this,arg0)
-        return val
-    def EnableMargins(self,arg0):
-        val = cmndlgsc.wxPageSetupData_EnableMargins(self.this,arg0)
-        return val
-    def EnableOrientation(self,arg0):
-        val = cmndlgsc.wxPageSetupData_EnableOrientation(self.this,arg0)
-        return val
-    def EnablePaper(self,arg0):
-        val = cmndlgsc.wxPageSetupData_EnablePaper(self.this,arg0)
-        return val
-    def EnablePrinter(self,arg0):
-        val = cmndlgsc.wxPageSetupData_EnablePrinter(self.this,arg0)
-        return val
-    def GetPaperSize(self):
-        val = cmndlgsc.wxPageSetupData_GetPaperSize(self.this)
-        val = wxPointPtr(val)
-        val.thisown = 1
-        return val
-    def GetMarginTopLeft(self):
-        val = cmndlgsc.wxPageSetupData_GetMarginTopLeft(self.this)
-        val = wxPointPtr(val)
-        val.thisown = 1
-        return val
-    def GetMarginBottomRight(self):
-        val = cmndlgsc.wxPageSetupData_GetMarginBottomRight(self.this)
-        val = wxPointPtr(val)
-        val.thisown = 1
-        return val
-    def GetMinMarginTopLeft(self):
-        val = cmndlgsc.wxPageSetupData_GetMinMarginTopLeft(self.this)
-        val = wxPointPtr(val)
-        val.thisown = 1
-        return val
-    def GetMinMarginBottomRight(self):
-        val = cmndlgsc.wxPageSetupData_GetMinMarginBottomRight(self.this)
-        val = wxPointPtr(val)
-        val.thisown = 1
-        return val
-    def GetOrientation(self):
-        val = cmndlgsc.wxPageSetupData_GetOrientation(self.this)
-        return val
-    def GetDefaultMinMargins(self):
-        val = cmndlgsc.wxPageSetupData_GetDefaultMinMargins(self.this)
-        return val
-    def GetEnableMargins(self):
-        val = cmndlgsc.wxPageSetupData_GetEnableMargins(self.this)
-        return val
-    def GetEnableOrientation(self):
-        val = cmndlgsc.wxPageSetupData_GetEnableOrientation(self.this)
-        return val
-    def GetEnablePaper(self):
-        val = cmndlgsc.wxPageSetupData_GetEnablePaper(self.this)
-        return val
-    def GetEnablePrinter(self):
-        val = cmndlgsc.wxPageSetupData_GetEnablePrinter(self.this)
-        return val
-    def GetEnableHelp(self):
-        val = cmndlgsc.wxPageSetupData_GetEnableHelp(self.this)
-        return val
-    def GetDefaultInfo(self):
-        val = cmndlgsc.wxPageSetupData_GetDefaultInfo(self.this)
-        return val
-    def SetPaperSize(self,arg0):
-        val = cmndlgsc.wxPageSetupData_SetPaperSize(self.this,arg0.this)
-        return val
-    def SetMarginTopLeft(self,arg0):
-        val = cmndlgsc.wxPageSetupData_SetMarginTopLeft(self.this,arg0.this)
-        return val
-    def SetMarginBottomRight(self,arg0):
-        val = cmndlgsc.wxPageSetupData_SetMarginBottomRight(self.this,arg0.this)
-        return val
-    def SetMinMarginTopLeft(self,arg0):
-        val = cmndlgsc.wxPageSetupData_SetMinMarginTopLeft(self.this,arg0.this)
-        return val
-    def SetMinMarginBottomRight(self,arg0):
-        val = cmndlgsc.wxPageSetupData_SetMinMarginBottomRight(self.this,arg0.this)
-        return val
-    def SetOrientation(self,arg0):
-        val = cmndlgsc.wxPageSetupData_SetOrientation(self.this,arg0)
-        return val
-    def SetDefaultMinMargins(self,arg0):
-        val = cmndlgsc.wxPageSetupData_SetDefaultMinMargins(self.this,arg0)
-        return val
-    def SetDefaultInfo(self,arg0):
-        val = cmndlgsc.wxPageSetupData_SetDefaultInfo(self.this,arg0)
-        return val
-    def __repr__(self):
-        return "<C wxPageSetupData instance>"
-class wxPageSetupData(wxPageSetupDataPtr):
-    def __init__(self) :
-        self.this = cmndlgsc.new_wxPageSetupData()
-        self.thisown = 1
+        wx._StdDialogCallbacks(self)

 
 
 
 
 
 
 
 

-class wxPageSetupDialogPtr(wxDialogPtr):
+class wxMessageDialogPtr(wxDialogPtr):

     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def GetPageSetupData(self):
-        val = cmndlgsc.wxPageSetupDialog_GetPageSetupData(self.this)
-        val = wxPageSetupDataPtr(val)
-        return val

     def ShowModal(self):
     def ShowModal(self):

-        val = cmndlgsc.wxPageSetupDialog_ShowModal(self.this)
+        val = cmndlgsc.wxMessageDialog_ShowModal(self.this)

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

-        return "<C wxPageSetupDialog instance>"
-class wxPageSetupDialog(wxPageSetupDialogPtr):
-    def __init__(self,arg0,*args) :
+        return "<C wxMessageDialog instance>"
+class wxMessageDialog(wxMessageDialogPtr):
+    def __init__(self,arg0,arg1,*args) :

         argl = map(None,args)
         argl = map(None,args)

-        try: argl[0] = argl[0].this
+        try: argl[2] = argl[2].this

         except: pass
         args = tuple(argl)
         except: pass
         args = tuple(argl)

-        self.this = apply(cmndlgsc.new_wxPageSetupDialog,(arg0.this,)+args)
-        self.thisown = 1
-        wxp._StdDialogCallbacks(self)
-
-
-
-
-class wxPrintDataPtr :
-    def __init__(self,this):
-        self.this = this
-        self.thisown = 0
-    def __del__(self):
-        if self.thisown == 1 :
-            cmndlgsc.delete_wxPrintData(self.this)
-    def EnableHelp(self,arg0):
-        val = cmndlgsc.wxPrintData_EnableHelp(self.this,arg0)
-        return val
-    def EnablePageNumbers(self,arg0):
-        val = cmndlgsc.wxPrintData_EnablePageNumbers(self.this,arg0)
-        return val
-    def EnablePrintToFile(self,arg0):
-        val = cmndlgsc.wxPrintData_EnablePrintToFile(self.this,arg0)
-        return val
-    def EnableSelection(self,arg0):
-        val = cmndlgsc.wxPrintData_EnableSelection(self.this,arg0)
-        return val
-    def GetAllPages(self):
-        val = cmndlgsc.wxPrintData_GetAllPages(self.this)
-        return val
-    def GetCollate(self):
-        val = cmndlgsc.wxPrintData_GetCollate(self.this)
-        return val
-    def GetFromPage(self):
-        val = cmndlgsc.wxPrintData_GetFromPage(self.this)
-        return val
-    def GetMaxPage(self):
-        val = cmndlgsc.wxPrintData_GetMaxPage(self.this)
-        return val
-    def GetMinPage(self):
-        val = cmndlgsc.wxPrintData_GetMinPage(self.this)
-        return val
-    def GetNoCopies(self):
-        val = cmndlgsc.wxPrintData_GetNoCopies(self.this)
-        return val
-    def GetOrientation(self):
-        val = cmndlgsc.wxPrintData_GetOrientation(self.this)
-        return val
-    def GetToPage(self):
-        val = cmndlgsc.wxPrintData_GetToPage(self.this)
-        return val
-    def SetCollate(self,arg0):
-        val = cmndlgsc.wxPrintData_SetCollate(self.this,arg0)
-        return val
-    def SetFromPage(self,arg0):
-        val = cmndlgsc.wxPrintData_SetFromPage(self.this,arg0)
-        return val
-    def SetMaxPage(self,arg0):
-        val = cmndlgsc.wxPrintData_SetMaxPage(self.this,arg0)
-        return val
-    def SetMinPage(self,arg0):
-        val = cmndlgsc.wxPrintData_SetMinPage(self.this,arg0)
-        return val
-    def SetOrientation(self,arg0):
-        val = cmndlgsc.wxPrintData_SetOrientation(self.this,arg0)
-        return val
-    def SetNoCopies(self,arg0):
-        val = cmndlgsc.wxPrintData_SetNoCopies(self.this,arg0)
-        return val
-    def SetPrintToFile(self,arg0):
-        val = cmndlgsc.wxPrintData_SetPrintToFile(self.this,arg0)
-        return val
-    def SetSetupDialog(self,arg0):
-        val = cmndlgsc.wxPrintData_SetSetupDialog(self.this,arg0)
-        return val
-    def SetToPage(self,arg0):
-        val = cmndlgsc.wxPrintData_SetToPage(self.this,arg0)
-        return val
-    def __repr__(self):
-        return "<C wxPrintData instance>"
-class wxPrintData(wxPrintDataPtr):
-    def __init__(self) :
-        self.this = cmndlgsc.new_wxPrintData()
+        self.this = apply(cmndlgsc.new_wxMessageDialog,(arg0.this,arg1,)+args)

         self.thisown = 1
         self.thisown = 1

+        wx._StdDialogCallbacks(self)

 
 
 
 
 
 
 
 

-class wxPrintDialogPtr(wxDialogPtr):
+class wxProgressDialogPtr(wxFramePtr):

     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def GetPrintData(self):
-        val = cmndlgsc.wxPrintDialog_GetPrintData(self.this)
-        val = wxPrintDataPtr(val)
-        return val
-    def GetPrintDC(self):
-        val = cmndlgsc.wxPrintDialog_GetPrintDC(self.this)
-        val = wxDCPtr(val)
-        val.thisown = 1
+    def Update(self,*args):
+        val = apply(cmndlgsc.wxProgressDialog_Update,(self.this,)+args)

         return val
         return val

-    def ShowModal(self):
-        val = cmndlgsc.wxPrintDialog_ShowModal(self.this)
+    def Resume(self):
+        val = cmndlgsc.wxProgressDialog_Resume(self.this)

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

-        return "<C wxPrintDialog instance>"
-class wxPrintDialog(wxPrintDialogPtr):
-    def __init__(self,arg0,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(cmndlgsc.new_wxPrintDialog,(arg0.this,)+args)
-        self.thisown = 1
-        wxp._StdDialogCallbacks(self)
-
-
-
-
-class wxMessageDialogPtr(wxDialogPtr):
-    def __init__(self,this):
-        self.this = this
-        self.thisown = 0
-    def ShowModal(self):
-        val = cmndlgsc.wxMessageDialog_ShowModal(self.this)
-        return val
-    def __repr__(self):
-        return "<C wxMessageDialog instance>"
-class wxMessageDialog(wxMessageDialogPtr):
+        return "<C wxProgressDialog instance>"
+class wxProgressDialog(wxProgressDialogPtr):

     def __init__(self,arg0,arg1,*args) :
         argl = map(None,args)
     def __init__(self,arg0,arg1,*args) :
         argl = map(None,args)

-        try: argl[2] = argl[2].this
+        try: argl[1] = argl[1].this

         except: pass
         args = tuple(argl)
         except: pass
         args = tuple(argl)

-        self.this = apply(cmndlgsc.new_wxMessageDialog,(arg0.this,arg1,)+args)
+        self.this = apply(cmndlgsc.new_wxProgressDialog,(arg0,arg1,)+args)

         self.thisown = 1
         self.thisown = 1

-        wxp._StdDialogCallbacks(self)