added wxEXPLICIT macro

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

diff --git a/wxPython/src/_defs.i b/wxPython/src/_defs.i
index 8cbfd8782e1cddca8613c515a8949c219f2dd4f2..2e02039ea54d70093a33e8a8966b3c738104ed20 100644 (file)
--- a/wxPython/src/_defs.i
+++ b/wxPython/src/_defs.i
@@ -380,6 +380,9 @@ enum {
     wxPRINT_QUALITY_LOW,
     wxPRINT_QUALITY_DRAFT,
 
+    wxID_ANY,
+    wxID_SEPARATOR,
+
     wxID_OPEN,
     wxID_CLOSE,
     wxID_NEW,
@@ -515,6 +518,16 @@ enum {
     wxMM_POINTS,
     wxMM_METRIC,
 
+    wxTIMER_CONTINUOUS,
+    wxTIMER_ONE_SHOT,
+
+    // the symbolic names for the mouse buttons
+    wxMOUSE_BTN_ANY,
+    wxMOUSE_BTN_NONE,
+    wxMOUSE_BTN_LEFT,
+    wxMOUSE_BTN_MIDDLE,
+    wxMOUSE_BTN_RIGHT,
+
 };
 
 
@@ -998,6 +1011,7 @@ enum wxEventType {
  wxEVT_SCROLL_PAGEDOWN,
  wxEVT_SCROLL_THUMBTRACK,
  wxEVT_SCROLL_THUMBRELEASE,
+ wxEVT_SCROLL_ENDSCROLL,
 
  /*
   * Scrolled Window