use specific linker flags under Mac OS X when linking executables against the

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

diff --git a/wxPython/src/_defs.i b/wxPython/src/_defs.i
index 4e393463b1cf0a1c3b6e7a6d6d02fdbb95ff598b..ce213ca94b04274eaf47f74a34834f40bff63699 100644 (file)
--- a/wxPython/src/_defs.i
+++ b/wxPython/src/_defs.i
@@ -233,11 +233,17 @@ enum {
 
     wxRETAINED,
     wxBACKINGSTORE,
 
     wxRETAINED,
     wxBACKINGSTORE,

-    wxTB_3DBUTTONS,
+

     wxTB_HORIZONTAL,
     wxTB_VERTICAL,
     wxTB_HORIZONTAL,
     wxTB_VERTICAL,

+    wxTB_3DBUTTONS,

     wxTB_FLAT,
     wxTB_DOCKABLE,
     wxTB_FLAT,
     wxTB_DOCKABLE,

+    wxTB_NOICONS,
+    wxTB_TEXT,
+    wxTB_NODIVIDER,
+    wxTB_NOALIGN,
+

     wxCOLOURED,
     wxFIXED_LENGTH,
     wxALIGN_LEFT,
     wxCOLOURED,
     wxFIXED_LENGTH,
     wxALIGN_LEFT,


@@ -268,6 +274,7 @@ enum {
     wxTE_MULTILINE,
     wxTE_PROCESS_TAB,
     wxTE_RICH,
     wxTE_MULTILINE,
     wxTE_PROCESS_TAB,
     wxTE_RICH,

+    wxTE_RICH2,

     wxTE_NO_VSCROLL,
     wxTE_AUTO_SCROLL,
     wxTE_PROCESS_ENTER,
     wxTE_NO_VSCROLL,
     wxTE_AUTO_SCROLL,
     wxTE_PROCESS_ENTER,


@@ -319,6 +326,7 @@ enum {
     wxSP_BORDER,
     wxSP_LIVE_UPDATE,
     wxSP_PERMIT_UNSPLIT,
     wxSP_BORDER,
     wxSP_LIVE_UPDATE,
     wxSP_PERMIT_UNSPLIT,

+    //wxSP_SASH_AQUA,

     wxFLOOD_SURFACE,
     wxFLOOD_BORDER,
     wxODDEVEN_RULE,
     wxFLOOD_SURFACE,
     wxFLOOD_BORDER,
     wxODDEVEN_RULE,


@@ -365,6 +373,7 @@ enum {
     wxPRINT_QUALITY_MEDIUM,
     wxPRINT_QUALITY_LOW,
     wxPRINT_QUALITY_DRAFT,
     wxPRINT_QUALITY_MEDIUM,
     wxPRINT_QUALITY_LOW,
     wxPRINT_QUALITY_DRAFT,

+

     wxID_OPEN,
     wxID_CLOSE,
     wxID_NEW,
     wxID_OPEN,
     wxID_CLOSE,
     wxID_NEW,


@@ -383,6 +392,8 @@ enum {
     wxID_HELP_COMMANDS,
     wxID_HELP_PROCEDURES,
     wxID_HELP_CONTEXT,
     wxID_HELP_COMMANDS,
     wxID_HELP_PROCEDURES,
     wxID_HELP_CONTEXT,

+    wxID_CLOSE_ALL,
+

     wxID_CUT,
     wxID_COPY,
     wxID_PASTE,
     wxID_CUT,
     wxID_COPY,
     wxID_PASTE,


@@ -390,6 +401,7 @@ enum {
     wxID_FIND,
     wxID_DUPLICATE,
     wxID_SELECTALL,
     wxID_FIND,
     wxID_DUPLICATE,
     wxID_SELECTALL,

+

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


@@ -399,17 +411,25 @@ enum {
     wxID_FILE7,
     wxID_FILE8,
     wxID_FILE9,
     wxID_FILE7,
     wxID_FILE8,
     wxID_FILE9,

+

     wxID_OK,
     wxID_CANCEL,
     wxID_APPLY,
     wxID_YES,
     wxID_NO,
     wxID_STATIC,
     wxID_OK,
     wxID_CANCEL,
     wxID_APPLY,
     wxID_YES,
     wxID_NO,
     wxID_STATIC,

-    wxID_SEPARATOR,

     wxID_FORWARD,
     wxID_BACKWARD,
     wxID_FORWARD,
     wxID_BACKWARD,

-    wxID_SETUP,
+    wxID_DEFAULT,

     wxID_MORE,
     wxID_MORE,

+    wxID_SETUP,
+    wxID_RESET,
+    wxID_CONTEXT_HELP,
+    wxID_YESTOALL,
+    wxID_NOTOALL,
+    wxID_ABORT,
+    wxID_RETRY,
+    wxID_IGNORE,

 
     wxOPEN,
     wxSAVE,
 
     wxOPEN,
     wxSAVE,


@@ -431,6 +451,8 @@ enum {
     wxPD_ESTIMATED_TIME,
     wxPD_REMAINING_TIME,
 
     wxPD_ESTIMATED_TIME,
     wxPD_REMAINING_TIME,
 

+    wxDD_NEW_DIR_BUTTON,
+

     wxMENU_TEAROFF,
     wxMB_DOCKABLE,
     wxNO_FULL_REPAINT_ON_RESIZE,
     wxMENU_TEAROFF,
     wxMB_DOCKABLE,
     wxNO_FULL_REPAINT_ON_RESIZE,


@@ -462,9 +484,6 @@ enum {
     wxLI_HORIZONTAL,
     wxLI_VERTICAL,
 
     wxLI_HORIZONTAL,
     wxLI_VERTICAL,
 

-    wxHW_SCROLLBAR_NEVER,
-    wxHW_SCROLLBAR_AUTO,
-

     wxJOYSTICK1,
     wxJOYSTICK2,
     wxJOY_BUTTON1,
     wxJOYSTICK1,
     wxJOYSTICK2,
     wxJOY_BUTTON1,


@@ -475,6 +494,7 @@ enum {
 
     wxWS_EX_VALIDATE_RECURSIVELY,
     wxWS_EX_BLOCK_EVENTS,
 
     wxWS_EX_VALIDATE_RECURSIVELY,
     wxWS_EX_BLOCK_EVENTS,

+    wxWS_EX_TRANSIENT,

 
     // Mapping modes (as per Windows)
     wxMM_TEXT,
 
     // Mapping modes (as per Windows)
     wxMM_TEXT,


@@ -713,6 +733,8 @@ enum wxBitmapType
     wxBITMAP_TYPE_PICT_RESOURCE,
     wxBITMAP_TYPE_ICON,
     wxBITMAP_TYPE_ICON_RESOURCE,
     wxBITMAP_TYPE_PICT_RESOURCE,
     wxBITMAP_TYPE_ICON,
     wxBITMAP_TYPE_ICON_RESOURCE,

+    wxBITMAP_TYPE_ANI,
+    wxBITMAP_TYPE_IFF,

     wxBITMAP_TYPE_MACCURSOR,
     wxBITMAP_TYPE_MACCURSOR_RESOURCE,
     wxBITMAP_TYPE_ANY = 50
     wxBITMAP_TYPE_MACCURSOR,
     wxBITMAP_TYPE_MACCURSOR_RESOURCE,
     wxBITMAP_TYPE_ANY = 50


@@ -724,8 +746,9 @@ enum wxBitmapType
 // Standard cursors
 enum wxStockCursor
 {
 // Standard cursors
 enum wxStockCursor
 {

-    wxCURSOR_NONE,          // should be 0
+    wxCURSOR_NONE,

     wxCURSOR_ARROW,
     wxCURSOR_ARROW,

+    wxCURSOR_RIGHT_ARROW,

     wxCURSOR_BULLSEYE,
     wxCURSOR_CHAR,
     wxCURSOR_CROSS,
     wxCURSOR_BULLSEYE,
     wxCURSOR_CHAR,
     wxCURSOR_CROSS,


@@ -751,12 +774,6 @@ enum wxStockCursor
     wxCURSOR_WATCH,
     wxCURSOR_BLANK,
     wxCURSOR_DEFAULT,
     wxCURSOR_WATCH,
     wxCURSOR_BLANK,
     wxCURSOR_DEFAULT,

-//      // Not yet implemented for Windows
-//      wxCURSOR_CROSS_REVERSE,
-//      wxCURSOR_DOUBLE_ARROW,
-//      wxCURSOR_BASED_ARROW_UP,
-//      wxCURSOR_BASED_ARROW_DOWN,
-

     wxCURSOR_ARROWWAIT,
     wxCURSOR_MAX
 };
     wxCURSOR_ARROWWAIT,
     wxCURSOR_MAX
 };


@@ -843,12 +860,48 @@ typedef enum {
 
 
 
 
 
 

+// menu and toolbar item kinds
+enum wxItemKind
+{
+    wxITEM_SEPARATOR = -1,
+    wxITEM_NORMAL,
+    wxITEM_CHECK,
+    wxITEM_RADIO,
+    wxITEM_MAX
+};
+
+enum wxHitTest
+{
+    wxHT_NOWHERE,
+
+    // scrollbar
+    wxHT_SCROLLBAR_FIRST = wxHT_NOWHERE,
+    wxHT_SCROLLBAR_ARROW_LINE_1,    // left or upper arrow to scroll by line
+    wxHT_SCROLLBAR_ARROW_LINE_2,    // right or down
+    wxHT_SCROLLBAR_ARROW_PAGE_1,    // left or upper arrow to scroll by page
+    wxHT_SCROLLBAR_ARROW_PAGE_2,    // right or down
+    wxHT_SCROLLBAR_THUMB,           // on the thumb
+    wxHT_SCROLLBAR_BAR_1,           // bar to the left/above the thumb
+    wxHT_SCROLLBAR_BAR_2,           // bar to the right/below the thumb
+    wxHT_SCROLLBAR_LAST,
+
+    // window
+    wxHT_WINDOW_OUTSIDE,            // not in this window at all
+    wxHT_WINDOW_INSIDE,             // in the client area
+    wxHT_WINDOW_VERT_SCROLLBAR,     // on the vertical scrollbar
+    wxHT_WINDOW_HORZ_SCROLLBAR,     // on the horizontal scrollbar
+    wxHT_WINDOW_CORNER,             // on the corner between 2 scrollbars
+
+    wxHT_MAX
+};
+
+
+

 #define FALSE 0
 #define false 0
 #define TRUE 1
 #define true 1
 
 #define FALSE 0
 #define false 0
 #define TRUE 1
 #define true 1
 

-const char* wxVERSION_STRING;

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


@@ -903,6 +956,8 @@ enum wxEventType {
  wxEVT_MIDDLE_DCLICK,
  wxEVT_RIGHT_DCLICK,
 
  wxEVT_MIDDLE_DCLICK,
  wxEVT_RIGHT_DCLICK,
 

+ wxEVT_MOUSE_CAPTURE_CHANGED,
+

  // Non-client mouse events
  wxEVT_NC_LEFT_DOWN,
  wxEVT_NC_LEFT_UP,
  // Non-client mouse events
  wxEVT_NC_LEFT_DOWN,
  wxEVT_NC_LEFT_UP,


@@ -960,16 +1015,16 @@ enum wxEventType {
  wxEVT_SHOW,
  wxEVT_ICONIZE,
  wxEVT_MAXIMIZE,
  wxEVT_SHOW,
  wxEVT_ICONIZE,
  wxEVT_MAXIMIZE,

- wxEVT_MOUSE_CAPTURE_CHANGED,

  wxEVT_PAINT,
  wxEVT_ERASE_BACKGROUND,
  wxEVT_NC_PAINT,
  wxEVT_PAINT_ICON,
  wxEVT_PAINT,
  wxEVT_ERASE_BACKGROUND,
  wxEVT_NC_PAINT,
  wxEVT_PAINT_ICON,

- wxEVT_MENU_CHAR,
- wxEVT_MENU_INIT,
+ wxEVT_MENU_OPEN,
+ wxEVT_MENU_CLOSE,

  wxEVT_MENU_HIGHLIGHT,
  wxEVT_MENU_HIGHLIGHT,

- wxEVT_POPUP_MENU_INIT,
+ wxEVT_CONTEXT_MENU,

  wxEVT_SYS_COLOUR_CHANGED,
  wxEVT_SYS_COLOUR_CHANGED,

+ wxEVT_DISPLAY_CHANGED,

  wxEVT_SETTING_CHANGED,
  wxEVT_QUERY_NEW_PALETTE,
  wxEVT_PALETTE_CHANGED,
  wxEVT_SETTING_CHANGED,
  wxEVT_QUERY_NEW_PALETTE,
  wxEVT_PALETTE_CHANGED,