Removed deprecation warnings in OGL and Gizmos

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

diff --git a/wxPython/src/_defs.i b/wxPython/src/_defs.i
index db2a7b206bb2dc45ba6193ef4f09a4e20551d2d1..7e07e029542ef44261fb4f500334e1d8c1c9ff95 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,


@@ -278,6 +284,10 @@ enum {
     wxTE_DONTWRAP,
     wxTE_LINEWRAP,
     wxTE_WORDWRAP,
     wxTE_DONTWRAP,
     wxTE_LINEWRAP,
     wxTE_WORDWRAP,

+    wxTE_LEFT,
+    wxTE_RIGHT,
+    wxTE_CENTER,
+    wxTE_CENTRE,

 
     wxCB_SIMPLE,
     wxCB_DROPDOWN,
 
     wxCB_SIMPLE,
     wxCB_DROPDOWN,


@@ -288,6 +298,7 @@ enum {
     wxRA_SPECIFY_ROWS,
     wxRA_SPECIFY_COLS,
     wxRB_GROUP,
     wxRA_SPECIFY_ROWS,
     wxRA_SPECIFY_COLS,
     wxRB_GROUP,

+    wxRB_SINGLE,

     wxGA_PROGRESSBAR,
     wxGA_HORIZONTAL,
     wxGA_VERTICAL,
     wxGA_PROGRESSBAR,
     wxGA_HORIZONTAL,
     wxGA_VERTICAL,


@@ -306,8 +317,15 @@ enum {
     wxSB_VERTICAL,
     wxST_SIZEGRIP,
     wxST_NO_AUTORESIZE,
     wxSB_VERTICAL,
     wxST_SIZEGRIP,
     wxST_NO_AUTORESIZE,

-    wxBU_AUTODRAW,
+

     wxBU_NOAUTODRAW,
     wxBU_NOAUTODRAW,

+    wxBU_AUTODRAW,
+    wxBU_LEFT,
+    wxBU_TOP,
+    wxBU_RIGHT,
+    wxBU_BOTTOM,
+    wxBU_EXACTFIT,
+

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


@@ -320,7 +338,6 @@ 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,


@@ -368,6 +385,9 @@ enum {
     wxPRINT_QUALITY_LOW,
     wxPRINT_QUALITY_DRAFT,
 
     wxPRINT_QUALITY_LOW,
     wxPRINT_QUALITY_DRAFT,
 

+    wxID_ANY,
+    wxID_SEPARATOR,
+

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


@@ -445,6 +465,9 @@ enum {
     wxPD_ESTIMATED_TIME,
     wxPD_REMAINING_TIME,
 
     wxPD_ESTIMATED_TIME,
     wxPD_REMAINING_TIME,
 

+    wxDD_NEW_DIR_BUTTON,
+    wxDD_DEFAULT_STYLE,
+

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


@@ -500,6 +523,27 @@ enum {
     wxMM_POINTS,
     wxMM_METRIC,
 
     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,
+
+    // It looks like wxTabCtrl may rise from the dead.  Uncomment these if
+    // it gets an implementation for all platforms...
+//     wxTC_RIGHTJUSTIFY,
+//     wxTC_FIXEDWIDTH,
+//     wxTC_TOP,
+//     wxTC_LEFT,
+//     wxTC_RIGHT,
+//     wxTC_BOTTOM,
+//     wxTC_MULTILINE,
+//     wxTC_OWNERDRAW,
+

 };
 
 
 };
 
 


@@ -738,8 +782,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,


@@ -765,12 +810,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
 };


@@ -857,6 +896,16 @@ typedef enum {
 
 
 
 
 
 

+// menu and toolbar item kinds
+enum wxItemKind
+{
+    wxITEM_SEPARATOR = -1,
+    wxITEM_NORMAL,
+    wxITEM_CHECK,
+    wxITEM_RADIO,
+    wxITEM_MAX
+};
+

 enum wxHitTest
 {
     wxHT_NOWHERE,
 enum wxHitTest
 {
     wxHT_NOWHERE,


@@ -884,13 +933,6 @@ enum wxHitTest
 
 
 
 
 
 

-#define FALSE 0
-#define false 0
-#define TRUE 1
-#define true 1
-
-const char* wxVERSION_STRING;
-

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


@@ -944,6 +986,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,


@@ -958,6 +1002,8 @@ enum wxEventType {
  wxEVT_NC_MIDDLE_DCLICK,
  wxEVT_NC_RIGHT_DCLICK,
 
  wxEVT_NC_MIDDLE_DCLICK,
  wxEVT_NC_RIGHT_DCLICK,
 

+ wxEVT_SET_CURSOR,
+

 /* Character input event type  */
  wxEVT_CHAR,
  wxEVT_KEY_DOWN,
 /* Character input event type  */
  wxEVT_CHAR,
  wxEVT_KEY_DOWN,


@@ -975,6 +1021,7 @@ enum wxEventType {
  wxEVT_SCROLL_PAGEDOWN,
  wxEVT_SCROLL_THUMBTRACK,
  wxEVT_SCROLL_THUMBRELEASE,
  wxEVT_SCROLL_PAGEDOWN,
  wxEVT_SCROLL_THUMBTRACK,
  wxEVT_SCROLL_THUMBRELEASE,

+ wxEVT_SCROLL_ENDSCROLL,

 
  /*
   * Scrolled Window
 
  /*
   * Scrolled Window


@@ -1001,7 +1048,6 @@ 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,
  wxEVT_ERASE_BACKGROUND,
  wxEVT_NC_PAINT,