X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/af309447ff8413abd2fa5e9cc780fcef1c891f87..d9f39e09e82e99c422619f4e3df536d0a9e87987:/utils/wxPython/src/windows.i

diff --git a/utils/wxPython/src/windows.i b/utils/wxPython/src/windows.i
index 26d4ee63a3..99fc69c14d 100644
--- a/utils/wxPython/src/windows.i
+++ b/utils/wxPython/src/windows.i
@@ -34,6 +34,7 @@
 
 class wxEvtHandler {
 public:
+    bool ProcessEvent(wxEvent& event);
     %addmethods {
         void Connect( int id, int lastId, int eventType, PyObject* func) {
             if (PyCallable_Check(func)) {
@@ -64,7 +65,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 +131,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);
@@ -172,6 +177,9 @@ public:
     %name(ConvertDialogPointToPixels) wxPoint ConvertDialogToPixels(const wxPoint& pt);
     %name(ConvertDialogSizeToPixels)  wxSize  ConvertDialogToPixels(const wxSize& sz);
 
+    %name(DLG_PNT) wxPoint ConvertDialogToPixels(const wxPoint& pt);
+    %name(DLG_SZE) wxSize  ConvertDialogToPixels(const wxSize& sz);
+
     %name(ConvertPixelPointToDialog) wxPoint ConvertPixelsToDialog(const wxPoint& pt);
     %name(ConvertPixelSizeToDialog)  wxSize  ConvertPixelsToDialog(const wxSize& sz);
 
@@ -287,7 +295,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();
@@ -348,6 +358,15 @@ public:
 
 class wxMenuItem {
 public:
+#ifndef __WXGTK__
+    wxMenuItem(wxMenu* parentMenu=NULL, int id=ID_SEPARATOR,
+               const wxString& text = wxPyEmptyStr,
+               const wxString& helpString = wxPyEmptyStr,
+               bool checkable = FALSE, wxMenu* subMenu = NULL);
+#else
+    wxMenuItem();
+#endif
+
     bool IsSeparator();
     bool IsEnabled();
     bool IsChecked();
@@ -355,13 +374,23 @@ public:
     int  GetId();
     wxMenu* GetSubMenu();
     void SetName(const wxString& strName);
-    const wxString& GetName();
-    const wxString& GetHelp();
+    wxString GetName();
+    wxString GetHelp();
     void SetHelp(const wxString& strHelp);
     void Enable(bool bDoEnable = TRUE);
     void Check(bool bDoCheck = TRUE);
 
 #ifdef __WXMSW__
+    wxColour& GetBackgroundColour();
+    wxBitmap GetBitmap(bool checked = TRUE);
+    wxFont& GetFont();
+    int GetMarginWidth();
+    wxColour& GetTextColour();
+    void SetBackgroundColour(const wxColour& colour);
+    void SetBitmaps(const wxBitmap& checked, const wxBitmap& unchecked = wxNullBitmap);
+    void SetFont(const wxFont& font);
+    void SetMarginWidth(int width);
+    void SetTextColour(const wxColour& colour);
     void DeleteSubMenu();
 #endif
 };
@@ -370,6 +399,33 @@ public:
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$
+// Revision 1.15  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.14.4.3  1999/03/27 23:29:15  RD
+//
+// wxPython 2.0b8
+//     Python thread support
+//     various minor additions
+//     various minor fixes
+//
+// Revision 1.14.4.2  1999/03/16 06:26:29  RD
+//
+// wxPython 2.0b7
+//
+// Revision 1.14.4.1  1999/03/16 06:04:04  RD
+//
+// wxPython 2.0b7
+//
+// 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,