Removed some unnecessary bitmaps; other minor changes

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

diff --git a/utils/wxPython/src/cmndlgs.i b/utils/wxPython/src/cmndlgs.i
index ed5ec6bf65754fe314361194c71d8ac040a340b4..f4942a4ffb54a234b1b21c3ffb9007bf122f4109 100644 (file)
--- a/utils/wxPython/src/cmndlgs.i
+++ b/utils/wxPython/src/cmndlgs.i
@@ -31,6 +31,7 @@
 %import gdi.i
 %import windows.i
 
+%pragma(python) code = "import wx"
 
 //----------------------------------------------------------------------
 
@@ -41,7 +42,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 +53,20 @@ class wxColourDialog : public wxDialog {
 public:
     wxColourDialog(wxWindow* parent, wxColourData* data = NULL);
 
+    %pragma(python) addtomethod = "__init__:wx._StdDialogCallbacks(self)"
+
+#ifdef __WXMSW__
     wxColourData& GetColourData();
+#else
+    wxColourData GetColourData();
+#endif
     int ShowModal();
 };
 
 
 //----------------------------------------------------------------------
 
+#ifdef __WXMSW__
 class wxDirDialog : public wxDialog {
 public:
     wxDirDialog(wxWindow* parent,
@@ -67,6 +75,8 @@ public:
                 long style = 0,
                 const wxPoint& pos = wxPyDefaultPosition);
 
+    %pragma(python) addtomethod = "__init__:wx._StdDialogCallbacks(self)"
+
     wxString GetPath();
     wxString GetMessage();
     long GetStyle();
@@ -74,6 +84,7 @@ public:
     void SetPath(const wxString& path);
     int ShowModal();
 };
+#endif
 
 //----------------------------------------------------------------------
 
@@ -87,6 +98,8 @@ public:
                  long style = 0,
                  const wxPoint& pos = wxPyDefaultPosition);
 
+    %pragma(python) addtomethod = "__init__:wx._StdDialogCallbacks(self)"
+
     wxString GetDirectory();
     wxString GetFilename();
     int GetFilterIndex();
@@ -128,6 +141,8 @@ public:
         }
     }
 
+    %pragma(python) addtomethod = "__init__:wx._StdDialogCallbacks(self)"
+
     int GetSelection();
     wxString GetStringSelection();
     void SetSelection(int sel);
@@ -146,6 +161,8 @@ public:
                       long style = wxOK | wxCANCEL | wxCENTRE,
                       const wxPoint& pos = wxPyDefaultPosition);
 
+    %pragma(python) addtomethod = "__init__:wx._StdDialogCallbacks(self)"
+
     wxString GetValue();
     void SetValue(const wxString& value);
     int ShowModal();
@@ -178,6 +195,8 @@ class wxFontDialog : public wxDialog {
 public:
     wxFontDialog(wxWindow* parent, wxFontData* data = NULL);
 
+    %pragma(python) addtomethod = "__init__:wx._StdDialogCallbacks(self)"
+
     wxFontData& GetFontData();
     int ShowModal();
 };
@@ -223,6 +242,8 @@ class wxPageSetupDialog : public wxDialog {
 public:
     wxPageSetupDialog(wxWindow* parent, wxPageSetupData* data = NULL);
 
+    %pragma(python) addtomethod = "__init__:wx._StdDialogCallbacks(self)"
+
     wxPageSetupData& GetPageSetupData();
     int ShowModal();
 };
@@ -262,8 +283,10 @@ class wxPrintDialog : public wxDialog {
 public:
     wxPrintDialog(wxWindow* parent, wxPrintData* data = NULL);
 
+    %pragma(python) addtomethod = "__init__:wx._StdDialogCallbacks(self)"
+
     wxPrintData& GetPrintData();
-    wxDC* GetPrintDC();
+    %new wxDC* GetPrintDC();
     int ShowModal();
 };
 
@@ -277,6 +300,8 @@ public:
                     long style = wxOK | wxCANCEL | wxCENTRE,
                     const wxPoint& pos = wxPyDefaultPosition);
 
+    %pragma(python) addtomethod = "__init__:wx._StdDialogCallbacks(self)"
+
     int ShowModal();
 };
 
@@ -286,6 +311,43 @@ public:
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$
+// Revision 1.7  1998/12/15 20:41:14  RD
+// Changed the import semantics from "from wxPython import *" to "from
+// wxPython.wx import *"  This is for people who are worried about
+// namespace pollution, they can use "from wxPython import wx" and then
+// prefix all the wxPython identifiers with "wx."
+//
+// Added wxTaskbarIcon for wxMSW.
+//
+// Made the events work for wxGrid.
+//
+// Added wxConfig.
+//
+// Added wxMiniFrame for wxGTK, (untested.)
+//
+// Changed many of the args and return values that were pointers to gdi
+// objects to references to reflect changes in the wxWindows API.
+//
+// Other assorted fixes and additions.
+//
+// Revision 1.6  1998/11/25 08:45:22  RD
+//
+// Added wxPalette, wxRegion, wxRegionIterator, wxTaskbarIcon
+// Added events for wxGrid
+// Other various fixes and additions
+//
+// Revision 1.5  1998/11/15 23:03:43  RD
+// Removing some ifdef's for wxGTK
+//
+// 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