minimal now works in Unicode mode

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

diff --git a/utils/wxPython/src/cmndlgs.i b/utils/wxPython/src/cmndlgs.i
index dc6dae7be1f3ccf48939b3dc5f4e550be7c0fb90..4a17cfce3618d7bd502a0c748ea1a63b246d73ac 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"
 
 //----------------------------------------------------------------------
 
@@ -52,18 +53,15 @@ class wxColourDialog : public wxDialog {
 public:
     wxColourDialog(wxWindow* parent, wxColourData* data = NULL);
 
-#ifdef __WXMSW__
+    %pragma(python) addtomethod = "__init__:wx._StdDialogCallbacks(self)"
+
     wxColourData& GetColourData();
-#else
-    wxColourData GetColourData();
-#endif
     int ShowModal();
 };
 
 
 //----------------------------------------------------------------------
 
-#ifdef __WXMSW__
 class wxDirDialog : public wxDialog {
 public:
     wxDirDialog(wxWindow* parent,
@@ -72,6 +70,8 @@ public:
                 long style = 0,
                 const wxPoint& pos = wxPyDefaultPosition);
 
+    %pragma(python) addtomethod = "__init__:wx._StdDialogCallbacks(self)"
+
     wxString GetPath();
     wxString GetMessage();
     long GetStyle();
@@ -79,7 +79,6 @@ public:
     void SetPath(const wxString& path);
     int ShowModal();
 };
-#endif
 
 //----------------------------------------------------------------------
 
@@ -93,6 +92,8 @@ public:
                  long style = 0,
                  const wxPoint& pos = wxPyDefaultPosition);
 
+    %pragma(python) addtomethod = "__init__:wx._StdDialogCallbacks(self)"
+
     wxString GetDirectory();
     wxString GetFilename();
     int GetFilterIndex();
@@ -134,6 +135,8 @@ public:
         }
     }
 
+    %pragma(python) addtomethod = "__init__:wx._StdDialogCallbacks(self)"
+
     int GetSelection();
     wxString GetStringSelection();
     void SetSelection(int sel);
@@ -152,6 +155,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();
@@ -184,6 +189,8 @@ class wxFontDialog : public wxDialog {
 public:
     wxFontDialog(wxWindow* parent, wxFontData* data = NULL);
 
+    %pragma(python) addtomethod = "__init__:wx._StdDialogCallbacks(self)"
+
     wxFontData& GetFontData();
     int ShowModal();
 };
@@ -191,7 +198,6 @@ public:
 
 //----------------------------------------------------------------------
 
-#ifdef __WXMSW__
 class wxPageSetupData {
 public:
     wxPageSetupData();
@@ -230,14 +236,14 @@ class wxPageSetupDialog : public wxDialog {
 public:
     wxPageSetupDialog(wxWindow* parent, wxPageSetupData* data = NULL);
 
+    %pragma(python) addtomethod = "__init__:wx._StdDialogCallbacks(self)"
+
     wxPageSetupData& GetPageSetupData();
     int ShowModal();
 };
-#endif
 
 //----------------------------------------------------------------------
 
-#ifdef __WXMSW__
 class wxPrintData {
 public:
     wxPrintData();
@@ -271,11 +277,12 @@ 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();
 };
-#endif
 
 //----------------------------------------------------------------------
 
@@ -287,6 +294,8 @@ public:
                     long style = wxOK | wxCANCEL | wxCENTRE,
                     const wxPoint& pos = wxPyDefaultPosition);
 
+    %pragma(python) addtomethod = "__init__:wx._StdDialogCallbacks(self)"
+
     int ShowModal();
 };
 
@@ -296,6 +305,41 @@ public:
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$
+// Revision 1.8  1998/12/17 14:07:25  RR
+//   Removed minor differences between wxMSW and wxGTK
+//
+// 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.
 //