Compilation fixes

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

diff --git a/utils/wxPython/src/_defs.i b/utils/wxPython/src/_defs.i
index 98c6124f097f64cdb18b287f8e5dedd63ddf8e28..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;


@@ -232,11 +233,16 @@ enum {
     wxCOLOURED,
     wxFIXED_LENGTH,
     wxALIGN_LEFT,
     wxCOLOURED,
     wxFIXED_LENGTH,
     wxALIGN_LEFT,

-    wxALIGN_CENTER,
-    wxALIGN_CENTRE,
+    wxALIGN_CENTER_HORIZONTAL,
+    wxALIGN_CENTRE_HORIZONTAL,

     wxALIGN_RIGHT,
     wxALIGN_BOTTOM,
     wxALIGN_RIGHT,
     wxALIGN_BOTTOM,

+    wxALIGN_CENTER_VERTICAL,
+    wxALIGN_CENTRE_VERTICAL,

     wxALIGN_TOP,
     wxALIGN_TOP,

+    wxALIGN_CENTER,
+    wxALIGN_CENTRE,
+    wxSHAPED,

     wxLB_NEEDED_SB,
     wxLB_ALWAYS_SB,
     wxLB_SORT,
     wxLB_NEEDED_SB,
     wxLB_ALWAYS_SB,
     wxLB_SORT,


@@ -418,6 +424,7 @@ enum {
     wxBITMAP_TYPE_ANY,
     wxBITMAP_TYPE_RESOURCE,
     wxBITMAP_TYPE_JPEG,
     wxBITMAP_TYPE_ANY,
     wxBITMAP_TYPE_RESOURCE,
     wxBITMAP_TYPE_JPEG,

+    wxBITMAP_TYPE_PCX,

 
     wxOPEN,
     wxSAVE,
 
     wxOPEN,
     wxSAVE,


@@ -466,7 +473,6 @@ enum {
     wxLI_HORIZONTAL,
     wxLI_VERTICAL,
 
     wxLI_HORIZONTAL,
     wxLI_VERTICAL,
 

-

     wxHW_SCROLLBAR_NEVER,
     wxHW_SCROLLBAR_AUTO,
 
     wxHW_SCROLLBAR_NEVER,
     wxHW_SCROLLBAR_AUTO,
 


@@ -537,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 {


@@ -763,6 +769,7 @@ enum wxEventType {
  wxEVT_COMMAND_LISTBOX_SELECTED,
  wxEVT_COMMAND_LISTBOX_DOUBLECLICKED,
  wxEVT_COMMAND_CHECKLISTBOX_TOGGLED,
  wxEVT_COMMAND_LISTBOX_SELECTED,
  wxEVT_COMMAND_LISTBOX_DOUBLECLICKED,
  wxEVT_COMMAND_CHECKLISTBOX_TOGGLED,

+ wxEVT_COMMAND_SPINCTRL_UPDATED,

  wxEVT_COMMAND_TEXT_UPDATED,
  wxEVT_COMMAND_TEXT_ENTER,
  wxEVT_COMMAND_MENU_SELECTED,
  wxEVT_COMMAND_TEXT_UPDATED,
  wxEVT_COMMAND_TEXT_ENTER,
  wxEVT_COMMAND_MENU_SELECTED,


@@ -823,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


@@ -834,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,