Compile fix.

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

diff --git a/wxPython/src/_defs.i b/wxPython/src/_defs.i
index ddb38a57c3e47ca54ac2af642d0496ee5f9b01ff..594a1174fca07cbaa732b1ae0a83f3e443567548 100644 (file)
--- a/wxPython/src/_defs.i
+++ b/wxPython/src/_defs.i
@@ -212,6 +212,7 @@ enum {
     wxRESIZE_BORDER,
     wxDIALOG_MODAL,
     wxDIALOG_MODELESS,
     wxRESIZE_BORDER,
     wxDIALOG_MODAL,
     wxDIALOG_MODELESS,

+    wxDIALOG_NO_PARENT,

     wxDEFAULT_FRAME_STYLE,
     wxDEFAULT_DIALOG_STYLE,
 
     wxDEFAULT_FRAME_STYLE,
     wxDEFAULT_DIALOG_STYLE,
 


@@ -219,7 +220,7 @@ enum {
     wxFRAME_FLOAT_ON_PARENT,
     wxFRAME_NO_WINDOW_MENU,
     wxFRAME_NO_TASKBAR,
     wxFRAME_FLOAT_ON_PARENT,
     wxFRAME_NO_WINDOW_MENU,
     wxFRAME_NO_TASKBAR,

-    wxFRAME_EX_CONTEXTHELP,
+

     wxED_CLIENT_MARGIN,
     wxED_BUTTONS_BOTTOM,
     wxED_BUTTONS_RIGHT,
     wxED_CLIENT_MARGIN,
     wxED_BUTTONS_BOTTOM,
     wxED_BUTTONS_RIGHT,


@@ -227,6 +228,7 @@ enum {
     wxEXT_DIALOG_STYLE,
 
     wxCLIP_CHILDREN,
     wxEXT_DIALOG_STYLE,
 
     wxCLIP_CHILDREN,

+    wxCLIP_SIBLINGS,

 
     wxRETAINED,
     wxBACKINGSTORE,
 
     wxRETAINED,
     wxBACKINGSTORE,


@@ -268,6 +270,7 @@ enum {
     wxTE_MULTILINE,
     wxTE_AUTO_SCROLL,
     wxTE_NO_VSCROLL,
     wxTE_MULTILINE,
     wxTE_AUTO_SCROLL,
     wxTE_NO_VSCROLL,

+    wxTE_AUTO_URL,

     wxCB_SIMPLE,
     wxCB_DROPDOWN,
     wxCB_SORT,
     wxCB_SIMPLE,
     wxCB_DROPDOWN,
     wxCB_SORT,


@@ -303,25 +306,6 @@ enum {
     wxTR_MULTIPLE,
     wxTR_SINGLE,
     wxTR_HAS_VARIABLE_ROW_HEIGHT,
     wxTR_MULTIPLE,
     wxTR_SINGLE,
     wxTR_HAS_VARIABLE_ROW_HEIGHT,

-    wxLC_ICON,
-    wxLC_SMALL_ICON,
-    wxLC_LIST,
-    wxLC_REPORT,
-    wxLC_ALIGN_TOP,
-    wxLC_ALIGN_LEFT,
-    wxLC_AUTOARRANGE,
-    wxLC_USER_TEXT,
-    wxLC_EDIT_LABELS,
-    wxLC_NO_HEADER,
-    wxLC_NO_SORT_HEADER,
-    wxLC_SINGLE_SEL,
-    wxLC_SORT_ASCENDING,
-    wxLC_SORT_DESCENDING,
-    wxLC_MASK_TYPE,
-    wxLC_MASK_ALIGN,
-    wxLC_MASK_SORT,
-    wxLC_HRULES,
-    wxLC_VRULES,

     wxSP_VERTICAL,
     wxSP_HORIZONTAL,
     wxSP_ARROW_KEYS,
     wxSP_VERTICAL,
     wxSP_HORIZONTAL,
     wxSP_ARROW_KEYS,


@@ -403,6 +387,8 @@ enum {
     wxID_PASTE,
     wxID_CLEAR,
     wxID_FIND,
     wxID_PASTE,
     wxID_CLEAR,
     wxID_FIND,

+    wxID_DUPLICATE,
+    wxID_SELECTALL,

     wxID_FILE1,
     wxID_FILE2,
     wxID_FILE3,
     wxID_FILE1,
     wxID_FILE2,
     wxID_FILE3,


@@ -424,7 +410,6 @@ enum {
     wxID_SETUP,
     wxID_MORE,
 
     wxID_SETUP,
     wxID_MORE,
 

-

     wxOPEN,
     wxSAVE,
     wxHIDE_READONLY,
     wxOPEN,
     wxSAVE,
     wxHIDE_READONLY,


@@ -471,6 +456,7 @@ enum {
     wxNB_LEFT,
     wxNB_RIGHT,
     wxNB_BOTTOM,
     wxNB_LEFT,
     wxNB_RIGHT,
     wxNB_BOTTOM,

+    wxNB_MULTILINE,

 
     wxLI_HORIZONTAL,
     wxLI_VERTICAL,
 
     wxLI_HORIZONTAL,
     wxLI_VERTICAL,


@@ -486,6 +472,8 @@ enum {
     wxJOY_BUTTON4,
     wxJOY_BUTTON_ANY,
 
     wxJOY_BUTTON4,
     wxJOY_BUTTON_ANY,
 

+    wxWS_EX_VALIDATE_RECURSIVELY,
+

 };
 
 
 };
 
 


@@ -826,6 +814,7 @@ enum wxEventType {
  wxEVT_COMMAND_SPINCTRL_UPDATED,
  wxEVT_COMMAND_TEXT_UPDATED,
  wxEVT_COMMAND_TEXT_ENTER,
  wxEVT_COMMAND_SPINCTRL_UPDATED,
  wxEVT_COMMAND_TEXT_UPDATED,
  wxEVT_COMMAND_TEXT_ENTER,

+ wxEVT_COMMAND_TEXT_URL,

  wxEVT_COMMAND_MENU_SELECTED,
  wxEVT_COMMAND_SLIDER_UPDATED,
  wxEVT_COMMAND_RADIOBOX_SELECTED,
  wxEVT_COMMAND_MENU_SELECTED,
  wxEVT_COMMAND_SLIDER_UPDATED,
  wxEVT_COMMAND_RADIOBOX_SELECTED,


@@ -839,6 +828,7 @@ enum wxEventType {
  wxEVT_COMMAND_TOOL_ENTER,
  wxEVT_SET_FOCUS,
  wxEVT_KILL_FOCUS,
  wxEVT_COMMAND_TOOL_ENTER,
  wxEVT_SET_FOCUS,
  wxEVT_KILL_FOCUS,

+ wxEVT_MOUSEWHEEL,

 
 /* Mouse event types */
  wxEVT_LEFT_DOWN,
 
 /* Mouse event types */
  wxEVT_LEFT_DOWN,


@@ -855,7 +845,7 @@ enum wxEventType {
  wxEVT_RIGHT_DCLICK,
 
  // Non-client mouse events
  wxEVT_RIGHT_DCLICK,
 
  // Non-client mouse events

- wxEVT_NC_LEFT_DOWN = wxEVT_FIRST + 100,
+ wxEVT_NC_LEFT_DOWN,

  wxEVT_NC_LEFT_UP,
  wxEVT_NC_MIDDLE_DOWN,
  wxEVT_NC_MIDDLE_UP,
  wxEVT_NC_LEFT_UP,
  wxEVT_NC_MIDDLE_DOWN,
  wxEVT_NC_MIDDLE_UP,


@@ -920,7 +910,6 @@ enum wxEventType {
  wxEVT_MENU_INIT,
  wxEVT_MENU_HIGHLIGHT,
  wxEVT_POPUP_MENU_INIT,
  wxEVT_MENU_INIT,
  wxEVT_MENU_HIGHLIGHT,
  wxEVT_POPUP_MENU_INIT,

- wxEVT_CONTEXT_MENU,

  wxEVT_SYS_COLOUR_CHANGED,
  wxEVT_SETTING_CHANGED,
  wxEVT_QUERY_NEW_PALETTE,
  wxEVT_SYS_COLOUR_CHANGED,
  wxEVT_SETTING_CHANGED,
  wxEVT_QUERY_NEW_PALETTE,


@@ -953,8 +942,6 @@ enum wxEventType {
 
  wxEVT_TIMER,
 
 
  wxEVT_TIMER,
 

- wxWS_EX_VALIDATE_RECURSIVELY,
-

 };
 
 
 };