Fixed wxValidator::Clone and friends to return a wxObject* to keep

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

diff --git a/utils/wxPython/src/windows.i b/utils/wxPython/src/windows.i
index 26d4ee63a3d492dfe4820974343d3a950e79e209..8243a53ec47241f2499b8e730d0c771c962eea65 100644 (file)
--- a/utils/wxPython/src/windows.i
+++ b/utils/wxPython/src/windows.i
@@ -64,7 +64,9 @@ public:
     void Center(int direction = wxHORIZONTAL);
     void Centre(int direction = wxHORIZONTAL);
     %name(ClientToScreenXY)void ClientToScreen(int *BOTH, int *BOTH);
+#ifndef __WXGTK__
     wxPoint ClientToScreen(const wxPoint& pt);
+#endif
     bool Close(int force = FALSE);
     bool Destroy();
     void DestroyChildren();
@@ -128,7 +130,9 @@ public:
     void Refresh(bool eraseBackground = TRUE, const wxRect* rect = NULL);
     void ReleaseMouse();
     %name(ScreenToClientXY)void ScreenToClient(int *BOTH, int *BOTH);
+#ifndef __WXGTK__
     wxPoint ScreenToClient(const wxPoint& pt);
+#endif
 
     void ScrollWindow(int dx, int dy, const wxRect* rect = NULL);
     void SetAcceleratorTable(const wxAcceleratorTable& accel);
@@ -287,7 +291,9 @@ public:
                 int checkable = FALSE);
     %name(AppendMenu)void Append(int id, const wxString& item, wxMenu *subMenu,
                 const wxString& helpString = wxPyEmptyStr);
+#ifndef __WXGTK__
     %name(AppendItem)void Append(const wxMenuItem* item);
+#endif
 
     void AppendSeparator();
     void Break();
@@ -370,6 +376,13 @@ public:
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$
+// Revision 1.14  1999/02/23 23:48:33  RD
+// reenabled some methods for wxPython on wxGTK
+//
+// Revision 1.13  1999/02/20 10:02:38  RD
+//
+// Changes needed to enable wxGTK compatibility.
+//
 // Revision 1.12  1999/02/20 09:03:03  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,