Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxITEM_FOO instead of wxItem_Foo, for the sake of consistency

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14729 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2002-03-22 19:18:51 +00:00
parent 1ae7bd02b0
commit 546bfbea81
24 changed files with 89 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
wxPython/src/_defs.i
View File

@@ -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

8
wxPython/src/gtk/windows.cpp
View File

@@ -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;

10
wxPython/src/gtk/wx.cpp
View File

@@ -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));

10
wxPython/src/gtk/wx.py
View File

@@ -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

8
wxPython/src/mac/windows.cpp
View File

@@ -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;

10
wxPython/src/mac/wx.cpp
View File

@@ -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));

10
wxPython/src/mac/wx.py
View File

@@ -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

8
wxPython/src/msw/windows.cpp
View File

@@ -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;

10
wxPython/src/msw/wx.cpp
View File

@@ -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));

10
wxPython/src/msw/wx.py
View File

@@ -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

8
wxPython/src/windows.i
View File

@@ -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);