wxITEM_FOO instead of wxItem_Foo, for the sake of consistency

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14729 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 29d83cd4bb8d29c60242b78c2847e3ec72e8a446..9601f2c17d4ca33859f55ad81f8960464a1c0085 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -1282,11 +1282,11 @@ enum wxBorder
 // menu and toolbar item kinds
 enum wxItemKind
 {
-    wxItem_Separator = -1,
-    wxItem_Normal,
-    wxItem_Check,
-    wxItem_Radio,
-    wxItem_Max
+    wxITEM_SEPARATOR = -1,
+    wxITEM_NORMAL,
+    wxITEM_CHECK,
+    wxITEM_RADIO,
+    wxITEM_MAX
 };
 
 // hit test results

diff --git a/include/wx/gtk/menuitem.h b/include/wx/gtk/menuitem.h
index 6a2ed681ae88b2df30564953c3ef7176b558f66f..54ea397bd126065fdd02b445755fee8c0e60de16 100644 (file)
--- a/include/wx/gtk/menuitem.h
+++ b/include/wx/gtk/menuitem.h
@@ -27,7 +27,7 @@ public:
                int id = wxID_SEPARATOR,
                const wxString& text = wxEmptyString,
                const wxString& help = wxEmptyString,
-               wxItemKind kind = wxItem_Normal,
+               wxItemKind kind = wxITEM_NORMAL,
                wxMenu *subMenu = (wxMenu *)NULL);
     ~wxMenuItem();
 

diff --git a/include/wx/gtk1/menuitem.h b/include/wx/gtk1/menuitem.h
index 6a2ed681ae88b2df30564953c3ef7176b558f66f..54ea397bd126065fdd02b445755fee8c0e60de16 100644 (file)
--- a/include/wx/gtk1/menuitem.h
+++ b/include/wx/gtk1/menuitem.h
@@ -27,7 +27,7 @@ public:
                int id = wxID_SEPARATOR,
                const wxString& text = wxEmptyString,
                const wxString& help = wxEmptyString,
-               wxItemKind kind = wxItem_Normal,
+               wxItemKind kind = wxITEM_NORMAL,
                wxMenu *subMenu = (wxMenu *)NULL);
     ~wxMenuItem();
 

diff --git a/include/wx/mac/menuitem.h b/include/wx/mac/menuitem.h
index 9011439e22c1ab2622ca2e32ce7ccb7e3b794fbc..155798089291ff9cf3e4f6303d6f80a0afd234ae 100644 (file)
--- a/include/wx/mac/menuitem.h
+++ b/include/wx/mac/menuitem.h
@@ -43,7 +43,7 @@ public:
                int id = wxID_SEPARATOR,
                const wxString& name = wxEmptyString,
                const wxString& help = wxEmptyString,
-               wxItemKind kind = wxItem_Normal,
+               wxItemKind kind = wxITEM_NORMAL,
                wxMenu *subMenu = (wxMenu *)NULL);
     virtual ~wxMenuItem();
 

diff --git a/include/wx/menu.h b/include/wx/menu.h
index 09c0dbd17ed8a0d491c194add99c89d428a97345..181781b0a59c2586bcf4bc9c3aa9ace86b1e929b 100644 (file)
--- a/include/wx/menu.h
+++ b/include/wx/menu.h
@@ -79,7 +79,7 @@ public:
     void Append(int id,
                 const wxString& text,
                 const wxString& help = wxEmptyString,
-                wxItemKind kind = wxItem_Normal)
+                wxItemKind kind = wxITEM_NORMAL)
     {
         DoAppend(wxMenuItem::New((wxMenu *)this, id, text, help, kind));
     }
@@ -92,7 +92,7 @@ public:
                          const wxString& text,
                          const wxString& help = wxEmptyString)
     {
-        Append(id, text, help, wxItem_Check);
+        Append(id, text, help, wxITEM_CHECK);
     }
 
     // append a radio item
@@ -100,7 +100,7 @@ public:
                          const wxString& text,
                          const wxString& help = wxEmptyString)
     {
-        Append(id, text, help, wxItem_Radio);
+        Append(id, text, help, wxITEM_RADIO);
     }
 
     // append a submenu
@@ -110,7 +110,7 @@ public:
                 const wxString& help = wxEmptyString)
     {
         DoAppend(wxMenuItem::New((wxMenu *)this, id, text, help,
-                                 wxItem_Normal, submenu));
+                                 wxITEM_NORMAL, submenu));
     }
 
     // the most generic form of Append() - append anything
@@ -128,7 +128,7 @@ public:
                 int id,
                 const wxString& text,
                 const wxString& help = wxEmptyString,
-                wxItemKind kind = wxItem_Normal)
+                wxItemKind kind = wxITEM_NORMAL)
     {
         Insert(pos, wxMenuItem::New((wxMenu *)this, id, text, help, kind));
     }
@@ -145,7 +145,7 @@ public:
                          const wxString& text,
                          const wxString& help = wxEmptyString)
     {
-        Insert(pos, id, text, help, wxItem_Check);
+        Insert(pos, id, text, help, wxITEM_CHECK);
     }
 
     // insert a radio item
@@ -154,7 +154,7 @@ public:
                          const wxString& text,
                          const wxString& help = wxEmptyString)
     {
-        Insert(pos, id, text, help, wxItem_Radio);
+        Insert(pos, id, text, help, wxITEM_RADIO);
     }
 
     // insert a submenu
@@ -165,7 +165,7 @@ public:
                 const wxString& help = wxEmptyString)
     {
         Insert(pos, wxMenuItem::New((wxMenu *)this, id, text, help,
-                                    wxItem_Normal, submenu));
+                                    wxITEM_NORMAL, submenu));
     }
 
     // prepend an item to the menu
@@ -178,7 +178,7 @@ public:
     void Prepend(int id,
                  const wxString& text,
                  const wxString& help = wxEmptyString,
-                 wxItemKind kind = wxItem_Normal)
+                 wxItemKind kind = wxITEM_NORMAL)
     {
         Insert(0u, id, text, help, kind);
     }
@@ -320,7 +320,7 @@ public:
                 const wxString& help,
                 bool isCheckable)
     {
-        Append(id, text, help, isCheckable ? wxItem_Check : wxItem_Normal);
+        Append(id, text, help, isCheckable ? wxITEM_CHECK : wxITEM_NORMAL);
     }
 
     void Insert(size_t pos,
@@ -329,7 +329,7 @@ public:
                 const wxString& help,
                 bool isCheckable)
     {
-        Insert(pos, id, text, help, isCheckable ? wxItem_Check : wxItem_Normal);
+        Insert(pos, id, text, help, isCheckable ? wxITEM_CHECK : wxITEM_NORMAL);
     }
 
     void Prepend(int id,

diff --git a/include/wx/menuitem.h b/include/wx/menuitem.h
index cf8b989bf6696390f46b680e831c3bab395d5eab..59d6e3de901db44e1061ed911266cecc50a61e04 100644 (file)
--- a/include/wx/menuitem.h
+++ b/include/wx/menuitem.h
@@ -41,7 +41,7 @@ public:
                            int id = wxID_SEPARATOR,
                            const wxString& text = wxEmptyString,
                            const wxString& help = wxEmptyString,
-                           wxItemKind kind = wxItem_Normal,
+                           wxItemKind kind = wxITEM_NORMAL,
                            wxMenu *subMenu = (wxMenu *)NULL);
 
     // destruction: wxMenuItem will delete its submenu
@@ -71,9 +71,9 @@ public:
     // what kind of menu item we are
     wxItemKind GetKind() const { return m_kind; }
 
-    virtual void SetCheckable(bool checkable) { m_kind = wxItem_Check; }
+    virtual void SetCheckable(bool checkable) { m_kind = wxITEM_CHECK; }
     bool IsCheckable() const
-        { return m_kind == wxItem_Check || m_kind == wxItem_Radio; }
+        { return m_kind == wxITEM_CHECK || m_kind == wxITEM_RADIO; }
 
     bool IsSubMenu() const { return m_subMenu != NULL; }
     void SetSubMenu(wxMenu *menu) { m_subMenu = menu; }
@@ -116,7 +116,7 @@ public:
                            wxMenu *subMenu = (wxMenu *)NULL)
     {
         return New(parentMenu, id, text, help,
-                   isCheckable ? wxItem_Check : wxItem_Normal, subMenu);
+                   isCheckable ? wxITEM_CHECK : wxITEM_NORMAL, subMenu);
     }
 
 protected:
@@ -134,7 +134,7 @@ protected:
                    int id = wxID_SEPARATOR,
                    const wxString& text = wxEmptyString,
                    const wxString& help = wxEmptyString,
-                   wxItemKind kind = wxItem_Normal,
+                   wxItemKind kind = wxITEM_NORMAL,
                    wxMenu *subMenu = (wxMenu *)NULL);
 
 private:

diff --git a/include/wx/motif/menuitem.h b/include/wx/motif/menuitem.h
index 8a7ff97bc59e1372c6e0fa59d13d78a29d5c1ca8..b871308031fcfdd82d25ecdae34ad47b181cc95c 100644 (file)
--- a/include/wx/motif/menuitem.h
+++ b/include/wx/motif/menuitem.h
@@ -32,7 +32,7 @@ public:
                int id = wxID_SEPARATOR,
                const wxString& text = wxEmptyString,
                const wxString& help = wxEmptyString,
-               wxItemKind kind = wxItem_Normal,
+               wxItemKind kind = wxITEM_NORMAL,
                wxMenu *subMenu = (wxMenu *)NULL);
     ~wxMenuItem();
     

diff --git a/include/wx/msw/menuitem.h b/include/wx/msw/menuitem.h
index dbc4478b3db7125a57e40b8d0e5b73fe4f066ca2..99d7cda1a1a07ca79e24f67ec72957d03d307d9f 100644 (file)
--- a/include/wx/msw/menuitem.h
+++ b/include/wx/msw/menuitem.h
@@ -39,7 +39,7 @@ public:
                int id = wxID_SEPARATOR,
                const wxString& name = wxEmptyString,
                const wxString& help = wxEmptyString,
-               wxItemKind kind = wxItem_Normal,
+               wxItemKind kind = wxITEM_NORMAL,
                wxMenu *subMenu = (wxMenu *)NULL);
     virtual ~wxMenuItem();
 

diff --git a/include/wx/univ/menuitem.h b/include/wx/univ/menuitem.h
index ccbb528f98b694972d36566bf51e6ae4bbfa471a..52049e5f716d8fbf509237b184eb8a22712b3112 100644 (file)
--- a/include/wx/univ/menuitem.h
+++ b/include/wx/univ/menuitem.h
@@ -28,7 +28,7 @@ public:
                int id = wxID_SEPARATOR,
                const wxString& name = wxEmptyString,
                const wxString& help = wxEmptyString,
-               wxItemKind kind = wxItem_Normal,
+               wxItemKind kind = wxITEM_NORMAL,
                wxMenu *subMenu = (wxMenu *)NULL);
     virtual ~wxMenuItem();
 

diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp
index 8474b6382ee98ddec0a59c792fb235355544bece..5c1a0eb2855d727798be2039c18e375b329f991e 100644 (file)
--- a/src/gtk/menu.cpp
+++ b/src/gtk/menu.cpp
@@ -842,7 +842,7 @@ void wxMenuItem::Check( bool check )
     wxMenuItemBase::Check( check );
 
     // GTK+ does it itself for the radio item
-    if ( GetKind() == wxItem_Check )
+    if ( GetKind() == wxITEM_CHECK )
     {
         gtk_check_menu_item_set_state( (GtkCheckMenuItem*)m_menuItem, (gint)check );
     }
@@ -1061,11 +1061,11 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem)
         const char *item_type;
         switch ( mitem->GetKind() )
         {
-            case wxItem_Check:
+            case wxITEM_CHECK:
                 item_type = "<CheckItem>";
                 break;
 
-            case wxItem_Radio:
+            case wxITEM_RADIO:
                 if ( m_pathLastRadio.empty() )
                 {
                     // start of a new radio group
@@ -1089,7 +1089,7 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem)
                 wxFAIL_MSG( _T("unexpected menu item kind") );
                 // fall through
 
-            case wxItem_Normal:
+            case wxITEM_NORMAL:
                 item_type = "<Item>";
                 break;
         }

diff --git a/src/gtk1/menu.cpp b/src/gtk1/menu.cpp
index 8474b6382ee98ddec0a59c792fb235355544bece..5c1a0eb2855d727798be2039c18e375b329f991e 100644 (file)
--- a/src/gtk1/menu.cpp
+++ b/src/gtk1/menu.cpp
@@ -842,7 +842,7 @@ void wxMenuItem::Check( bool check )
     wxMenuItemBase::Check( check );
 
     // GTK+ does it itself for the radio item
-    if ( GetKind() == wxItem_Check )
+    if ( GetKind() == wxITEM_CHECK )
     {
         gtk_check_menu_item_set_state( (GtkCheckMenuItem*)m_menuItem, (gint)check );
     }
@@ -1061,11 +1061,11 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem)
         const char *item_type;
         switch ( mitem->GetKind() )
         {
-            case wxItem_Check:
+            case wxITEM_CHECK:
                 item_type = "<CheckItem>";
                 break;
 
-            case wxItem_Radio:
+            case wxITEM_RADIO:
                 if ( m_pathLastRadio.empty() )
                 {
                     // start of a new radio group
@@ -1089,7 +1089,7 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem)
                 wxFAIL_MSG( _T("unexpected menu item kind") );
                 // fall through
 
-            case wxItem_Normal:
+            case wxITEM_NORMAL:
                 item_type = "<Item>";
                 break;
         }

diff --git a/src/msw/menu.cpp b/src/msw/menu.cpp
index ec96dc7bc87d10e9fd494294d0c20bdeda9c7fb8..8a3769808200abcf593402344661062d262b3346 100644 (file)
--- a/src/msw/menu.cpp
+++ b/src/msw/menu.cpp
@@ -329,7 +329,7 @@ bool wxMenu::DoAppend(wxMenuItem *item)
 {
     wxCHECK_MSG( item, FALSE, _T("NULL item in wxMenu::DoAppend") );
 
-    if ( item->GetKind() == wxItem_Radio )
+    if ( item->GetKind() == wxITEM_RADIO )
     {
         if ( m_startRadioGroup == -1 )
         {

diff --git a/src/msw/menuitem.cpp b/src/msw/menuitem.cpp
index 2cabd2c1f2f698ac5a3d614c44d4473ad984433c..2336c4d6ec443e623a5c4e004cffd0744c15456f 100644 (file)
--- a/src/msw/menuitem.cpp
+++ b/src/msw/menuitem.cpp
@@ -89,7 +89,7 @@ wxMenuItem::wxMenuItem(wxMenu *pParentMenu,
                        wxMenu *pSubMenu)
           : wxMenuItemBase(pParentMenu, id, text, strHelp, kind, pSubMenu)
 #if wxUSE_OWNER_DRAWN
-            , wxOwnerDrawn(GetLabelFromText(text), kind == wxItem_Check)
+            , wxOwnerDrawn(GetLabelFromText(text), kind == wxITEM_CHECK)
 #endif // owner drawn
 {
     wxASSERT_MSG( pParentMenu != NULL, wxT("a menu item should have a parent") );
@@ -173,7 +173,7 @@ void wxMenuItem::Check(bool check)
     int flags = check ? MF_CHECKED : MF_UNCHECKED;
     HMENU hmenu = GetHMenuOf(m_parentMenu);
 
-    if ( GetKind() == wxItem_Radio )
+    if ( GetKind() == wxITEM_RADIO )
     {
         // it doesn't make sense to uncheck a radio item - what would this do?
         if ( !check )

diff --git a/wxPython/src/_defs.i b/wxPython/src/_defs.i
index 6e6a1112c29677ae78c0cfff05655651fef23afc..5b6d7a5c8db2d8e06832bde217647ec833301fea 100644 (file)
--- a/wxPython/src/_defs.i
+++ b/wxPython/src/_defs.i
@@ -855,11 +855,11 @@ typedef enum {
 // menu and toolbar item kinds
 enum wxItemKind
 {
-    wxItem_Separator = -1,
-    wxItem_Normal,
-    wxItem_Check,
-    wxItem_Radio,
-    wxItem_Max
+    wxITEM_SEPARATOR = -1,
+    wxITEM_NORMAL,
+    wxITEM_CHECK,
+    wxITEM_RADIO,
+    wxITEM_MAX
 };
 
 enum wxHitTest

diff --git a/wxPython/src/gtk/windows.cpp b/wxPython/src/gtk/windows.cpp
index 081895d10b399f8633029fd0baa5e2711ca7408d..1ecd65a4941e1759b8dcdba14dfe4daef04a78b0 100644 (file)
--- a/wxPython/src/gtk/windows.cpp
+++ b/wxPython/src/gtk/windows.cpp
@@ -7290,7 +7290,7 @@ static PyObject *_wrap_wxMenu_Append(PyObject *self, PyObject *args, PyObject *k
     int  _arg1;
     wxString * _arg2;
     wxString * _arg3 = (wxString *) &wxPyEmptyString;
-    wxItemKind  _arg4 = (wxItemKind ) wxItem_Normal;
+    wxItemKind  _arg4 = (wxItemKind ) wxITEM_NORMAL;
     PyObject * _argo0 = 0;
     PyObject * _obj2 = 0;
     PyObject * _obj3 = 0;
@@ -7574,7 +7574,7 @@ static PyObject *_wrap_wxMenu_Insert(PyObject *self, PyObject *args, PyObject *k
     int  _arg2;
     wxString * _arg3;
     wxString * _arg4 = (wxString *) &wxPyEmptyString;
-    wxItemKind  _arg5 = (wxItemKind ) wxItem_Normal;
+    wxItemKind  _arg5 = (wxItemKind ) wxITEM_NORMAL;
     PyObject * _argo0 = 0;
     PyObject * _obj3 = 0;
     PyObject * _obj4 = 0;
@@ -7862,7 +7862,7 @@ static PyObject *_wrap_wxMenu_Prepend(PyObject *self, PyObject *args, PyObject *
     int  _arg1;
     wxString * _arg2;
     wxString * _arg3 = (wxString *) &wxPyEmptyString;
-    wxItemKind  _arg4 = (wxItemKind ) wxItem_Normal;
+    wxItemKind  _arg4 = (wxItemKind ) wxITEM_NORMAL;
     PyObject * _argo0 = 0;
     PyObject * _obj2 = 0;
     PyObject * _obj3 = 0;
@@ -9968,7 +9968,7 @@ static PyObject *_wrap_new_wxMenuItem(PyObject *self, PyObject *args, PyObject *
     int  _arg1 = (int ) wxID_SEPARATOR;
     wxString * _arg2 = (wxString *) &wxPyEmptyString;
     wxString * _arg3 = (wxString *) &wxPyEmptyString;
-    wxItemKind  _arg4 = (wxItemKind ) wxItem_Normal;
+    wxItemKind  _arg4 = (wxItemKind ) wxITEM_NORMAL;
     wxMenu * _arg5 = (wxMenu *) NULL;
     PyObject * _argo0 = 0;
     PyObject * _obj2 = 0;

diff --git a/wxPython/src/gtk/wx.cpp b/wxPython/src/gtk/wx.cpp
index 0c2ce5821627c61574cf112ef7b65ac751eac72b..71eae9ee1b8a2ca879ce00513e4b868a986d7739 100644 (file)
--- a/wxPython/src/gtk/wx.cpp
+++ b/wxPython/src/gtk/wx.cpp
@@ -2430,11 +2430,11 @@ SWIGEXPORT(void) initwxc() {
         PyDict_SetItemString(d,"wxDUPLEX_SIMPLEX", PyInt_FromLong((long) wxDUPLEX_SIMPLEX));
         PyDict_SetItemString(d,"wxDUPLEX_HORIZONTAL", PyInt_FromLong((long) wxDUPLEX_HORIZONTAL));
         PyDict_SetItemString(d,"wxDUPLEX_VERTICAL", PyInt_FromLong((long) wxDUPLEX_VERTICAL));
-        PyDict_SetItemString(d,"wxItem_Separator", PyInt_FromLong((long) wxItem_Separator));
-        PyDict_SetItemString(d,"wxItem_Normal", PyInt_FromLong((long) wxItem_Normal));
-        PyDict_SetItemString(d,"wxItem_Check", PyInt_FromLong((long) wxItem_Check));
-        PyDict_SetItemString(d,"wxItem_Radio", PyInt_FromLong((long) wxItem_Radio));
-        PyDict_SetItemString(d,"wxItem_Max", PyInt_FromLong((long) wxItem_Max));
+        PyDict_SetItemString(d,"wxITEM_SEPARATOR", PyInt_FromLong((long) wxITEM_SEPARATOR));
+        PyDict_SetItemString(d,"wxITEM_NORMAL", PyInt_FromLong((long) wxITEM_NORMAL));
+        PyDict_SetItemString(d,"wxITEM_CHECK", PyInt_FromLong((long) wxITEM_CHECK));
+        PyDict_SetItemString(d,"wxITEM_RADIO", PyInt_FromLong((long) wxITEM_RADIO));
+        PyDict_SetItemString(d,"wxITEM_MAX", PyInt_FromLong((long) wxITEM_MAX));
         PyDict_SetItemString(d,"wxHT_NOWHERE", PyInt_FromLong((long) wxHT_NOWHERE));
         PyDict_SetItemString(d,"wxHT_SCROLLBAR_FIRST", PyInt_FromLong((long) wxHT_SCROLLBAR_FIRST));
         PyDict_SetItemString(d,"wxHT_SCROLLBAR_ARROW_LINE_1", PyInt_FromLong((long) wxHT_SCROLLBAR_ARROW_LINE_1));

diff --git a/wxPython/src/gtk/wx.py b/wxPython/src/gtk/wx.py
index 03282b6e2f6bf6c022a6e63b7f230d0c37ea9f60..6c9797eefecbb093a23e2eb7e4b5bf5f36c3aa2e 100644 (file)
--- a/wxPython/src/gtk/wx.py
+++ b/wxPython/src/gtk/wx.py
@@ -746,11 +746,11 @@ wxPAPER_A3_EXTRA_TRANSVERSE = wxc.wxPAPER_A3_EXTRA_TRANSVERSE
 wxDUPLEX_SIMPLEX = wxc.wxDUPLEX_SIMPLEX
 wxDUPLEX_HORIZONTAL = wxc.wxDUPLEX_HORIZONTAL
 wxDUPLEX_VERTICAL = wxc.wxDUPLEX_VERTICAL
-wxItem_Separator = wxc.wxItem_Separator
-wxItem_Normal = wxc.wxItem_Normal
-wxItem_Check = wxc.wxItem_Check
-wxItem_Radio = wxc.wxItem_Radio
-wxItem_Max = wxc.wxItem_Max
+wxITEM_SEPARATOR = wxc.wxITEM_SEPARATOR
+wxITEM_NORMAL = wxc.wxITEM_NORMAL
+wxITEM_CHECK = wxc.wxITEM_CHECK
+wxITEM_RADIO = wxc.wxITEM_RADIO
+wxITEM_MAX = wxc.wxITEM_MAX
 wxHT_NOWHERE = wxc.wxHT_NOWHERE
 wxHT_SCROLLBAR_FIRST = wxc.wxHT_SCROLLBAR_FIRST
 wxHT_SCROLLBAR_ARROW_LINE_1 = wxc.wxHT_SCROLLBAR_ARROW_LINE_1

diff --git a/wxPython/src/mac/windows.cpp b/wxPython/src/mac/windows.cpp
index 3d8414994f7315ff495b3e5343721494dacbb1ca..f504f5c7e60cc4b018584d3083f4952c2d75e605 100644 (file)
--- a/wxPython/src/mac/windows.cpp
+++ b/wxPython/src/mac/windows.cpp
@@ -7218,7 +7218,7 @@ static PyObject *_wrap_wxMenu_Append(PyObject *self, PyObject *args, PyObject *k
     int  _arg1;
     wxString * _arg2;
     wxString * _arg3 = (wxString *) &wxPyEmptyString;
-    wxItemKind  _arg4 = (wxItemKind ) wxItem_Normal;
+    wxItemKind  _arg4 = (wxItemKind ) wxITEM_NORMAL;
     PyObject * _argo0 = 0;
     PyObject * _obj2 = 0;
     PyObject * _obj3 = 0;
@@ -7502,7 +7502,7 @@ static PyObject *_wrap_wxMenu_Insert(PyObject *self, PyObject *args, PyObject *k
     int  _arg2;
     wxString * _arg3;
     wxString * _arg4 = (wxString *) &wxPyEmptyString;
-    wxItemKind  _arg5 = (wxItemKind ) wxItem_Normal;
+    wxItemKind  _arg5 = (wxItemKind ) wxITEM_NORMAL;
     PyObject * _argo0 = 0;
     PyObject * _obj3 = 0;
     PyObject * _obj4 = 0;
@@ -7790,7 +7790,7 @@ static PyObject *_wrap_wxMenu_Prepend(PyObject *self, PyObject *args, PyObject *
     int  _arg1;
     wxString * _arg2;
     wxString * _arg3 = (wxString *) &wxPyEmptyString;
-    wxItemKind  _arg4 = (wxItemKind ) wxItem_Normal;
+    wxItemKind  _arg4 = (wxItemKind ) wxITEM_NORMAL;
     PyObject * _argo0 = 0;
     PyObject * _obj2 = 0;
     PyObject * _obj3 = 0;
@@ -9896,7 +9896,7 @@ static PyObject *_wrap_new_wxMenuItem(PyObject *self, PyObject *args, PyObject *
     int  _arg1 = (int ) wxID_SEPARATOR;
     wxString * _arg2 = (wxString *) &wxPyEmptyString;
     wxString * _arg3 = (wxString *) &wxPyEmptyString;
-    wxItemKind  _arg4 = (wxItemKind ) wxItem_Normal;
+    wxItemKind  _arg4 = (wxItemKind ) wxITEM_NORMAL;
     wxMenu * _arg5 = (wxMenu *) NULL;
     PyObject * _argo0 = 0;
     PyObject * _obj2 = 0;

diff --git a/wxPython/src/mac/wx.cpp b/wxPython/src/mac/wx.cpp
index 7cba542407a928cbf1d26e22a3ef2665219c91ce..4d46609499e8f02a663fbecb3ca9532165e10264 100644 (file)
--- a/wxPython/src/mac/wx.cpp
+++ b/wxPython/src/mac/wx.cpp
@@ -2430,11 +2430,11 @@ SWIGEXPORT(void) initwxc() {
         PyDict_SetItemString(d,"wxDUPLEX_SIMPLEX", PyInt_FromLong((long) wxDUPLEX_SIMPLEX));
         PyDict_SetItemString(d,"wxDUPLEX_HORIZONTAL", PyInt_FromLong((long) wxDUPLEX_HORIZONTAL));
         PyDict_SetItemString(d,"wxDUPLEX_VERTICAL", PyInt_FromLong((long) wxDUPLEX_VERTICAL));
-        PyDict_SetItemString(d,"wxItem_Separator", PyInt_FromLong((long) wxItem_Separator));
-        PyDict_SetItemString(d,"wxItem_Normal", PyInt_FromLong((long) wxItem_Normal));
-        PyDict_SetItemString(d,"wxItem_Check", PyInt_FromLong((long) wxItem_Check));
-        PyDict_SetItemString(d,"wxItem_Radio", PyInt_FromLong((long) wxItem_Radio));
-        PyDict_SetItemString(d,"wxItem_Max", PyInt_FromLong((long) wxItem_Max));
+        PyDict_SetItemString(d,"wxITEM_SEPARATOR", PyInt_FromLong((long) wxITEM_SEPARATOR));
+        PyDict_SetItemString(d,"wxITEM_NORMAL", PyInt_FromLong((long) wxITEM_NORMAL));
+        PyDict_SetItemString(d,"wxITEM_CHECK", PyInt_FromLong((long) wxITEM_CHECK));
+        PyDict_SetItemString(d,"wxITEM_RADIO", PyInt_FromLong((long) wxITEM_RADIO));
+        PyDict_SetItemString(d,"wxITEM_MAX", PyInt_FromLong((long) wxITEM_MAX));
         PyDict_SetItemString(d,"wxHT_NOWHERE", PyInt_FromLong((long) wxHT_NOWHERE));
         PyDict_SetItemString(d,"wxHT_SCROLLBAR_FIRST", PyInt_FromLong((long) wxHT_SCROLLBAR_FIRST));
         PyDict_SetItemString(d,"wxHT_SCROLLBAR_ARROW_LINE_1", PyInt_FromLong((long) wxHT_SCROLLBAR_ARROW_LINE_1));

diff --git a/wxPython/src/mac/wx.py b/wxPython/src/mac/wx.py
index 03282b6e2f6bf6c022a6e63b7f230d0c37ea9f60..6c9797eefecbb093a23e2eb7e4b5bf5f36c3aa2e 100644 (file)
--- a/wxPython/src/mac/wx.py
+++ b/wxPython/src/mac/wx.py
@@ -746,11 +746,11 @@ wxPAPER_A3_EXTRA_TRANSVERSE = wxc.wxPAPER_A3_EXTRA_TRANSVERSE
 wxDUPLEX_SIMPLEX = wxc.wxDUPLEX_SIMPLEX
 wxDUPLEX_HORIZONTAL = wxc.wxDUPLEX_HORIZONTAL
 wxDUPLEX_VERTICAL = wxc.wxDUPLEX_VERTICAL
-wxItem_Separator = wxc.wxItem_Separator
-wxItem_Normal = wxc.wxItem_Normal
-wxItem_Check = wxc.wxItem_Check
-wxItem_Radio = wxc.wxItem_Radio
-wxItem_Max = wxc.wxItem_Max
+wxITEM_SEPARATOR = wxc.wxITEM_SEPARATOR
+wxITEM_NORMAL = wxc.wxITEM_NORMAL
+wxITEM_CHECK = wxc.wxITEM_CHECK
+wxITEM_RADIO = wxc.wxITEM_RADIO
+wxITEM_MAX = wxc.wxITEM_MAX
 wxHT_NOWHERE = wxc.wxHT_NOWHERE
 wxHT_SCROLLBAR_FIRST = wxc.wxHT_SCROLLBAR_FIRST
 wxHT_SCROLLBAR_ARROW_LINE_1 = wxc.wxHT_SCROLLBAR_ARROW_LINE_1

diff --git a/wxPython/src/msw/windows.cpp b/wxPython/src/msw/windows.cpp
index 75d7b9ad622df20acd206bf02bb2bfe87cd7c10d..228779aa2bf652d4db47f067ea72b8e3ff251135 100644 (file)
--- a/wxPython/src/msw/windows.cpp
+++ b/wxPython/src/msw/windows.cpp
@@ -7384,7 +7384,7 @@ static PyObject *_wrap_wxMenu_Append(PyObject *self, PyObject *args, PyObject *k
     int  _arg1;
     wxString * _arg2;
     wxString * _arg3 = (wxString *) &wxPyEmptyString;
-    wxItemKind  _arg4 = (wxItemKind ) wxItem_Normal;
+    wxItemKind  _arg4 = (wxItemKind ) wxITEM_NORMAL;
     PyObject * _argo0 = 0;
     PyObject * _obj2 = 0;
     PyObject * _obj3 = 0;
@@ -7668,7 +7668,7 @@ static PyObject *_wrap_wxMenu_Insert(PyObject *self, PyObject *args, PyObject *k
     int  _arg2;
     wxString * _arg3;
     wxString * _arg4 = (wxString *) &wxPyEmptyString;
-    wxItemKind  _arg5 = (wxItemKind ) wxItem_Normal;
+    wxItemKind  _arg5 = (wxItemKind ) wxITEM_NORMAL;
     PyObject * _argo0 = 0;
     PyObject * _obj3 = 0;
     PyObject * _obj4 = 0;
@@ -7956,7 +7956,7 @@ static PyObject *_wrap_wxMenu_Prepend(PyObject *self, PyObject *args, PyObject *
     int  _arg1;
     wxString * _arg2;
     wxString * _arg3 = (wxString *) &wxPyEmptyString;
-    wxItemKind  _arg4 = (wxItemKind ) wxItem_Normal;
+    wxItemKind  _arg4 = (wxItemKind ) wxITEM_NORMAL;
     PyObject * _argo0 = 0;
     PyObject * _obj2 = 0;
     PyObject * _obj3 = 0;
@@ -10062,7 +10062,7 @@ static PyObject *_wrap_new_wxMenuItem(PyObject *self, PyObject *args, PyObject *
     int  _arg1 = (int ) wxID_SEPARATOR;
     wxString * _arg2 = (wxString *) &wxPyEmptyString;
     wxString * _arg3 = (wxString *) &wxPyEmptyString;
-    wxItemKind  _arg4 = (wxItemKind ) wxItem_Normal;
+    wxItemKind  _arg4 = (wxItemKind ) wxITEM_NORMAL;
     wxMenu * _arg5 = (wxMenu *) NULL;
     PyObject * _argo0 = 0;
     PyObject * _obj2 = 0;

diff --git a/wxPython/src/msw/wx.cpp b/wxPython/src/msw/wx.cpp
index 4cde3bba8e7c004cae53d82b64dc1d5e3c9b0153..dacf8b9d462b8d71002760ccc68fc5b622b6e1b6 100644 (file)
--- a/wxPython/src/msw/wx.cpp
+++ b/wxPython/src/msw/wx.cpp
@@ -2491,11 +2491,11 @@ SWIGEXPORT(void) initwxc() {
         PyDict_SetItemString(d,"wxDUPLEX_SIMPLEX", PyInt_FromLong((long) wxDUPLEX_SIMPLEX));
         PyDict_SetItemString(d,"wxDUPLEX_HORIZONTAL", PyInt_FromLong((long) wxDUPLEX_HORIZONTAL));
         PyDict_SetItemString(d,"wxDUPLEX_VERTICAL", PyInt_FromLong((long) wxDUPLEX_VERTICAL));
-        PyDict_SetItemString(d,"wxItem_Separator", PyInt_FromLong((long) wxItem_Separator));
-        PyDict_SetItemString(d,"wxItem_Normal", PyInt_FromLong((long) wxItem_Normal));
-        PyDict_SetItemString(d,"wxItem_Check", PyInt_FromLong((long) wxItem_Check));
-        PyDict_SetItemString(d,"wxItem_Radio", PyInt_FromLong((long) wxItem_Radio));
-        PyDict_SetItemString(d,"wxItem_Max", PyInt_FromLong((long) wxItem_Max));
+        PyDict_SetItemString(d,"wxITEM_SEPARATOR", PyInt_FromLong((long) wxITEM_SEPARATOR));
+        PyDict_SetItemString(d,"wxITEM_NORMAL", PyInt_FromLong((long) wxITEM_NORMAL));
+        PyDict_SetItemString(d,"wxITEM_CHECK", PyInt_FromLong((long) wxITEM_CHECK));
+        PyDict_SetItemString(d,"wxITEM_RADIO", PyInt_FromLong((long) wxITEM_RADIO));
+        PyDict_SetItemString(d,"wxITEM_MAX", PyInt_FromLong((long) wxITEM_MAX));
         PyDict_SetItemString(d,"wxHT_NOWHERE", PyInt_FromLong((long) wxHT_NOWHERE));
         PyDict_SetItemString(d,"wxHT_SCROLLBAR_FIRST", PyInt_FromLong((long) wxHT_SCROLLBAR_FIRST));
         PyDict_SetItemString(d,"wxHT_SCROLLBAR_ARROW_LINE_1", PyInt_FromLong((long) wxHT_SCROLLBAR_ARROW_LINE_1));

diff --git a/wxPython/src/msw/wx.py b/wxPython/src/msw/wx.py
index e09da1bd31fecf51db0b0aaba52b5f08096c456d..9c69c16ae581a7a87a974cbe512b17a3c89b3458 100644 (file)
--- a/wxPython/src/msw/wx.py
+++ b/wxPython/src/msw/wx.py
@@ -752,11 +752,11 @@ wxPAPER_A3_EXTRA_TRANSVERSE = wxc.wxPAPER_A3_EXTRA_TRANSVERSE
 wxDUPLEX_SIMPLEX = wxc.wxDUPLEX_SIMPLEX
 wxDUPLEX_HORIZONTAL = wxc.wxDUPLEX_HORIZONTAL
 wxDUPLEX_VERTICAL = wxc.wxDUPLEX_VERTICAL
-wxItem_Separator = wxc.wxItem_Separator
-wxItem_Normal = wxc.wxItem_Normal
-wxItem_Check = wxc.wxItem_Check
-wxItem_Radio = wxc.wxItem_Radio
-wxItem_Max = wxc.wxItem_Max
+wxITEM_SEPARATOR = wxc.wxITEM_SEPARATOR
+wxITEM_NORMAL = wxc.wxITEM_NORMAL
+wxITEM_CHECK = wxc.wxITEM_CHECK
+wxITEM_RADIO = wxc.wxITEM_RADIO
+wxITEM_MAX = wxc.wxITEM_MAX
 wxHT_NOWHERE = wxc.wxHT_NOWHERE
 wxHT_SCROLLBAR_FIRST = wxc.wxHT_SCROLLBAR_FIRST
 wxHT_SCROLLBAR_ARROW_LINE_1 = wxc.wxHT_SCROLLBAR_ARROW_LINE_1

diff --git a/wxPython/src/windows.i b/wxPython/src/windows.i
index 61f45be466e08279e85642f91d2d1ca36cdde798..a79cea8664eb6b940f698c4ba032ac813505a7f7 100644 (file)
--- a/wxPython/src/windows.i
+++ b/wxPython/src/windows.i
@@ -583,7 +583,7 @@ public:
 
     void Append(int id, const wxString& item,
                 const wxString& helpString = wxPyEmptyString,
-                wxItemKind kind = wxItem_Normal);
+                wxItemKind kind = wxITEM_NORMAL);
     %name(AppendMenu)void Append(int id, const wxString& item, wxMenu *subMenu,
                                  const wxString& helpString = wxPyEmptyString);
     %name(AppendItem)void Append(const wxMenuItem* item);
@@ -600,7 +600,7 @@ public:
                 int id,
                 const wxString& text,
                 const wxString& help = wxPyEmptyString,
-                wxItemKind kind = wxItem_Normal);
+                wxItemKind kind = wxITEM_NORMAL);
     void InsertSeparator(size_t pos);
     void InsertCheckItem(size_t pos,
                          int id,
@@ -621,7 +621,7 @@ public:
     void Prepend(int id,
                  const wxString& text,
                  const wxString& help = wxPyEmptyString,
-                 wxItemKind kind = wxItem_Normal);
+                 wxItemKind kind = wxITEM_NORMAL);
     void PrependSeparator();
     void PrependCheckItem(int id,
                           const wxString& text,
@@ -734,7 +734,7 @@ public:
     wxMenuItem(wxMenu* parentMenu=NULL, int id=wxID_SEPARATOR,
                const wxString& text = wxPyEmptyString,
                const wxString& help = wxPyEmptyString,
-               wxItemKind kind = wxItem_Normal,
+               wxItemKind kind = wxITEM_NORMAL,
                wxMenu* subMenu = NULL);