use generic timer in wxMGL and wxX11

[wxWidgets.git] / wxPython / src / windows3.i

diff --git a/wxPython/src/windows3.i b/wxPython/src/windows3.i
index 15dddb012f804acfda0c98adc71dd805c75cfa82..8b8ad5fb9a7054bed64653ccb7b4ddfd9bdc36ea 100644 (file)
--- a/wxPython/src/windows3.i
+++ b/wxPython/src/windows3.i
@@ -18,6 +18,7 @@
 #include <wx/laywin.h>
 #ifndef __WXMAC__
 #include <wx/popupwin.h>
 #include <wx/laywin.h>
 #ifndef __WXMAC__
 #include <wx/popupwin.h>

+#include <wx/tipwin.h>

 #endif
 %}
 
 #endif
 %}
 


@@ -219,6 +220,7 @@ public:
 
     bool Create(wxWindow *parent, int flags = wxBORDER_NONE);
 
 
     bool Create(wxWindow *parent, int flags = wxBORDER_NONE);
 

+    // the point must be given in screen coordinates!

     void Position(const wxPoint& ptOrigin,
                   const wxSize& size);
 };
     void Position(const wxPoint& ptOrigin,
                   const wxSize& size);
 };


@@ -233,11 +235,12 @@ public:
         : wxPopupTransientWindow(parent, style) {}
 
     DEC_PYCALLBACK_BOOL_ME(ProcessLeftDown);
         : wxPopupTransientWindow(parent, style) {}
 
     DEC_PYCALLBACK_BOOL_ME(ProcessLeftDown);

+    DEC_PYCALLBACK__(OnDismiss);

     PYPRIVATE;
 };
 
 IMP_PYCALLBACK_BOOL_ME(wxPyPopupTransientWindow, wxPopupTransientWindow, ProcessLeftDown);
     PYPRIVATE;
 };
 
 IMP_PYCALLBACK_BOOL_ME(wxPyPopupTransientWindow, wxPopupTransientWindow, ProcessLeftDown);

-
+IMP_PYCALLBACK__(wxPyPopupTransientWindow, wxPopupTransientWindow, OnDismiss);

 %}
 
 
 %}
 
 


@@ -264,6 +267,33 @@ public:
     virtual void Dismiss();
 };
 
     virtual void Dismiss();
 };
 

-#endif

 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
 

+class wxTipWindow : public wxPyPopupTransientWindow
+{
+public:
+    %addmethods {
+        wxTipWindow(wxWindow *parent,
+                    const wxString* text,
+                    wxCoord maxLength = 100,
+                    wxRect* rectBound = NULL) {
+            wxString tmp = *text;
+            return new wxTipWindow(parent, tmp, maxLength, NULL, rectBound);
+        }
+    }
+
+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
+
+    // If rectBound is not NULL, the window will disappear automatically when
+    // the mouse leave the specified rect: note that rectBound should be in the
+    // screen coordinates!
+    void SetBoundingRect(const wxRect& rectBound);
+
+    // Hide and destroy the window
+    void Close();
+};
+
+
+//---------------------------------------------------------------------------
+
+#endif