jconfig.h uses configures results

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

diff --git a/utils/wxPython/src/windows.i b/utils/wxPython/src/windows.i
index 8243a53ec47241f2499b8e730d0c771c962eea65..99fc69c14d770cf5220ca412f21c8af2f459435d 100644 (file)
--- a/utils/wxPython/src/windows.i
+++ b/utils/wxPython/src/windows.i
@@ -34,6 +34,7 @@
 
 class wxEvtHandler {
 public:
 
 class wxEvtHandler {
 public:

+    bool ProcessEvent(wxEvent& event);

     %addmethods {
         void Connect( int id, int lastId, int eventType, PyObject* func) {
             if (PyCallable_Check(func)) {
     %addmethods {
         void Connect( int id, int lastId, int eventType, PyObject* func) {
             if (PyCallable_Check(func)) {


@@ -176,6 +177,9 @@ public:
     %name(ConvertDialogPointToPixels) wxPoint ConvertDialogToPixels(const wxPoint& pt);
     %name(ConvertDialogSizeToPixels)  wxSize  ConvertDialogToPixels(const wxSize& sz);
 
     %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);
 
     %name(ConvertPixelPointToDialog) wxPoint ConvertPixelsToDialog(const wxPoint& pt);
     %name(ConvertPixelSizeToDialog)  wxSize  ConvertPixelsToDialog(const wxSize& sz);
 


@@ -354,6 +358,15 @@ public:
 
 class wxMenuItem {
 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();
     bool IsSeparator();
     bool IsEnabled();
     bool IsChecked();


@@ -361,13 +374,23 @@ public:
     int  GetId();
     wxMenu* GetSubMenu();
     void SetName(const wxString& strName);
     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__
     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
 };
     void DeleteSubMenu();
 #endif
 };


@@ -376,7 +399,27 @@ public:
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$
 /////////////////////////////////////////////////////////////////////////////
 //
 // $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
 // 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
 // reenabled some methods for wxPython on wxGTK
 //
 // Revision 1.13  1999/02/20 10:02:38  RD