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 3ec7bd1ecefbdda81f2f98893d776fc531422336..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
 
 %import gdi.i
 %import windows.i
 

+%pragma(python) code = "import wx"

 
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------
 


@@ -52,20 +53,15 @@ class wxColourDialog : public wxDialog {
 public:
     wxColourDialog(wxWindow* parent, wxColourData* data = NULL);
 
 public:
     wxColourDialog(wxWindow* parent, wxColourData* data = NULL);
 

-    %pragma(python) addtomethod = "__init__:wxp._StdDialogCallbacks(self)"
+    %pragma(python) addtomethod = "__init__:wx._StdDialogCallbacks(self)"

 
 

-#ifdef __WXMSW__

     wxColourData& GetColourData();
     wxColourData& GetColourData();

-#else
-    wxColourData GetColourData();
-#endif

     int ShowModal();
 };
 
 
 //----------------------------------------------------------------------
 
     int ShowModal();
 };
 
 
 //----------------------------------------------------------------------
 

-#ifdef __WXMSW__

 class wxDirDialog : public wxDialog {
 public:
     wxDirDialog(wxWindow* parent,
 class wxDirDialog : public wxDialog {
 public:
     wxDirDialog(wxWindow* parent,


@@ -74,7 +70,7 @@ public:
                 long style = 0,
                 const wxPoint& pos = wxPyDefaultPosition);
 
                 long style = 0,
                 const wxPoint& pos = wxPyDefaultPosition);
 

-    %pragma(python) addtomethod = "__init__:wxp._StdDialogCallbacks(self)"
+    %pragma(python) addtomethod = "__init__:wx._StdDialogCallbacks(self)"

 
     wxString GetPath();
     wxString GetMessage();
 
     wxString GetPath();
     wxString GetMessage();


@@ -83,7 +79,6 @@ public:
     void SetPath(const wxString& path);
     int ShowModal();
 };
     void SetPath(const wxString& path);
     int ShowModal();
 };

-#endif

 
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------
 


@@ -97,7 +92,7 @@ public:
                  long style = 0,
                  const wxPoint& pos = wxPyDefaultPosition);
 
                  long style = 0,
                  const wxPoint& pos = wxPyDefaultPosition);
 

-    %pragma(python) addtomethod = "__init__:wxp._StdDialogCallbacks(self)"
+    %pragma(python) addtomethod = "__init__:wx._StdDialogCallbacks(self)"

 
     wxString GetDirectory();
     wxString GetFilename();
 
     wxString GetDirectory();
     wxString GetFilename();


@@ -140,7 +135,7 @@ public:
         }
     }
 
         }
     }
 

-    %pragma(python) addtomethod = "__init__:wxp._StdDialogCallbacks(self)"
+    %pragma(python) addtomethod = "__init__:wx._StdDialogCallbacks(self)"

 
     int GetSelection();
     wxString GetStringSelection();
 
     int GetSelection();
     wxString GetStringSelection();


@@ -160,7 +155,7 @@ public:
                       long style = wxOK | wxCANCEL | wxCENTRE,
                       const wxPoint& pos = wxPyDefaultPosition);
 
                       long style = wxOK | wxCANCEL | wxCENTRE,
                       const wxPoint& pos = wxPyDefaultPosition);
 

-    %pragma(python) addtomethod = "__init__:wxp._StdDialogCallbacks(self)"
+    %pragma(python) addtomethod = "__init__:wx._StdDialogCallbacks(self)"

 
     wxString GetValue();
     void SetValue(const wxString& value);
 
     wxString GetValue();
     void SetValue(const wxString& value);


@@ -194,7 +189,7 @@ class wxFontDialog : public wxDialog {
 public:
     wxFontDialog(wxWindow* parent, wxFontData* data = NULL);
 
 public:
     wxFontDialog(wxWindow* parent, wxFontData* data = NULL);
 

-    %pragma(python) addtomethod = "__init__:wxp._StdDialogCallbacks(self)"
+    %pragma(python) addtomethod = "__init__:wx._StdDialogCallbacks(self)"

 
     wxFontData& GetFontData();
     int ShowModal();
 
     wxFontData& GetFontData();
     int ShowModal();


@@ -241,7 +236,7 @@ class wxPageSetupDialog : public wxDialog {
 public:
     wxPageSetupDialog(wxWindow* parent, wxPageSetupData* data = NULL);
 
 public:
     wxPageSetupDialog(wxWindow* parent, wxPageSetupData* data = NULL);
 

-    %pragma(python) addtomethod = "__init__:wxp._StdDialogCallbacks(self)"
+    %pragma(python) addtomethod = "__init__:wx._StdDialogCallbacks(self)"

 
     wxPageSetupData& GetPageSetupData();
     int ShowModal();
 
     wxPageSetupData& GetPageSetupData();
     int ShowModal();


@@ -282,7 +277,7 @@ class wxPrintDialog : public wxDialog {
 public:
     wxPrintDialog(wxWindow* parent, wxPrintData* data = NULL);
 
 public:
     wxPrintDialog(wxWindow* parent, wxPrintData* data = NULL);
 

-    %pragma(python) addtomethod = "__init__:wxp._StdDialogCallbacks(self)"
+    %pragma(python) addtomethod = "__init__:wx._StdDialogCallbacks(self)"

 
     wxPrintData& GetPrintData();
     %new wxDC* GetPrintDC();
 
     wxPrintData& GetPrintData();
     %new wxDC* GetPrintDC();


@@ -299,7 +294,7 @@ public:
                     long style = wxOK | wxCANCEL | wxCENTRE,
                     const wxPoint& pos = wxPyDefaultPosition);
 
                     long style = wxOK | wxCANCEL | wxCENTRE,
                     const wxPoint& pos = wxPyDefaultPosition);
 

-    %pragma(python) addtomethod = "__init__:wxp._StdDialogCallbacks(self)"
+    %pragma(python) addtomethod = "__init__:wx._StdDialogCallbacks(self)"

 
     int ShowModal();
 };
 
     int ShowModal();
 };


@@ -310,7 +305,30 @@ public:
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$
 /////////////////////////////////////////////////////////////////////////////
 //
 // $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
 // Revision 1.6  1998/11/25 08:45:22  RD

+//

 // Added wxPalette, wxRegion, wxRegionIterator, wxTaskbarIcon
 // Added events for wxGrid
 // Other various fixes and additions
 // Added wxPalette, wxRegion, wxRegionIterator, wxTaskbarIcon
 // Added events for wxGrid
 // Other various fixes and additions