Compilation fixes

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

diff --git a/utils/wxPython/src/_defs.i b/utils/wxPython/src/_defs.i
index c5121712acb15b84603923329830ff07e2a7aaec..ce3a96a54a826431d77b2690887991ec8087ffa8 100644 (file)
--- a/utils/wxPython/src/_defs.i
+++ b/utils/wxPython/src/_defs.i
@@ -23,6 +23,7 @@ class wxBitmap;
 class wxBrush;
 class wxButton;
 class wxCalculateLayoutEvent;
 class wxBrush;
 class wxButton;
 class wxCalculateLayoutEvent;

+class wxCaret;

 class wxCheckBox;
 class wxCheckListBox;
 class wxChoice;
 class wxCheckBox;
 class wxCheckListBox;
 class wxChoice;


@@ -542,8 +543,8 @@ typedef enum {
   wxNAND,       // (NOT src) OR (NOT dst)
   wxOR,         // src OR dst
   wxSET,        // 1
   wxNAND,       // (NOT src) OR (NOT dst)
   wxOR,         // src OR dst
   wxSET,        // 1

-  wxSRC_OR,     // source _bitmap_ OR destination
-  wxSRC_AND     // source _bitmap_ AND destination
+//  wxSRC_OR,     // source _bitmap_ OR destination
+//  wxSRC_AND     // source _bitmap_ AND destination

 } form_ops_t;
 
 enum _Virtual_keycodes {
 } form_ops_t;
 
 enum _Virtual_keycodes {


@@ -829,6 +830,7 @@ enum wxEventType {
  wxEVT_SCROLL_PAGEUP,
  wxEVT_SCROLL_PAGEDOWN,
  wxEVT_SCROLL_THUMBTRACK,
  wxEVT_SCROLL_PAGEUP,
  wxEVT_SCROLL_PAGEDOWN,
  wxEVT_SCROLL_THUMBTRACK,

+ wxEVT_SCROLL_THUMBRELEASE,

 
  /*
   * Scrolled Window
 
  /*
   * Scrolled Window


@@ -840,6 +842,7 @@ enum wxEventType {
  wxEVT_SCROLLWIN_PAGEUP,
  wxEVT_SCROLLWIN_PAGEDOWN,
  wxEVT_SCROLLWIN_THUMBTRACK,
  wxEVT_SCROLLWIN_PAGEUP,
  wxEVT_SCROLLWIN_PAGEDOWN,
  wxEVT_SCROLLWIN_THUMBTRACK,

+ wxEVT_SCROLLWIN_THUMBRELEASE,

 
  wxEVT_SIZE = wxEVT_FIRST + 200,
  wxEVT_MOVE,
 
  wxEVT_SIZE = wxEVT_FIRST + 200,
  wxEVT_MOVE,