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

diff --git a/utils/wxPython/src/windows.i b/utils/wxPython/src/windows.i
index f11e6c8594..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)) {
@@ -120,9 +121,7 @@ public:
     void Lower();
     void MakeModal(bool flag);
     %name(MoveXY)void Move(int x, int y);
-#ifndef __WXGTK__
     void Move(const wxPoint& point);
-#endif
 
     //wxEvtHandler* PopEventHandler(bool deleteHandler = FALSE);
     bool PopupMenu(wxMenu *menu, int x, int y);
@@ -164,9 +163,7 @@ public:
 
     void SetSizeHints(int minW=-1, int minH=-1, int maxW=-1, int maxH=-1, int incW=-1, int incH=-1);
     %name(SetClientSizeWH)void SetClientSize(int width, int height);
-#ifndef __WXGTK__
     void SetClientSize(const wxSize& size);
-#endif
     //void SetPalette(wxPalette* palette);
     void SetCursor(const wxCursor&cursor);
     //void SetEventHandler(wxEvtHandler* handler);
@@ -180,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);
 
@@ -358,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();
@@ -365,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
 };
@@ -380,7 +399,31 @@ 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