Commented out constructor causing ambiguity

[wxWidgets.git] / utils / wxPython / src / cmndlgs.i

diff --git a/utils/wxPython/src/cmndlgs.i b/utils/wxPython/src/cmndlgs.i
index 06ca87ef77f4ee7351fc65093c021d49d4b155fc..7b549186163b1c0afd69e22bab39b22ab61cc152 100644 (file)
--- a/utils/wxPython/src/cmndlgs.i
+++ b/utils/wxPython/src/cmndlgs.i
@@ -1,5 +1,3 @@
-%module cmndlgs
-%{
 /////////////////////////////////////////////////////////////////////////////
 // Name:        cmndlgs.i
 // Purpose:     SWIG definitions for the Common Dialog Classes
@@ -12,7 +10,9 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
+%module cmndlgs
 
+%{
 #include "helpers.h"
 #include <wx/colordlg.h>
 #include <wx/dirdlg.h>
@@ -41,7 +41,7 @@ public:
 
     bool GetChooseFull();
     wxColour& GetColour();
-    wxColour& GetCustomColour(int i);
+    wxColour GetCustomColour(int i);
     void SetChooseFull(int flag);
     void SetColour(const wxColour& colour);
     void SetCustomColour(int i, const wxColour& colour);
@@ -52,13 +52,20 @@ class wxColourDialog : public wxDialog {
 public:
     wxColourDialog(wxWindow* parent, wxColourData* data = NULL);
 
+    %pragma(python) addtomethod = "__init__:wxp._StdDialogCallbacks(self)"
+
+#ifdef __WXMSW__
     wxColourData& GetColourData();
+#else
+    wxColourData GetColourData();
+#endif
     int ShowModal();
 };
 
 
 //----------------------------------------------------------------------
 
+#ifdef __WXMSW__
 class wxDirDialog : public wxDialog {
 public:
     wxDirDialog(wxWindow* parent,
@@ -67,6 +74,8 @@ public:
                 long style = 0,
                 const wxPoint& pos = wxPyDefaultPosition);
 
+    %pragma(python) addtomethod = "__init__:wxp._StdDialogCallbacks(self)"
+
     wxString GetPath();
     wxString GetMessage();
     long GetStyle();
@@ -74,6 +83,7 @@ public:
     void SetPath(const wxString& path);
     int ShowModal();
 };
+#endif
 
 //----------------------------------------------------------------------
 
@@ -87,6 +97,8 @@ public:
                  long style = 0,
                  const wxPoint& pos = wxPyDefaultPosition);
 
+    %pragma(python) addtomethod = "__init__:wxp._StdDialogCallbacks(self)"
+
     wxString GetDirectory();
     wxString GetFilename();
     int GetFilterIndex();
@@ -128,6 +140,8 @@ public:
         }
     }
 
+    %pragma(python) addtomethod = "__init__:wxp._StdDialogCallbacks(self)"
+
     int GetSelection();
     wxString GetStringSelection();
     void SetSelection(int sel);
@@ -146,6 +160,8 @@ public:
                       long style = wxOK | wxCANCEL | wxCENTRE,
                       const wxPoint& pos = wxPyDefaultPosition);
 
+    %pragma(python) addtomethod = "__init__:wxp._StdDialogCallbacks(self)"
+
     wxString GetValue();
     void SetValue(const wxString& value);
     int ShowModal();
@@ -178,6 +194,8 @@ class wxFontDialog : public wxDialog {
 public:
     wxFontDialog(wxWindow* parent, wxFontData* data = NULL);
 
+    %pragma(python) addtomethod = "__init__:wxp._StdDialogCallbacks(self)"
+
     wxFontData& GetFontData();
     int ShowModal();
 };
@@ -185,6 +203,7 @@ public:
 
 //----------------------------------------------------------------------
 
+#ifdef __WXMSW__
 class wxPageSetupData {
 public:
     wxPageSetupData();
@@ -223,12 +242,16 @@ class wxPageSetupDialog : public wxDialog {
 public:
     wxPageSetupDialog(wxWindow* parent, wxPageSetupData* data = NULL);
 
+    %pragma(python) addtomethod = "__init__:wxp._StdDialogCallbacks(self)"
+
     wxPageSetupData& GetPageSetupData();
     int ShowModal();
 };
+#endif
 
 //----------------------------------------------------------------------
 
+#ifdef __WXMSW__
 class wxPrintData {
 public:
     wxPrintData();
@@ -262,10 +285,13 @@ class wxPrintDialog : public wxDialog {
 public:
     wxPrintDialog(wxWindow* parent, wxPrintData* data = NULL);
 
+    %pragma(python) addtomethod = "__init__:wxp._StdDialogCallbacks(self)"
+
     wxPrintData& GetPrintData();
     wxDC* GetPrintDC();
     int ShowModal();
 };
+#endif
 
 //----------------------------------------------------------------------
 
@@ -277,6 +303,8 @@ public:
                     long style = wxOK | wxCANCEL | wxCENTRE,
                     const wxPoint& pos = wxPyDefaultPosition);
 
+    %pragma(python) addtomethod = "__init__:wxp._StdDialogCallbacks(self)"
+
     int ShowModal();
 };
 
@@ -286,6 +314,21 @@ public:
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$
+// Revision 1.4  1998/10/02 06:40:34  RD
+// Version 0.4 of wxPython for MSW.
+//
+// Revision 1.3  1998/08/18 19:48:13  RD
+// more wxGTK compatibility things.
+//
+// It builds now but there are serious runtime problems...
+//
+// Revision 1.2  1998/08/15 07:36:25  RD
+// - Moved the header in the .i files out of the code that gets put into
+// the .cpp files.  It caused CVS conflicts because of the RCS ID being
+// different each time.
+//
+// - A few minor fixes.
+//
 // Revision 1.1  1998/08/09 08:25:49  RD
 // Initial version
 //