X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b68dc582b8c6dd32ef9f0a4ec91573bd5cc0296a..5bf2abe34850e0952a44f3be4a4390ea12c55bd0:/wxPython/src/cmndlgs.i

diff --git a/wxPython/src/cmndlgs.i b/wxPython/src/cmndlgs.i
index 558576d46d..08c8a37919 100644
--- a/wxPython/src/cmndlgs.i
+++ b/wxPython/src/cmndlgs.i
@@ -36,13 +36,13 @@
 
 //----------------------------------------------------------------------
 
-class wxColourData {
+class wxColourData : public wxObject {
 public:
     wxColourData();
     ~wxColourData();
 
     bool GetChooseFull();
-    wxColour& GetColour();
+    wxColour GetColour();
     wxColour GetCustomColour(int i);
     void SetChooseFull(int flag);
     void SetColour(const wxColour& colour);
@@ -54,8 +54,6 @@ class wxColourDialog : public wxDialog {
 public:
     wxColourDialog(wxWindow* parent, wxColourData* data = NULL);
 
-    %pragma(python) addtomethod = "__init__:#wx._StdDialogCallbacks(self)"
-
     wxColourData& GetColourData();
     int ShowModal();
 };
@@ -71,8 +69,6 @@ public:
                 long style = 0,
                 const wxPoint& pos = wxDefaultPosition);
 
-    %pragma(python) addtomethod = "__init__:#wx._StdDialogCallbacks(self)"
-
     wxString GetPath();
     wxString GetMessage();
     long GetStyle();
@@ -93,8 +89,6 @@ public:
                  long style = 0,
                  const wxPoint& pos = wxDefaultPosition);
 
-    %pragma(python) addtomethod = "__init__:#wx._StdDialogCallbacks(self)"
-
     wxString GetDirectory();
     wxString GetFilename();
     int GetFilterIndex();
@@ -160,9 +154,8 @@ public:
             return new wxSingleChoiceDialog(parent, *message, *caption,
                                             LCOUNT, choices, NULL, style, *pos);
         }
-    }
 
-    %pragma(python) addtomethod = "__init__:#wx._StdDialogCallbacks(self)"
+    }
 
     int GetSelection();
     wxString GetStringSelection();
@@ -182,8 +175,6 @@ public:
                       long style = wxOK | wxCANCEL | wxCENTRE,
                       const wxPoint& pos = wxDefaultPosition);
 
-    %pragma(python) addtomethod = "__init__:#wx._StdDialogCallbacks(self)"
-
     wxString GetValue();
     void SetValue(const wxString& value);
     int ShowModal();
@@ -191,14 +182,14 @@ public:
 
 //----------------------------------------------------------------------
 
-class wxFontData {
+class wxFontData : public wxObject {
 public:
     wxFontData();
     ~wxFontData();
 
     void EnableEffects(bool enable);
     bool GetAllowSymbols();
-    wxColour& GetColour();
+    wxColour GetColour();
     wxFont GetChosenFont();
     bool GetEnableEffects();
     wxFont GetInitialFont();
@@ -216,8 +207,6 @@ class wxFontDialog : public wxDialog {
 public:
     wxFontDialog(wxWindow* parent, wxFontData* data);
 
-    %pragma(python) addtomethod = "__init__:#wx._StdDialogCallbacks(self)"
-
     wxFontData& GetFontData();
     int ShowModal();
 };
@@ -233,8 +222,6 @@ public:
                     long style = wxOK | wxCANCEL | wxCENTRE,
                     const wxPoint& pos = wxDefaultPosition);
 
-    %pragma(python) addtomethod = "__init__:#wx._StdDialogCallbacks(self)"
-
     int ShowModal();
 };