fixes for GetReturnCode/SetReturnCode

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

diff --git a/utils/wxPython/src/misc.i b/utils/wxPython/src/misc.i
index b0b149507d5ae1f372bac3d09dd71742ff5f2aa2..984a802bd8e0bc0374a57e32bcc8d1420e018ef9 100644 (file)
--- a/utils/wxPython/src/misc.i
+++ b/utils/wxPython/src/misc.i
@@ -193,8 +193,11 @@ void wxSetCursor(wxCursor& cursor);
 //---------------------------------------------------------------------------
 // Miscellaneous functions
 
 //---------------------------------------------------------------------------
 // Miscellaneous functions
 

-long NewId();
-void RegisterId(long id);
+long wxNewId();
+void wxRegisterId(long id);
+%name(NewId) long wxNewId();
+%name(RegisterId) void wxRegisterId(long id);
+

 void wxBeginBusyCursor(wxCursor *cursor = wxHOURGLASS_CURSOR);
 void wxBell();
 void wxDisplaySize(int *OUTPUT, int *OUTPUT);
 void wxBeginBusyCursor(wxCursor *cursor = wxHOURGLASS_CURSOR);
 void wxBell();
 void wxDisplaySize(int *OUTPUT, int *OUTPUT);


@@ -217,6 +220,7 @@ int wxGetOsVersion(int *OUTPUT, int *OUTPUT);
 #endif
 
 bool wxYield();
 #endif
 
 bool wxYield();

+bool wxSafeYield();

 
 %inline %{
     char* wxGetResource(char *section, char *entry, char *file = NULL) {
 
 %inline %{
     char* wxGetResource(char *section, char *entry, char *file = NULL) {


@@ -388,7 +392,7 @@ public:
 
     void SetTip(const wxString& tip);
     wxString GetTip();
 
     void SetTip(const wxString& tip);
     wxString GetTip();

-    void SetWindow(wxWindow *win);
+    // *** Not in the "public" interface void SetWindow(wxWindow *win);

     wxWindow *GetWindow();
 };
 
     wxWindow *GetWindow();
 };
 


@@ -407,6 +411,25 @@ public:
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$

+// Revision 1.14  1999/04/30 03:29:19  RD
+// wxPython 2.0b9, first phase (win32)
+// Added gobs of stuff, see wxPython/README.txt for details
+//
+// Revision 1.13.4.1  1999/03/27 23:29:15  RD
+//
+// wxPython 2.0b8
+//     Python thread support
+//     various minor additions
+//     various minor fixes
+//
+// Revision 1.13  1999/02/25 07:08:34  RD
+//
+// wxPython version 2.0b5
+//
+// Revision 1.12  1999/02/20 10:02:37  RD
+//
+// Changes needed to enable wxGTK compatibility.
+//

 // Revision 1.11  1999/02/20 09:03:01  RD
 // Added wxWindow_FromHWND(hWnd) for wxMSW to construct a wxWindow from a
 // window handle.  If you can get the window handle into the python code,
 // Revision 1.11  1999/02/20 09:03:01  RD
 // Added wxWindow_FromHWND(hWnd) for wxMSW to construct a wxWindow from a
 // window handle.  If you can get the window handle into the python code,