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
include/wx/defs.h
View File

@@ -1282,11 +1282,11 @@ enum wxBorder
// menu and toolbar item kinds // menu and toolbar item kinds
enum wxItemKind enum wxItemKind
{ {
wxItem_Separator = -1, wxITEM_SEPARATOR = -1,
wxItem_Normal, wxITEM_NORMAL,
wxItem_Check, wxITEM_CHECK,
wxItem_Radio, wxITEM_RADIO,
wxItem_Max wxITEM_MAX
}; };
// hit test results // hit test results

2
include/wx/gtk/menuitem.h
View File

@@ -27,7 +27,7 @@ public:
int id = wxID_SEPARATOR, int id = wxID_SEPARATOR,
const wxString& text = wxEmptyString, const wxString& text = wxEmptyString,
const wxString& help = wxEmptyString, const wxString& help = wxEmptyString,
wxItemKind kind = wxItem_Normal, wxItemKind kind = wxITEM_NORMAL,
wxMenu *subMenu = (wxMenu *)NULL); wxMenu *subMenu = (wxMenu *)NULL);
~wxMenuItem(); ~wxMenuItem();

2
include/wx/gtk1/menuitem.h
View File

@@ -27,7 +27,7 @@ public:
int id = wxID_SEPARATOR, int id = wxID_SEPARATOR,
const wxString& text = wxEmptyString, const wxString& text = wxEmptyString,
const wxString& help = wxEmptyString, const wxString& help = wxEmptyString,
wxItemKind kind = wxItem_Normal, wxItemKind kind = wxITEM_NORMAL,
wxMenu *subMenu = (wxMenu *)NULL); wxMenu *subMenu = (wxMenu *)NULL);
~wxMenuItem(); ~wxMenuItem();

2
include/wx/mac/menuitem.h
View File

@@ -43,7 +43,7 @@ public:
int id = wxID_SEPARATOR, int id = wxID_SEPARATOR,
const wxString& name = wxEmptyString, const wxString& name = wxEmptyString,
const wxString& help = wxEmptyString, const wxString& help = wxEmptyString,
wxItemKind kind = wxItem_Normal, wxItemKind kind = wxITEM_NORMAL,
wxMenu *subMenu = (wxMenu *)NULL); wxMenu *subMenu = (wxMenu *)NULL);
virtual ~wxMenuItem(); virtual ~wxMenuItem();

22
include/wx/menu.h
View File

@@ -79,7 +79,7 @@ public:
void Append(int id, void Append(int id,
const wxString& text, const wxString& text,
const wxString& help = wxEmptyString, const wxString& help = wxEmptyString,
wxItemKind kind = wxItem_Normal) wxItemKind kind = wxITEM_NORMAL)
{ {
DoAppend(wxMenuItem::New((wxMenu *)this, id, text, help, kind)); DoAppend(wxMenuItem::New((wxMenu *)this, id, text, help, kind));
} }
@@ -92,7 +92,7 @@ public:
const wxString& text, const wxString& text,
const wxString& help = wxEmptyString) const wxString& help = wxEmptyString)
{ {
Append(id, text, help, wxItem_Check); Append(id, text, help, wxITEM_CHECK);
} }
// append a radio item // append a radio item
@@ -100,7 +100,7 @@ public:
const wxString& text, const wxString& text,
const wxString& help = wxEmptyString) const wxString& help = wxEmptyString)
{ {
Append(id, text, help, wxItem_Radio); Append(id, text, help, wxITEM_RADIO);
} }
// append a submenu // append a submenu
@@ -110,7 +110,7 @@ public:
const wxString& help = wxEmptyString) const wxString& help = wxEmptyString)
{ {
DoAppend(wxMenuItem::New((wxMenu *)this, id, text, help, DoAppend(wxMenuItem::New((wxMenu *)this, id, text, help,
wxItem_Normal, submenu)); wxITEM_NORMAL, submenu));
} }
// the most generic form of Append() - append anything // the most generic form of Append() - append anything
@@ -128,7 +128,7 @@ public:
int id, int id,
const wxString& text, const wxString& text,
const wxString& help = wxEmptyString, const wxString& help = wxEmptyString,
wxItemKind kind = wxItem_Normal) wxItemKind kind = wxITEM_NORMAL)
{ {
Insert(pos, wxMenuItem::New((wxMenu *)this, id, text, help, kind)); Insert(pos, wxMenuItem::New((wxMenu *)this, id, text, help, kind));
} }
@@ -145,7 +145,7 @@ public:
const wxString& text, const wxString& text,
const wxString& help = wxEmptyString) const wxString& help = wxEmptyString)
{ {
Insert(pos, id, text, help, wxItem_Check); Insert(pos, id, text, help, wxITEM_CHECK);
} }
// insert a radio item // insert a radio item
@@ -154,7 +154,7 @@ public:
const wxString& text, const wxString& text,
const wxString& help = wxEmptyString) const wxString& help = wxEmptyString)
{ {
Insert(pos, id, text, help, wxItem_Radio); Insert(pos, id, text, help, wxITEM_RADIO);
} }
// insert a submenu // insert a submenu
@@ -165,7 +165,7 @@ public:
const wxString& help = wxEmptyString) const wxString& help = wxEmptyString)
{ {
Insert(pos, wxMenuItem::New((wxMenu *)this, id, text, help, Insert(pos, wxMenuItem::New((wxMenu *)this, id, text, help,
wxItem_Normal, submenu)); wxITEM_NORMAL, submenu));
} }
// prepend an item to the menu // prepend an item to the menu
@@ -178,7 +178,7 @@ public:
void Prepend(int id, void Prepend(int id,
const wxString& text, const wxString& text,
const wxString& help = wxEmptyString, const wxString& help = wxEmptyString,
wxItemKind kind = wxItem_Normal) wxItemKind kind = wxITEM_NORMAL)
{ {
Insert(0u, id, text, help, kind); Insert(0u, id, text, help, kind);
} }
@@ -320,7 +320,7 @@ public:
const wxString& help, const wxString& help,
bool isCheckable) 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, void Insert(size_t pos,
@@ -329,7 +329,7 @@ public:
const wxString& help, const wxString& help,
bool isCheckable) 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, void Prepend(int id,

10
include/wx/menuitem.h
View File

@@ -41,7 +41,7 @@ public:
int id = wxID_SEPARATOR, int id = wxID_SEPARATOR,
const wxString& text = wxEmptyString, const wxString& text = wxEmptyString,
const wxString& help = wxEmptyString, const wxString& help = wxEmptyString,
wxItemKind kind = wxItem_Normal, wxItemKind kind = wxITEM_NORMAL,
wxMenu *subMenu = (wxMenu *)NULL); wxMenu *subMenu = (wxMenu *)NULL);
// destruction: wxMenuItem will delete its submenu // destruction: wxMenuItem will delete its submenu
@@ -71,9 +71,9 @@ public:
// what kind of menu item we are // what kind of menu item we are
wxItemKind GetKind() const { return m_kind; } 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 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; } bool IsSubMenu() const { return m_subMenu != NULL; }
void SetSubMenu(wxMenu *menu) { m_subMenu = menu; } void SetSubMenu(wxMenu *menu) { m_subMenu = menu; }
@@ -116,7 +116,7 @@ public:
wxMenu *subMenu = (wxMenu *)NULL) wxMenu *subMenu = (wxMenu *)NULL)
{ {
return New(parentMenu, id, text, help, return New(parentMenu, id, text, help,
isCheckable ? wxItem_Check : wxItem_Normal, subMenu); isCheckable ? wxITEM_CHECK : wxITEM_NORMAL, subMenu);
} }
protected: protected:
@@ -134,7 +134,7 @@ protected:
int id = wxID_SEPARATOR, int id = wxID_SEPARATOR,
const wxString& text = wxEmptyString, const wxString& text = wxEmptyString,
const wxString& help = wxEmptyString, const wxString& help = wxEmptyString,
wxItemKind kind = wxItem_Normal, wxItemKind kind = wxITEM_NORMAL,
wxMenu *subMenu = (wxMenu *)NULL); wxMenu *subMenu = (wxMenu *)NULL);
private: private:

2
include/wx/motif/menuitem.h
View File

@@ -32,7 +32,7 @@ public:
int id = wxID_SEPARATOR, int id = wxID_SEPARATOR,
const wxString& text = wxEmptyString, const wxString& text = wxEmptyString,
const wxString& help = wxEmptyString, const wxString& help = wxEmptyString,
wxItemKind kind = wxItem_Normal, wxItemKind kind = wxITEM_NORMAL,
wxMenu *subMenu = (wxMenu *)NULL); wxMenu *subMenu = (wxMenu *)NULL);
~wxMenuItem(); ~wxMenuItem();

2
include/wx/msw/menuitem.h
View File

@@ -39,7 +39,7 @@ public:
int id = wxID_SEPARATOR, int id = wxID_SEPARATOR,
const wxString& name = wxEmptyString, const wxString& name = wxEmptyString,
const wxString& help = wxEmptyString, const wxString& help = wxEmptyString,
wxItemKind kind = wxItem_Normal, wxItemKind kind = wxITEM_NORMAL,
wxMenu *subMenu = (wxMenu *)NULL); wxMenu *subMenu = (wxMenu *)NULL);
virtual ~wxMenuItem(); virtual ~wxMenuItem();

2
include/wx/univ/menuitem.h
View File

@@ -28,7 +28,7 @@ public:
int id = wxID_SEPARATOR, int id = wxID_SEPARATOR,
const wxString& name = wxEmptyString, const wxString& name = wxEmptyString,
const wxString& help = wxEmptyString, const wxString& help = wxEmptyString,
wxItemKind kind = wxItem_Normal, wxItemKind kind = wxITEM_NORMAL,
wxMenu *subMenu = (wxMenu *)NULL); wxMenu *subMenu = (wxMenu *)NULL);
virtual ~wxMenuItem(); virtual ~wxMenuItem();

8
src/gtk/menu.cpp
View File

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

8
src/gtk1/menu.cpp
View File

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

2
src/msw/menu.cpp
View File

@@ -329,7 +329,7 @@ bool wxMenu::DoAppend(wxMenuItem *item)
{ {
wxCHECK_MSG( item, FALSE, _T("NULL item in wxMenu::DoAppend") ); wxCHECK_MSG( item, FALSE, _T("NULL item in wxMenu::DoAppend") );
if ( item->GetKind() == wxItem_Radio ) if ( item->GetKind() == wxITEM_RADIO )
{ {
if ( m_startRadioGroup == -1 ) if ( m_startRadioGroup == -1 )
{ {

4
src/msw/menuitem.cpp
View File

@@ -89,7 +89,7 @@ wxMenuItem::wxMenuItem(wxMenu *pParentMenu,
wxMenu *pSubMenu) wxMenu *pSubMenu)
: wxMenuItemBase(pParentMenu, id, text, strHelp, kind, pSubMenu) : wxMenuItemBase(pParentMenu, id, text, strHelp, kind, pSubMenu)
#if wxUSE_OWNER_DRAWN #if wxUSE_OWNER_DRAWN
, wxOwnerDrawn(GetLabelFromText(text), kind == wxItem_Check) , wxOwnerDrawn(GetLabelFromText(text), kind == wxITEM_CHECK)
#endif // owner drawn #endif // owner drawn
{ {
wxASSERT_MSG( pParentMenu != NULL, wxT("a menu item should have a parent") ); 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; int flags = check ? MF_CHECKED : MF_UNCHECKED;
HMENU hmenu = GetHMenuOf(m_parentMenu); 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? // it doesn't make sense to uncheck a radio item - what would this do?
if ( !check ) if ( !check )

10
wxPython/src/_defs.i
View File

@@ -855,11 +855,11 @@ typedef enum {
// menu and toolbar item kinds // menu and toolbar item kinds
enum wxItemKind enum wxItemKind
{ {
wxItem_Separator = -1, wxITEM_SEPARATOR = -1,
wxItem_Normal, wxITEM_NORMAL,
wxItem_Check, wxITEM_CHECK,
wxItem_Radio, wxITEM_RADIO,
wxItem_Max wxITEM_MAX
}; };
enum wxHitTest 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; int _arg1;
wxString * _arg2; wxString * _arg2;
wxString * _arg3 = (wxString *) &wxPyEmptyString; wxString * _arg3 = (wxString *) &wxPyEmptyString;
wxItemKind _arg4 = (wxItemKind ) wxItem_Normal; wxItemKind _arg4 = (wxItemKind ) wxITEM_NORMAL;
PyObject * _argo0 = 0; PyObject * _argo0 = 0;
PyObject * _obj2 = 0; PyObject * _obj2 = 0;
PyObject * _obj3 = 0; PyObject * _obj3 = 0;
@@ -7574,7 +7574,7 @@ static PyObject *_wrap_wxMenu_Insert(PyObject *self, PyObject *args, PyObject *k
int _arg2; int _arg2;
wxString * _arg3; wxString * _arg3;
wxString * _arg4 = (wxString *) &wxPyEmptyString; wxString * _arg4 = (wxString *) &wxPyEmptyString;
wxItemKind _arg5 = (wxItemKind ) wxItem_Normal; wxItemKind _arg5 = (wxItemKind ) wxITEM_NORMAL;
PyObject * _argo0 = 0; PyObject * _argo0 = 0;
PyObject * _obj3 = 0; PyObject * _obj3 = 0;
PyObject * _obj4 = 0; PyObject * _obj4 = 0;
@@ -7862,7 +7862,7 @@ static PyObject *_wrap_wxMenu_Prepend(PyObject *self, PyObject *args, PyObject *
int _arg1; int _arg1;
wxString * _arg2; wxString * _arg2;
wxString * _arg3 = (wxString *) &wxPyEmptyString; wxString * _arg3 = (wxString *) &wxPyEmptyString;
wxItemKind _arg4 = (wxItemKind ) wxItem_Normal; wxItemKind _arg4 = (wxItemKind ) wxITEM_NORMAL;
PyObject * _argo0 = 0; PyObject * _argo0 = 0;
PyObject * _obj2 = 0; PyObject * _obj2 = 0;
PyObject * _obj3 = 0; PyObject * _obj3 = 0;
@@ -9968,7 +9968,7 @@ static PyObject *_wrap_new_wxMenuItem(PyObject *self, PyObject *args, PyObject *
int _arg1 = (int ) wxID_SEPARATOR; int _arg1 = (int ) wxID_SEPARATOR;
wxString * _arg2 = (wxString *) &wxPyEmptyString; wxString * _arg2 = (wxString *) &wxPyEmptyString;
wxString * _arg3 = (wxString *) &wxPyEmptyString; wxString * _arg3 = (wxString *) &wxPyEmptyString;
wxItemKind _arg4 = (wxItemKind ) wxItem_Normal; wxItemKind _arg4 = (wxItemKind ) wxITEM_NORMAL;
wxMenu * _arg5 = (wxMenu *) NULL; wxMenu * _arg5 = (wxMenu *) NULL;
PyObject * _argo0 = 0; PyObject * _argo0 = 0;
PyObject * _obj2 = 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_SIMPLEX", PyInt_FromLong((long) wxDUPLEX_SIMPLEX));
PyDict_SetItemString(d,"wxDUPLEX_HORIZONTAL", PyInt_FromLong((long) wxDUPLEX_HORIZONTAL)); PyDict_SetItemString(d,"wxDUPLEX_HORIZONTAL", PyInt_FromLong((long) wxDUPLEX_HORIZONTAL));
PyDict_SetItemString(d,"wxDUPLEX_VERTICAL", PyInt_FromLong((long) wxDUPLEX_VERTICAL)); PyDict_SetItemString(d,"wxDUPLEX_VERTICAL", PyInt_FromLong((long) wxDUPLEX_VERTICAL));
PyDict_SetItemString(d,"wxItem_Separator", PyInt_FromLong((long) wxItem_Separator)); PyDict_SetItemString(d,"wxITEM_SEPARATOR", PyInt_FromLong((long) wxITEM_SEPARATOR));
PyDict_SetItemString(d,"wxItem_Normal", PyInt_FromLong((long) wxItem_Normal)); PyDict_SetItemString(d,"wxITEM_NORMAL", PyInt_FromLong((long) wxITEM_NORMAL));
PyDict_SetItemString(d,"wxItem_Check", PyInt_FromLong((long) wxItem_Check)); PyDict_SetItemString(d,"wxITEM_CHECK", PyInt_FromLong((long) wxITEM_CHECK));
PyDict_SetItemString(d,"wxItem_Radio", PyInt_FromLong((long) wxItem_Radio)); PyDict_SetItemString(d,"wxITEM_RADIO", PyInt_FromLong((long) wxITEM_RADIO));
PyDict_SetItemString(d,"wxItem_Max", PyInt_FromLong((long) wxItem_Max)); PyDict_SetItemString(d,"wxITEM_MAX", PyInt_FromLong((long) wxITEM_MAX));
PyDict_SetItemString(d,"wxHT_NOWHERE", PyInt_FromLong((long) wxHT_NOWHERE)); 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_FIRST", PyInt_FromLong((long) wxHT_SCROLLBAR_FIRST));
PyDict_SetItemString(d,"wxHT_SCROLLBAR_ARROW_LINE_1", PyInt_FromLong((long) wxHT_SCROLLBAR_ARROW_LINE_1)); 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_SIMPLEX = wxc.wxDUPLEX_SIMPLEX
wxDUPLEX_HORIZONTAL = wxc.wxDUPLEX_HORIZONTAL wxDUPLEX_HORIZONTAL = wxc.wxDUPLEX_HORIZONTAL
wxDUPLEX_VERTICAL = wxc.wxDUPLEX_VERTICAL wxDUPLEX_VERTICAL = wxc.wxDUPLEX_VERTICAL
wxItem_Separator = wxc.wxItem_Separator wxITEM_SEPARATOR = wxc.wxITEM_SEPARATOR
wxItem_Normal = wxc.wxItem_Normal wxITEM_NORMAL = wxc.wxITEM_NORMAL
wxItem_Check = wxc.wxItem_Check wxITEM_CHECK = wxc.wxITEM_CHECK
wxItem_Radio = wxc.wxItem_Radio wxITEM_RADIO = wxc.wxITEM_RADIO
wxItem_Max = wxc.wxItem_Max wxITEM_MAX = wxc.wxITEM_MAX
wxHT_NOWHERE = wxc.wxHT_NOWHERE wxHT_NOWHERE = wxc.wxHT_NOWHERE
wxHT_SCROLLBAR_FIRST = wxc.wxHT_SCROLLBAR_FIRST wxHT_SCROLLBAR_FIRST = wxc.wxHT_SCROLLBAR_FIRST
wxHT_SCROLLBAR_ARROW_LINE_1 = wxc.wxHT_SCROLLBAR_ARROW_LINE_1 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; int _arg1;
wxString * _arg2; wxString * _arg2;
wxString * _arg3 = (wxString *) &wxPyEmptyString; wxString * _arg3 = (wxString *) &wxPyEmptyString;
wxItemKind _arg4 = (wxItemKind ) wxItem_Normal; wxItemKind _arg4 = (wxItemKind ) wxITEM_NORMAL;
PyObject * _argo0 = 0; PyObject * _argo0 = 0;
PyObject * _obj2 = 0; PyObject * _obj2 = 0;
PyObject * _obj3 = 0; PyObject * _obj3 = 0;
@@ -7502,7 +7502,7 @@ static PyObject *_wrap_wxMenu_Insert(PyObject *self, PyObject *args, PyObject *k
int _arg2; int _arg2;
wxString * _arg3; wxString * _arg3;
wxString * _arg4 = (wxString *) &wxPyEmptyString; wxString * _arg4 = (wxString *) &wxPyEmptyString;
wxItemKind _arg5 = (wxItemKind ) wxItem_Normal; wxItemKind _arg5 = (wxItemKind ) wxITEM_NORMAL;
PyObject * _argo0 = 0; PyObject * _argo0 = 0;
PyObject * _obj3 = 0; PyObject * _obj3 = 0;
PyObject * _obj4 = 0; PyObject * _obj4 = 0;
@@ -7790,7 +7790,7 @@ static PyObject *_wrap_wxMenu_Prepend(PyObject *self, PyObject *args, PyObject *
int _arg1; int _arg1;
wxString * _arg2; wxString * _arg2;
wxString * _arg3 = (wxString *) &wxPyEmptyString; wxString * _arg3 = (wxString *) &wxPyEmptyString;
wxItemKind _arg4 = (wxItemKind ) wxItem_Normal; wxItemKind _arg4 = (wxItemKind ) wxITEM_NORMAL;
PyObject * _argo0 = 0; PyObject * _argo0 = 0;
PyObject * _obj2 = 0; PyObject * _obj2 = 0;
PyObject * _obj3 = 0; PyObject * _obj3 = 0;
@@ -9896,7 +9896,7 @@ static PyObject *_wrap_new_wxMenuItem(PyObject *self, PyObject *args, PyObject *
int _arg1 = (int ) wxID_SEPARATOR; int _arg1 = (int ) wxID_SEPARATOR;
wxString * _arg2 = (wxString *) &wxPyEmptyString; wxString * _arg2 = (wxString *) &wxPyEmptyString;
wxString * _arg3 = (wxString *) &wxPyEmptyString; wxString * _arg3 = (wxString *) &wxPyEmptyString;
wxItemKind _arg4 = (wxItemKind ) wxItem_Normal; wxItemKind _arg4 = (wxItemKind ) wxITEM_NORMAL;
wxMenu * _arg5 = (wxMenu *) NULL; wxMenu * _arg5 = (wxMenu *) NULL;
PyObject * _argo0 = 0; PyObject * _argo0 = 0;
PyObject * _obj2 = 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_SIMPLEX", PyInt_FromLong((long) wxDUPLEX_SIMPLEX));
PyDict_SetItemString(d,"wxDUPLEX_HORIZONTAL", PyInt_FromLong((long) wxDUPLEX_HORIZONTAL)); PyDict_SetItemString(d,"wxDUPLEX_HORIZONTAL", PyInt_FromLong((long) wxDUPLEX_HORIZONTAL));
PyDict_SetItemString(d,"wxDUPLEX_VERTICAL", PyInt_FromLong((long) wxDUPLEX_VERTICAL)); PyDict_SetItemString(d,"wxDUPLEX_VERTICAL", PyInt_FromLong((long) wxDUPLEX_VERTICAL));
PyDict_SetItemString(d,"wxItem_Separator", PyInt_FromLong((long) wxItem_Separator)); PyDict_SetItemString(d,"wxITEM_SEPARATOR", PyInt_FromLong((long) wxITEM_SEPARATOR));
PyDict_SetItemString(d,"wxItem_Normal", PyInt_FromLong((long) wxItem_Normal)); PyDict_SetItemString(d,"wxITEM_NORMAL", PyInt_FromLong((long) wxITEM_NORMAL));
PyDict_SetItemString(d,"wxItem_Check", PyInt_FromLong((long) wxItem_Check)); PyDict_SetItemString(d,"wxITEM_CHECK", PyInt_FromLong((long) wxITEM_CHECK));
PyDict_SetItemString(d,"wxItem_Radio", PyInt_FromLong((long) wxItem_Radio)); PyDict_SetItemString(d,"wxITEM_RADIO", PyInt_FromLong((long) wxITEM_RADIO));
PyDict_SetItemString(d,"wxItem_Max", PyInt_FromLong((long) wxItem_Max)); PyDict_SetItemString(d,"wxITEM_MAX", PyInt_FromLong((long) wxITEM_MAX));
PyDict_SetItemString(d,"wxHT_NOWHERE", PyInt_FromLong((long) wxHT_NOWHERE)); 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_FIRST", PyInt_FromLong((long) wxHT_SCROLLBAR_FIRST));
PyDict_SetItemString(d,"wxHT_SCROLLBAR_ARROW_LINE_1", PyInt_FromLong((long) wxHT_SCROLLBAR_ARROW_LINE_1)); 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_SIMPLEX = wxc.wxDUPLEX_SIMPLEX
wxDUPLEX_HORIZONTAL = wxc.wxDUPLEX_HORIZONTAL wxDUPLEX_HORIZONTAL = wxc.wxDUPLEX_HORIZONTAL
wxDUPLEX_VERTICAL = wxc.wxDUPLEX_VERTICAL wxDUPLEX_VERTICAL = wxc.wxDUPLEX_VERTICAL
wxItem_Separator = wxc.wxItem_Separator wxITEM_SEPARATOR = wxc.wxITEM_SEPARATOR
wxItem_Normal = wxc.wxItem_Normal wxITEM_NORMAL = wxc.wxITEM_NORMAL
wxItem_Check = wxc.wxItem_Check wxITEM_CHECK = wxc.wxITEM_CHECK
wxItem_Radio = wxc.wxItem_Radio wxITEM_RADIO = wxc.wxITEM_RADIO
wxItem_Max = wxc.wxItem_Max wxITEM_MAX = wxc.wxITEM_MAX
wxHT_NOWHERE = wxc.wxHT_NOWHERE wxHT_NOWHERE = wxc.wxHT_NOWHERE
wxHT_SCROLLBAR_FIRST = wxc.wxHT_SCROLLBAR_FIRST wxHT_SCROLLBAR_FIRST = wxc.wxHT_SCROLLBAR_FIRST
wxHT_SCROLLBAR_ARROW_LINE_1 = wxc.wxHT_SCROLLBAR_ARROW_LINE_1 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; int _arg1;
wxString * _arg2; wxString * _arg2;
wxString * _arg3 = (wxString *) &wxPyEmptyString; wxString * _arg3 = (wxString *) &wxPyEmptyString;
wxItemKind _arg4 = (wxItemKind ) wxItem_Normal; wxItemKind _arg4 = (wxItemKind ) wxITEM_NORMAL;
PyObject * _argo0 = 0; PyObject * _argo0 = 0;
PyObject * _obj2 = 0; PyObject * _obj2 = 0;
PyObject * _obj3 = 0; PyObject * _obj3 = 0;
@@ -7668,7 +7668,7 @@ static PyObject *_wrap_wxMenu_Insert(PyObject *self, PyObject *args, PyObject *k
int _arg2; int _arg2;
wxString * _arg3; wxString * _arg3;
wxString * _arg4 = (wxString *) &wxPyEmptyString; wxString * _arg4 = (wxString *) &wxPyEmptyString;
wxItemKind _arg5 = (wxItemKind ) wxItem_Normal; wxItemKind _arg5 = (wxItemKind ) wxITEM_NORMAL;
PyObject * _argo0 = 0; PyObject * _argo0 = 0;
PyObject * _obj3 = 0; PyObject * _obj3 = 0;
PyObject * _obj4 = 0; PyObject * _obj4 = 0;
@@ -7956,7 +7956,7 @@ static PyObject *_wrap_wxMenu_Prepend(PyObject *self, PyObject *args, PyObject *
int _arg1; int _arg1;
wxString * _arg2; wxString * _arg2;
wxString * _arg3 = (wxString *) &wxPyEmptyString; wxString * _arg3 = (wxString *) &wxPyEmptyString;
wxItemKind _arg4 = (wxItemKind ) wxItem_Normal; wxItemKind _arg4 = (wxItemKind ) wxITEM_NORMAL;
PyObject * _argo0 = 0; PyObject * _argo0 = 0;
PyObject * _obj2 = 0; PyObject * _obj2 = 0;
PyObject * _obj3 = 0; PyObject * _obj3 = 0;
@@ -10062,7 +10062,7 @@ static PyObject *_wrap_new_wxMenuItem(PyObject *self, PyObject *args, PyObject *
int _arg1 = (int ) wxID_SEPARATOR; int _arg1 = (int ) wxID_SEPARATOR;
wxString * _arg2 = (wxString *) &wxPyEmptyString; wxString * _arg2 = (wxString *) &wxPyEmptyString;
wxString * _arg3 = (wxString *) &wxPyEmptyString; wxString * _arg3 = (wxString *) &wxPyEmptyString;
wxItemKind _arg4 = (wxItemKind ) wxItem_Normal; wxItemKind _arg4 = (wxItemKind ) wxITEM_NORMAL;
wxMenu * _arg5 = (wxMenu *) NULL; wxMenu * _arg5 = (wxMenu *) NULL;
PyObject * _argo0 = 0; PyObject * _argo0 = 0;
PyObject * _obj2 = 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_SIMPLEX", PyInt_FromLong((long) wxDUPLEX_SIMPLEX));
PyDict_SetItemString(d,"wxDUPLEX_HORIZONTAL", PyInt_FromLong((long) wxDUPLEX_HORIZONTAL)); PyDict_SetItemString(d,"wxDUPLEX_HORIZONTAL", PyInt_FromLong((long) wxDUPLEX_HORIZONTAL));
PyDict_SetItemString(d,"wxDUPLEX_VERTICAL", PyInt_FromLong((long) wxDUPLEX_VERTICAL)); PyDict_SetItemString(d,"wxDUPLEX_VERTICAL", PyInt_FromLong((long) wxDUPLEX_VERTICAL));
PyDict_SetItemString(d,"wxItem_Separator", PyInt_FromLong((long) wxItem_Separator)); PyDict_SetItemString(d,"wxITEM_SEPARATOR", PyInt_FromLong((long) wxITEM_SEPARATOR));
PyDict_SetItemString(d,"wxItem_Normal", PyInt_FromLong((long) wxItem_Normal)); PyDict_SetItemString(d,"wxITEM_NORMAL", PyInt_FromLong((long) wxITEM_NORMAL));
PyDict_SetItemString(d,"wxItem_Check", PyInt_FromLong((long) wxItem_Check)); PyDict_SetItemString(d,"wxITEM_CHECK", PyInt_FromLong((long) wxITEM_CHECK));
PyDict_SetItemString(d,"wxItem_Radio", PyInt_FromLong((long) wxItem_Radio)); PyDict_SetItemString(d,"wxITEM_RADIO", PyInt_FromLong((long) wxITEM_RADIO));
PyDict_SetItemString(d,"wxItem_Max", PyInt_FromLong((long) wxItem_Max)); PyDict_SetItemString(d,"wxITEM_MAX", PyInt_FromLong((long) wxITEM_MAX));
PyDict_SetItemString(d,"wxHT_NOWHERE", PyInt_FromLong((long) wxHT_NOWHERE)); 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_FIRST", PyInt_FromLong((long) wxHT_SCROLLBAR_FIRST));
PyDict_SetItemString(d,"wxHT_SCROLLBAR_ARROW_LINE_1", PyInt_FromLong((long) wxHT_SCROLLBAR_ARROW_LINE_1)); 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_SIMPLEX = wxc.wxDUPLEX_SIMPLEX
wxDUPLEX_HORIZONTAL = wxc.wxDUPLEX_HORIZONTAL wxDUPLEX_HORIZONTAL = wxc.wxDUPLEX_HORIZONTAL
wxDUPLEX_VERTICAL = wxc.wxDUPLEX_VERTICAL wxDUPLEX_VERTICAL = wxc.wxDUPLEX_VERTICAL
wxItem_Separator = wxc.wxItem_Separator wxITEM_SEPARATOR = wxc.wxITEM_SEPARATOR
wxItem_Normal = wxc.wxItem_Normal wxITEM_NORMAL = wxc.wxITEM_NORMAL
wxItem_Check = wxc.wxItem_Check wxITEM_CHECK = wxc.wxITEM_CHECK
wxItem_Radio = wxc.wxItem_Radio wxITEM_RADIO = wxc.wxITEM_RADIO
wxItem_Max = wxc.wxItem_Max wxITEM_MAX = wxc.wxITEM_MAX
wxHT_NOWHERE = wxc.wxHT_NOWHERE wxHT_NOWHERE = wxc.wxHT_NOWHERE
wxHT_SCROLLBAR_FIRST = wxc.wxHT_SCROLLBAR_FIRST wxHT_SCROLLBAR_FIRST = wxc.wxHT_SCROLLBAR_FIRST
wxHT_SCROLLBAR_ARROW_LINE_1 = wxc.wxHT_SCROLLBAR_ARROW_LINE_1 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, void Append(int id, const wxString& item,
const wxString& helpString = wxPyEmptyString, const wxString& helpString = wxPyEmptyString,
wxItemKind kind = wxItem_Normal); wxItemKind kind = wxITEM_NORMAL);
%name(AppendMenu)void Append(int id, const wxString& item, wxMenu *subMenu, %name(AppendMenu)void Append(int id, const wxString& item, wxMenu *subMenu,
const wxString& helpString = wxPyEmptyString); const wxString& helpString = wxPyEmptyString);
%name(AppendItem)void Append(const wxMenuItem* item); %name(AppendItem)void Append(const wxMenuItem* item);
@@ -600,7 +600,7 @@ public:
int id, int id,
const wxString& text, const wxString& text,
const wxString& help = wxPyEmptyString, const wxString& help = wxPyEmptyString,
wxItemKind kind = wxItem_Normal); wxItemKind kind = wxITEM_NORMAL);
void InsertSeparator(size_t pos); void InsertSeparator(size_t pos);
void InsertCheckItem(size_t pos, void InsertCheckItem(size_t pos,
int id, int id,
@@ -621,7 +621,7 @@ public:
void Prepend(int id, void Prepend(int id,
const wxString& text, const wxString& text,
const wxString& help = wxPyEmptyString, const wxString& help = wxPyEmptyString,
wxItemKind kind = wxItem_Normal); wxItemKind kind = wxITEM_NORMAL);
void PrependSeparator(); void PrependSeparator();
void PrependCheckItem(int id, void PrependCheckItem(int id,
const wxString& text, const wxString& text,
@@ -734,7 +734,7 @@ public:
wxMenuItem(wxMenu* parentMenu=NULL, int id=wxID_SEPARATOR, wxMenuItem(wxMenu* parentMenu=NULL, int id=wxID_SEPARATOR,
const wxString& text = wxPyEmptyString, const wxString& text = wxPyEmptyString,
const wxString& help = wxPyEmptyString, const wxString& help = wxPyEmptyString,
wxItemKind kind = wxItem_Normal, wxItemKind kind = wxITEM_NORMAL,
wxMenu* subMenu = NULL); wxMenu* subMenu = NULL);