X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6bcfd974ef26faf6f91a62cac09827e09463fd1..bf44306ebca5d26e204ef17851516d844bc2f0a7:/wxPython/src/cmndlgs.i

diff --git a/wxPython/src/cmndlgs.i b/wxPython/src/cmndlgs.i
index 088e509085..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();
 };
@@ -69,9 +67,7 @@ public:
                 char* message = "Choose a directory",
                 char* defaultPath = "",
                 long style = 0,
-                const wxPoint& pos = wxPyDefaultPosition);
-
-    %pragma(python) addtomethod = "__init__:#wx._StdDialogCallbacks(self)"
+                const wxPoint& pos = wxDefaultPosition);
 
     wxString GetPath();
     wxString GetMessage();
@@ -91,9 +87,7 @@ public:
                  char* defaultFile = "",
                  char* wildcard = "*.*",
                  long style = 0,
-                 const wxPoint& pos = wxPyDefaultPosition);
-
-    %pragma(python) addtomethod = "__init__:#wx._StdDialogCallbacks(self)"
+                 const wxPoint& pos = wxDefaultPosition);
 
     wxString GetDirectory();
     wxString GetFilename();
@@ -156,13 +150,12 @@ public:
                              int LCOUNT, wxString* choices,
                              //char** clientData = NULL,
                              long style = wxOK | wxCANCEL | wxCENTRE,
-                             wxPoint* pos = &wxPyDefaultPosition) {
+                             wxPoint* pos = &wxDefaultPosition) {
             return new wxSingleChoiceDialog(parent, *message, *caption,
                                             LCOUNT, choices, NULL, style, *pos);
         }
-    }
 
-    %pragma(python) addtomethod = "__init__:#wx._StdDialogCallbacks(self)"
+    }
 
     int GetSelection();
     wxString GetStringSelection();
@@ -180,9 +173,7 @@ public:
                       char* caption = "Input Text",
                       char* defaultValue = "",
                       long style = wxOK | wxCANCEL | wxCENTRE,
-                      const wxPoint& pos = wxPyDefaultPosition);
-
-    %pragma(python) addtomethod = "__init__:#wx._StdDialogCallbacks(self)"
+                      const wxPoint& pos = wxDefaultPosition);
 
     wxString GetValue();
     void SetValue(const wxString& value);
@@ -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();
 };
@@ -231,9 +220,7 @@ public:
                     char* message,
                     char* caption = "Message box",
                     long style = wxOK | wxCANCEL | wxCENTRE,
-                    const wxPoint& pos = wxPyDefaultPosition);
-
-    %pragma(python) addtomethod = "__init__:#wx._StdDialogCallbacks(self)"
+                    const wxPoint& pos = wxDefaultPosition);
 
     int ShowModal();
 };