Fixed compile errors, warnings and other DSMs, and improved comments.

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

diff --git a/wxPython/src/msw/cmndlgs.py b/wxPython/src/msw/cmndlgs.py
index 09472741495468e4bf9d7a9b5187e91c979dd356..02d1e711d8e7c30724a1443efc8b9f2a521138ff 100644 (file)
--- a/wxPython/src/msw/cmndlgs.py
+++ b/wxPython/src/msw/cmndlgs.py
@@ -17,7 +17,7 @@ from controls import *
 
 from events import *
 import wx
 
 from events import *
 import wx

-class wxColourDataPtr :
+class wxColourDataPtr(wxObjectPtr):

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


@@ -29,7 +29,7 @@ class wxColourDataPtr :
         return val
     def GetColour(self, *_args, **_kwargs):
         val = apply(cmndlgsc.wxColourData_GetColour,(self,) + _args, _kwargs)
         return val
     def GetColour(self, *_args, **_kwargs):
         val = apply(cmndlgsc.wxColourData_GetColour,(self,) + _args, _kwargs)

-        if val: val = wxColourPtr(val) 
+        if val: val = wxColourPtr(val) ; val.thisown = 1

         return val
     def GetCustomColour(self, *_args, **_kwargs):
         val = apply(cmndlgsc.wxColourData_GetCustomColour,(self,) + _args, _kwargs)
         return val
     def GetCustomColour(self, *_args, **_kwargs):
         val = apply(cmndlgsc.wxColourData_GetCustomColour,(self,) + _args, _kwargs)


@@ -71,7 +71,6 @@ class wxColourDialog(wxColourDialogPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(cmndlgsc.new_wxColourDialog,_args,_kwargs)
         self.thisown = 1
     def __init__(self,*_args,**_kwargs):
         self.this = apply(cmndlgsc.new_wxColourDialog,_args,_kwargs)
         self.thisown = 1

-        #wx._StdDialogCallbacks(self)

 
 
 
 
 
 


@@ -104,7 +103,6 @@ class wxDirDialog(wxDirDialogPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(cmndlgsc.new_wxDirDialog,_args,_kwargs)
         self.thisown = 1
     def __init__(self,*_args,**_kwargs):
         self.this = apply(cmndlgsc.new_wxDirDialog,_args,_kwargs)
         self.thisown = 1

-        #wx._StdDialogCallbacks(self)

 
 
 
 
 
 


@@ -170,7 +168,6 @@ class wxFileDialog(wxFileDialogPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(cmndlgsc.new_wxFileDialog,_args,_kwargs)
         self.thisown = 1
     def __init__(self,*_args,**_kwargs):
         self.this = apply(cmndlgsc.new_wxFileDialog,_args,_kwargs)
         self.thisown = 1

-        #wx._StdDialogCallbacks(self)

 
 
 
 
 
 


@@ -197,7 +194,6 @@ class wxSingleChoiceDialog(wxSingleChoiceDialogPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(cmndlgsc.new_wxSingleChoiceDialog,_args,_kwargs)
         self.thisown = 1
     def __init__(self,*_args,**_kwargs):
         self.this = apply(cmndlgsc.new_wxSingleChoiceDialog,_args,_kwargs)
         self.thisown = 1

-        #wx._StdDialogCallbacks(self)

 
 
 
 
 
 


@@ -221,12 +217,11 @@ class wxTextEntryDialog(wxTextEntryDialogPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(cmndlgsc.new_wxTextEntryDialog,_args,_kwargs)
         self.thisown = 1
     def __init__(self,*_args,**_kwargs):
         self.this = apply(cmndlgsc.new_wxTextEntryDialog,_args,_kwargs)
         self.thisown = 1

-        #wx._StdDialogCallbacks(self)

 
 
 
 
 
 
 
 

-class wxFontDataPtr :
+class wxFontDataPtr(wxObjectPtr):

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


@@ -241,7 +236,7 @@ class wxFontDataPtr :
         return val
     def GetColour(self, *_args, **_kwargs):
         val = apply(cmndlgsc.wxFontData_GetColour,(self,) + _args, _kwargs)
         return val
     def GetColour(self, *_args, **_kwargs):
         val = apply(cmndlgsc.wxFontData_GetColour,(self,) + _args, _kwargs)

-        if val: val = wxColourPtr(val) 
+        if val: val = wxColourPtr(val) ; val.thisown = 1

         return val
     def GetChosenFont(self, *_args, **_kwargs):
         val = apply(cmndlgsc.wxFontData_GetChosenFont,(self,) + _args, _kwargs)
         return val
     def GetChosenFont(self, *_args, **_kwargs):
         val = apply(cmndlgsc.wxFontData_GetChosenFont,(self,) + _args, _kwargs)


@@ -302,7 +297,6 @@ class wxFontDialog(wxFontDialogPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(cmndlgsc.new_wxFontDialog,_args,_kwargs)
         self.thisown = 1
     def __init__(self,*_args,**_kwargs):
         self.this = apply(cmndlgsc.new_wxFontDialog,_args,_kwargs)
         self.thisown = 1

-        #wx._StdDialogCallbacks(self)

 
 
 
 
 
 


@@ -320,7 +314,6 @@ class wxMessageDialog(wxMessageDialogPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(cmndlgsc.new_wxMessageDialog,_args,_kwargs)
         self.thisown = 1
     def __init__(self,*_args,**_kwargs):
         self.this = apply(cmndlgsc.new_wxMessageDialog,_args,_kwargs)
         self.thisown = 1

-        #wx._StdDialogCallbacks(self)