From 546bfbea8180aeee5a16f4abb34e721445277305 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Fri, 22 Mar 2002 19:18:51 +0000 Subject: [PATCH] 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 --- include/wx/defs.h | 10 +++++----- include/wx/gtk/menuitem.h | 2 +- include/wx/gtk1/menuitem.h | 2 +- include/wx/mac/menuitem.h | 2 +- include/wx/menu.h | 22 +++++++++++----------- include/wx/menuitem.h | 10 +++++----- include/wx/motif/menuitem.h | 2 +- include/wx/msw/menuitem.h | 2 +- include/wx/univ/menuitem.h | 2 +- src/gtk/menu.cpp | 8 ++++---- src/gtk1/menu.cpp | 8 ++++---- src/msw/menu.cpp | 2 +- src/msw/menuitem.cpp | 4 ++-- wxPython/src/_defs.i | 10 +++++----- wxPython/src/gtk/windows.cpp | 8 ++++---- wxPython/src/gtk/wx.cpp | 10 +++++----- wxPython/src/gtk/wx.py | 10 +++++----- wxPython/src/mac/windows.cpp | 8 ++++---- wxPython/src/mac/wx.cpp | 10 +++++----- wxPython/src/mac/wx.py | 10 +++++----- wxPython/src/msw/windows.cpp | 8 ++++---- wxPython/src/msw/wx.cpp | 10 +++++----- wxPython/src/msw/wx.py | 10 +++++----- wxPython/src/windows.i | 8 ++++---- 24 files changed, 89 insertions(+), 89 deletions(-) diff --git a/include/wx/defs.h b/include/wx/defs.h index 29d83cd4bb..9601f2c17d 100644 --- 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 6a2ed681ae..54ea397bd1 100644 --- 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 6a2ed681ae..54ea397bd1 100644 --- 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 9011439e22..1557980892 100644 --- 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 09c0dbd17e..181781b0a5 100644 --- 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 cf8b989bf6..59d6e3de90 100644 --- 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 8a7ff97bc5..b871308031 100644 --- 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 dbc4478b3d..99d7cda1a1 100644 --- 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 ccbb528f98..52049e5f71 100644 --- 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 8474b6382e..5c1a0eb285 100644 --- 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 = ""; 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 = ""; break; } diff --git a/src/gtk1/menu.cpp b/src/gtk1/menu.cpp index 8474b6382e..5c1a0eb285 100644 --- 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 = ""; 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 = ""; break; } diff --git a/src/msw/menu.cpp b/src/msw/menu.cpp index ec96dc7bc8..8a37698082 100644 --- 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 2cabd2c1f2..2336c4d6ec 100644 --- 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 6e6a1112c2..5b6d7a5c8d 100644 --- 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 081895d10b..1ecd65a494 100644 --- 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 0c2ce58216..71eae9ee1b 100644 --- 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 03282b6e2f..6c9797eefe 100644 --- 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 3d8414994f..f504f5c7e6 100644 --- 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 7cba542407..4d46609499 100644 --- 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 03282b6e2f..6c9797eefe 100644 --- 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 75d7b9ad62..228779aa2b 100644 --- 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 4cde3bba8e..dacf8b9d46 100644 --- 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 e09da1bd31..9c69c16ae5 100644 --- 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 61f45be466..a79cea8664 100644 --- 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); -- 2.45.2