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

Fixed duplicate definition of wxWindow::SetAcceleratorTable, more swig

Browse Source 
code regenerated.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11839 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2001-10-04 19:19:56 +00:00
parent 8366ae934a
commit 32c988a34d
24 changed files with 463 additions and 558 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wxPython/src/gtk/calendar.cpp
View File

@@ -901,7 +901,7 @@ static PyObject *_wrap_new_wxCalendarCtrl(PyObject *self, PyObject *args, PyObje
wxDateTime * _arg2 = (wxDateTime *) &wxDefaultDateTime;
wxPoint * _arg3 = (wxPoint *) &wxDefaultPosition;
wxSize * _arg4 = (wxSize *) &wxDefaultSize;
long _arg5 = (long ) (wxCAL_SHOW_HOLIDAYS);
long _arg5 = (long ) (wxCAL_SHOW_HOLIDAYS)|wxWANTS_CHARS;
char * _arg6 = (char *) "calendar";
PyObject * _argo0 = 0;
PyObject * _argo2 = 0;
@@ -993,7 +993,7 @@ static PyObject *_wrap_wxCalendarCtrl_Create(PyObject *self, PyObject *args, PyO
wxDateTime * _arg3 = (wxDateTime *) &wxDefaultDateTime;
wxPoint * _arg4 = (wxPoint *) &wxDefaultPosition;
wxSize * _arg5 = (wxSize *) &wxDefaultSize;
long _arg6 = (long ) (wxCAL_SHOW_HOLIDAYS);
long _arg6 = (long ) (wxCAL_SHOW_HOLIDAYS)|wxWANTS_CHARS;
char * _arg7 = (char *) "calendar";
PyObject * _argo0 = 0;
PyObject * _argo1 = 0;
@@ -1845,12 +1845,14 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxCommandEvent","_class_wxCalendarEvent",SwigwxCalendarEventTowxCommandEvent},
{ "_wxCommandEvent","_wxCalendarEvent",SwigwxCalendarEventTowxCommandEvent},
{ "_char","_wxChar",0},
{ "_struct_wxNativeFontInfo","_wxNativeFontInfo",0},
{ "_EBool","_wxCoord",0},
{ "_EBool","_wxPrintQuality",0},
{ "_EBool","_signed_int",0},
{ "_EBool","_int",0},
{ "_EBool","_wxWindowID",0},
{ "_unsigned_long","_long",0},
{ "_wxNativeFontInfo","_struct_wxNativeFontInfo",0},
{ "_signed_int","_wxCoord",0},
{ "_signed_int","_wxPrintQuality",0},
{ "_signed_int","_EBool",0},

112
wxPython/src/gtk/cmndlgs.cpp
View File

@@ -357,11 +357,11 @@ static void *SwigwxColourDialogTowxDialog(void *ptr) {
return (void *) dest;
}
static void *SwigwxColourDialogTowxPanel(void *ptr) {
static void *SwigwxColourDialogTowxTopLevelWindow(void *ptr) {
wxColourDialog *src;
wxPanel *dest;
wxTopLevelWindow *dest;
src = (wxColourDialog *) ptr;
dest = (wxPanel *) src;
dest = (wxTopLevelWindow *) src;
return (void *) dest;
}
@@ -505,11 +505,11 @@ static void *SwigwxDirDialogTowxDialog(void *ptr) {
return (void *) dest;
}
static void *SwigwxDirDialogTowxPanel(void *ptr) {
static void *SwigwxDirDialogTowxTopLevelWindow(void *ptr) {
wxDirDialog *src;
wxPanel *dest;
wxTopLevelWindow *dest;
src = (wxDirDialog *) ptr;
dest = (wxPanel *) src;
dest = (wxTopLevelWindow *) src;
return (void *) dest;
}
@@ -818,11 +818,11 @@ static void *SwigwxFileDialogTowxDialog(void *ptr) {
return (void *) dest;
}
static void *SwigwxFileDialogTowxPanel(void *ptr) {
static void *SwigwxFileDialogTowxTopLevelWindow(void *ptr) {
wxFileDialog *src;
wxPanel *dest;
wxTopLevelWindow *dest;
src = (wxFileDialog *) ptr;
dest = (wxPanel *) src;
dest = (wxTopLevelWindow *) src;
return (void *) dest;
}
@@ -1554,11 +1554,11 @@ static void *SwigwxSingleChoiceDialogTowxDialog(void *ptr) {
return (void *) dest;
}
static void *SwigwxSingleChoiceDialogTowxPanel(void *ptr) {
static void *SwigwxSingleChoiceDialogTowxTopLevelWindow(void *ptr) {
wxSingleChoiceDialog *src;
wxPanel *dest;
wxTopLevelWindow *dest;
src = (wxSingleChoiceDialog *) ptr;
dest = (wxPanel *) src;
dest = (wxTopLevelWindow *) src;
return (void *) dest;
}
@@ -1830,11 +1830,11 @@ static void *SwigwxTextEntryDialogTowxDialog(void *ptr) {
return (void *) dest;
}
static void *SwigwxTextEntryDialogTowxPanel(void *ptr) {
static void *SwigwxTextEntryDialogTowxTopLevelWindow(void *ptr) {
wxTextEntryDialog *src;
wxPanel *dest;
wxTopLevelWindow *dest;
src = (wxTextEntryDialog *) ptr;
dest = (wxPanel *) src;
dest = (wxTopLevelWindow *) src;
return (void *) dest;
}
@@ -2500,11 +2500,11 @@ static void *SwigwxFontDialogTowxDialog(void *ptr) {
return (void *) dest;
}
static void *SwigwxFontDialogTowxPanel(void *ptr) {
static void *SwigwxFontDialogTowxTopLevelWindow(void *ptr) {
wxFontDialog *src;
wxPanel *dest;
wxTopLevelWindow *dest;
src = (wxFontDialog *) ptr;
dest = (wxPanel *) src;
dest = (wxTopLevelWindow *) src;
return (void *) dest;
}
@@ -2648,11 +2648,11 @@ static void *SwigwxMessageDialogTowxDialog(void *ptr) {
return (void *) dest;
}
static void *SwigwxMessageDialogTowxPanel(void *ptr) {
static void *SwigwxMessageDialogTowxTopLevelWindow(void *ptr) {
wxMessageDialog *src;
wxPanel *dest;
wxTopLevelWindow *dest;
src = (wxMessageDialog *) ptr;
dest = (wxPanel *) src;
dest = (wxTopLevelWindow *) src;
return (void *) dest;
}
@@ -2763,6 +2763,14 @@ static void *SwigwxProgressDialogTowxFrame(void *ptr) {
return (void *) dest;
}
static void *SwigwxProgressDialogTowxTopLevelWindow(void *ptr) {
wxProgressDialog *src;
wxTopLevelWindow *dest;
src = (wxProgressDialog *) ptr;
dest = (wxTopLevelWindow *) src;
return (void *) dest;
}
static void *SwigwxProgressDialogTowxWindow(void *ptr) {
wxProgressDialog *src;
wxWindow *dest;
@@ -3064,20 +3072,22 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_size_t","_int",0},
{ "_size_t","_wxWindowID",0},
{ "_size_t","_uint",0},
{ "_wxPanel","_class_wxMessageDialog",SwigwxMessageDialogTowxPanel},
{ "_wxPanel","_wxMessageDialog",SwigwxMessageDialogTowxPanel},
{ "_wxPanel","_class_wxFontDialog",SwigwxFontDialogTowxPanel},
{ "_wxPanel","_wxFontDialog",SwigwxFontDialogTowxPanel},
{ "_wxPanel","_class_wxTextEntryDialog",SwigwxTextEntryDialogTowxPanel},
{ "_wxPanel","_wxTextEntryDialog",SwigwxTextEntryDialogTowxPanel},
{ "_wxPanel","_class_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxPanel},
{ "_wxPanel","_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxPanel},
{ "_wxPanel","_class_wxFileDialog",SwigwxFileDialogTowxPanel},
{ "_wxPanel","_wxFileDialog",SwigwxFileDialogTowxPanel},
{ "_wxPanel","_class_wxDirDialog",SwigwxDirDialogTowxPanel},
{ "_wxPanel","_wxDirDialog",SwigwxDirDialogTowxPanel},
{ "_wxPanel","_class_wxColourDialog",SwigwxColourDialogTowxPanel},
{ "_wxPanel","_wxColourDialog",SwigwxColourDialogTowxPanel},
{ "_wxTopLevelWindow","_class_wxProgressDialog",SwigwxProgressDialogTowxTopLevelWindow},
{ "_wxTopLevelWindow","_wxProgressDialog",SwigwxProgressDialogTowxTopLevelWindow},
{ "_wxTopLevelWindow","_class_wxMessageDialog",SwigwxMessageDialogTowxTopLevelWindow},
{ "_wxTopLevelWindow","_wxMessageDialog",SwigwxMessageDialogTowxTopLevelWindow},
{ "_wxTopLevelWindow","_class_wxFontDialog",SwigwxFontDialogTowxTopLevelWindow},
{ "_wxTopLevelWindow","_wxFontDialog",SwigwxFontDialogTowxTopLevelWindow},
{ "_wxTopLevelWindow","_class_wxTextEntryDialog",SwigwxTextEntryDialogTowxTopLevelWindow},
{ "_wxTopLevelWindow","_wxTextEntryDialog",SwigwxTextEntryDialogTowxTopLevelWindow},
{ "_wxTopLevelWindow","_class_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxTopLevelWindow},
{ "_wxTopLevelWindow","_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxTopLevelWindow},
{ "_wxTopLevelWindow","_class_wxFileDialog",SwigwxFileDialogTowxTopLevelWindow},
{ "_wxTopLevelWindow","_wxFileDialog",SwigwxFileDialogTowxTopLevelWindow},
{ "_wxTopLevelWindow","_class_wxDirDialog",SwigwxDirDialogTowxTopLevelWindow},
{ "_wxTopLevelWindow","_wxDirDialog",SwigwxDirDialogTowxTopLevelWindow},
{ "_wxTopLevelWindow","_class_wxColourDialog",SwigwxColourDialogTowxTopLevelWindow},
{ "_wxTopLevelWindow","_wxColourDialog",SwigwxColourDialogTowxTopLevelWindow},
{ "_class_wxDialog","_class_wxMessageDialog",SwigwxMessageDialogTowxDialog},
{ "_class_wxDialog","_wxMessageDialog",SwigwxMessageDialogTowxDialog},
{ "_class_wxDialog","_class_wxFontDialog",SwigwxFontDialogTowxDialog},
@@ -3101,31 +3111,35 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_uint","_wxWindowID",0},
{ "_wxChar","_char",0},
{ "_char","_wxChar",0},
{ "_struct_wxNativeFontInfo","_wxNativeFontInfo",0},
{ "_EBool","_wxCoord",0},
{ "_EBool","_wxPrintQuality",0},
{ "_EBool","_signed_int",0},
{ "_EBool","_int",0},
{ "_EBool","_wxWindowID",0},
{ "_unsigned_long","_long",0},
{ "_class_wxPanel","_class_wxMessageDialog",SwigwxMessageDialogTowxPanel},
{ "_class_wxPanel","_wxMessageDialog",SwigwxMessageDialogTowxPanel},
{ "_class_wxPanel","_class_wxFontDialog",SwigwxFontDialogTowxPanel},
{ "_class_wxPanel","_wxFontDialog",SwigwxFontDialogTowxPanel},
{ "_class_wxPanel","_class_wxTextEntryDialog",SwigwxTextEntryDialogTowxPanel},
{ "_class_wxPanel","_wxTextEntryDialog",SwigwxTextEntryDialogTowxPanel},
{ "_class_wxPanel","_class_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxPanel},
{ "_class_wxPanel","_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxPanel},
{ "_class_wxPanel","_class_wxFileDialog",SwigwxFileDialogTowxPanel},
{ "_class_wxPanel","_wxFileDialog",SwigwxFileDialogTowxPanel},
{ "_class_wxPanel","_class_wxDirDialog",SwigwxDirDialogTowxPanel},
{ "_class_wxPanel","_wxDirDialog",SwigwxDirDialogTowxPanel},
{ "_class_wxPanel","_class_wxColourDialog",SwigwxColourDialogTowxPanel},
{ "_class_wxPanel","_wxColourDialog",SwigwxColourDialogTowxPanel},
{ "_wxNativeFontInfo","_struct_wxNativeFontInfo",0},
{ "_signed_int","_wxCoord",0},
{ "_signed_int","_wxPrintQuality",0},
{ "_signed_int","_EBool",0},
{ "_signed_int","_wxWindowID",0},
{ "_signed_int","_int",0},
{ "_class_wxTopLevelWindow","_class_wxProgressDialog",SwigwxProgressDialogTowxTopLevelWindow},
{ "_class_wxTopLevelWindow","_wxProgressDialog",SwigwxProgressDialogTowxTopLevelWindow},
{ "_class_wxTopLevelWindow","_class_wxMessageDialog",SwigwxMessageDialogTowxTopLevelWindow},
{ "_class_wxTopLevelWindow","_wxMessageDialog",SwigwxMessageDialogTowxTopLevelWindow},
{ "_class_wxTopLevelWindow","_class_wxFontDialog",SwigwxFontDialogTowxTopLevelWindow},
{ "_class_wxTopLevelWindow","_wxFontDialog",SwigwxFontDialogTowxTopLevelWindow},
{ "_class_wxTopLevelWindow","_class_wxTextEntryDialog",SwigwxTextEntryDialogTowxTopLevelWindow},
{ "_class_wxTopLevelWindow","_wxTextEntryDialog",SwigwxTextEntryDialogTowxTopLevelWindow},
{ "_class_wxTopLevelWindow","_class_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxTopLevelWindow},
{ "_class_wxTopLevelWindow","_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxTopLevelWindow},
{ "_class_wxTopLevelWindow","_class_wxFileDialog",SwigwxFileDialogTowxTopLevelWindow},
{ "_class_wxTopLevelWindow","_wxFileDialog",SwigwxFileDialogTowxTopLevelWindow},
{ "_class_wxTopLevelWindow","_class_wxDirDialog",SwigwxDirDialogTowxTopLevelWindow},
{ "_class_wxTopLevelWindow","_wxDirDialog",SwigwxDirDialogTowxTopLevelWindow},
{ "_class_wxTopLevelWindow","_class_wxColourDialog",SwigwxColourDialogTowxTopLevelWindow},
{ "_class_wxTopLevelWindow","_wxColourDialog",SwigwxColourDialogTowxTopLevelWindow},
{ "_WXTYPE","_short",0},
{ "_WXTYPE","_signed_short",0},
{ "_WXTYPE","_unsigned_short",0},

2
wxPython/src/gtk/filesys.cpp
View File

@@ -2229,12 +2229,14 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_uint","_wxWindowID",0},
{ "_wxChar","_char",0},
{ "_char","_wxChar",0},
{ "_struct_wxNativeFontInfo","_wxNativeFontInfo",0},
{ "_EBool","_wxCoord",0},
{ "_EBool","_wxPrintQuality",0},
{ "_EBool","_signed_int",0},
{ "_EBool","_int",0},
{ "_EBool","_wxWindowID",0},
{ "_unsigned_long","_long",0},
{ "_wxNativeFontInfo","_struct_wxNativeFontInfo",0},
{ "_signed_int","_wxCoord",0},
{ "_signed_int","_wxPrintQuality",0},
{ "_signed_int","_EBool",0},

2
wxPython/src/gtk/help.cpp
View File

@@ -1171,12 +1171,14 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_char","_wxChar",0},
{ "_wxHelpProvider","_class_wxSimpleHelpProvider",SwigwxSimpleHelpProviderTowxHelpProvider},
{ "_wxHelpProvider","_wxSimpleHelpProvider",SwigwxSimpleHelpProviderTowxHelpProvider},
{ "_struct_wxNativeFontInfo","_wxNativeFontInfo",0},
{ "_EBool","_wxCoord",0},
{ "_EBool","_wxPrintQuality",0},
{ "_EBool","_signed_int",0},
{ "_EBool","_int",0},
{ "_EBool","_wxWindowID",0},
{ "_unsigned_long","_long",0},
{ "_wxNativeFontInfo","_struct_wxNativeFontInfo",0},
{ "_signed_int","_wxCoord",0},
{ "_signed_int","_wxPrintQuality",0},
{ "_signed_int","_EBool",0},

14
wxPython/src/gtk/htmlhelp.cpp
View File

@@ -1261,6 +1261,14 @@ static void *SwigwxHtmlHelpFrameTowxFrame(void *ptr) {
return (void *) dest;
}
static void *SwigwxHtmlHelpFrameTowxTopLevelWindow(void *ptr) {
wxHtmlHelpFrame *src;
wxTopLevelWindow *dest;
src = (wxHtmlHelpFrame *) ptr;
dest = (wxTopLevelWindow *) src;
return (void *) dest;
}
static void *SwigwxHtmlHelpFrameTowxWindow(void *ptr) {
wxHtmlHelpFrame *src;
wxWindow *dest;
@@ -2528,6 +2536,8 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_size_t","_int",0},
{ "_size_t","_wxWindowID",0},
{ "_size_t","_uint",0},
{ "_wxTopLevelWindow","_class_wxHtmlHelpFrame",SwigwxHtmlHelpFrameTowxTopLevelWindow},
{ "_wxTopLevelWindow","_wxHtmlHelpFrame",SwigwxHtmlHelpFrameTowxTopLevelWindow},
{ "_uint","_wxCoord",0},
{ "_uint","_wxPrintQuality",0},
{ "_uint","_time_t",0},
@@ -2537,17 +2547,21 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_uint","_wxWindowID",0},
{ "_wxChar","_char",0},
{ "_char","_wxChar",0},
{ "_struct_wxNativeFontInfo","_wxNativeFontInfo",0},
{ "_EBool","_wxCoord",0},
{ "_EBool","_wxPrintQuality",0},
{ "_EBool","_signed_int",0},
{ "_EBool","_int",0},
{ "_EBool","_wxWindowID",0},
{ "_unsigned_long","_long",0},
{ "_wxNativeFontInfo","_struct_wxNativeFontInfo",0},
{ "_signed_int","_wxCoord",0},
{ "_signed_int","_wxPrintQuality",0},
{ "_signed_int","_EBool",0},
{ "_signed_int","_wxWindowID",0},
{ "_signed_int","_int",0},
{ "_class_wxTopLevelWindow","_class_wxHtmlHelpFrame",SwigwxHtmlHelpFrameTowxTopLevelWindow},
{ "_class_wxTopLevelWindow","_wxHtmlHelpFrame",SwigwxHtmlHelpFrameTowxTopLevelWindow},
{ "_WXTYPE","_wxDateTime_t",0},
{ "_WXTYPE","_short",0},
{ "_WXTYPE","_signed_short",0},

2
wxPython/src/gtk/image.cpp
View File

@@ -2485,12 +2485,14 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_uint","_wxWindowID",0},
{ "_wxChar","_char",0},
{ "_char","_wxChar",0},
{ "_struct_wxNativeFontInfo","_wxNativeFontInfo",0},
{ "_EBool","_wxCoord",0},
{ "_EBool","_wxPrintQuality",0},
{ "_EBool","_signed_int",0},
{ "_EBool","_int",0},
{ "_EBool","_wxWindowID",0},
{ "_unsigned_long","_long",0},
{ "_wxNativeFontInfo","_struct_wxNativeFontInfo",0},
{ "_signed_int","_wxCoord",0},
{ "_signed_int","_wxPrintQuality",0},
{ "_signed_int","_EBool",0},

26
wxPython/src/gtk/mdi.cpp
View File

@@ -100,6 +100,14 @@ static void *SwigwxMDIParentFrameTowxFrame(void *ptr) {
return (void *) dest;
}
static void *SwigwxMDIParentFrameTowxTopLevelWindow(void *ptr) {
wxMDIParentFrame *src;
wxTopLevelWindow *dest;
src = (wxMDIParentFrame *) ptr;
dest = (wxTopLevelWindow *) src;
return (void *) dest;
}
static void *SwigwxMDIParentFrameTowxWindow(void *ptr) {
wxMDIParentFrame *src;
wxWindow *dest;
@@ -544,6 +552,14 @@ static void *SwigwxMDIChildFrameTowxFrame(void *ptr) {
return (void *) dest;
}
static void *SwigwxMDIChildFrameTowxTopLevelWindow(void *ptr) {
wxMDIChildFrame *src;
wxTopLevelWindow *dest;
src = (wxMDIChildFrame *) ptr;
dest = (wxTopLevelWindow *) src;
return (void *) dest;
}
static void *SwigwxMDIChildFrameTowxWindow(void *ptr) {
wxMDIChildFrame *src;
wxWindow *dest;
@@ -1029,6 +1045,10 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_size_t","_int",0},
{ "_size_t","_wxWindowID",0},
{ "_size_t","_uint",0},
{ "_wxTopLevelWindow","_class_wxMDIChildFrame",SwigwxMDIChildFrameTowxTopLevelWindow},
{ "_wxTopLevelWindow","_wxMDIChildFrame",SwigwxMDIChildFrameTowxTopLevelWindow},
{ "_wxTopLevelWindow","_class_wxMDIParentFrame",SwigwxMDIParentFrameTowxTopLevelWindow},
{ "_wxTopLevelWindow","_wxMDIParentFrame",SwigwxMDIParentFrameTowxTopLevelWindow},
{ "_uint","_wxCoord",0},
{ "_uint","_wxPrintQuality",0},
{ "_uint","_time_t",0},
@@ -1038,17 +1058,23 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_uint","_wxWindowID",0},
{ "_wxChar","_char",0},
{ "_char","_wxChar",0},
{ "_struct_wxNativeFontInfo","_wxNativeFontInfo",0},
{ "_EBool","_wxCoord",0},
{ "_EBool","_wxPrintQuality",0},
{ "_EBool","_signed_int",0},
{ "_EBool","_int",0},
{ "_EBool","_wxWindowID",0},
{ "_unsigned_long","_long",0},
{ "_wxNativeFontInfo","_struct_wxNativeFontInfo",0},
{ "_signed_int","_wxCoord",0},
{ "_signed_int","_wxPrintQuality",0},
{ "_signed_int","_EBool",0},
{ "_signed_int","_wxWindowID",0},
{ "_signed_int","_int",0},
{ "_class_wxTopLevelWindow","_class_wxMDIChildFrame",SwigwxMDIChildFrameTowxTopLevelWindow},
{ "_class_wxTopLevelWindow","_wxMDIChildFrame",SwigwxMDIChildFrameTowxTopLevelWindow},
{ "_class_wxTopLevelWindow","_class_wxMDIParentFrame",SwigwxMDIParentFrameTowxTopLevelWindow},
{ "_class_wxTopLevelWindow","_wxMDIParentFrame",SwigwxMDIParentFrameTowxTopLevelWindow},
{ "_WXTYPE","_short",0},
{ "_WXTYPE","_signed_short",0},
{ "_WXTYPE","_unsigned_short",0},

40
wxPython/src/gtk/printfw.cpp
View File

@@ -2488,11 +2488,11 @@ static void *SwigwxPageSetupDialogTowxDialog(void *ptr) {
return (void *) dest;
}
static void *SwigwxPageSetupDialogTowxPanel(void *ptr) {
static void *SwigwxPageSetupDialogTowxTopLevelWindow(void *ptr) {
wxPageSetupDialog *src;
wxPanel *dest;
wxTopLevelWindow *dest;
src = (wxPageSetupDialog *) ptr;
dest = (wxPanel *) src;
dest = (wxTopLevelWindow *) src;
return (void *) dest;
}
@@ -3358,11 +3358,11 @@ static void *SwigwxPrintDialogTowxDialog(void *ptr) {
return (void *) dest;
}
static void *SwigwxPrintDialogTowxPanel(void *ptr) {
static void *SwigwxPrintDialogTowxTopLevelWindow(void *ptr) {
wxPrintDialog *src;
wxPanel *dest;
wxTopLevelWindow *dest;
src = (wxPrintDialog *) ptr;
dest = (wxPanel *) src;
dest = (wxTopLevelWindow *) src;
return (void *) dest;
}
@@ -4992,6 +4992,14 @@ static void *SwigwxPreviewFrameTowxFrame(void *ptr) {
return (void *) dest;
}
static void *SwigwxPreviewFrameTowxTopLevelWindow(void *ptr) {
wxPreviewFrame *src;
wxTopLevelWindow *dest;
src = (wxPreviewFrame *) ptr;
dest = (wxTopLevelWindow *) src;
return (void *) dest;
}
static void *SwigwxPreviewFrameTowxWindow(void *ptr) {
wxPreviewFrame *src;
wxWindow *dest;
@@ -5332,10 +5340,12 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_size_t","_int",0},
{ "_size_t","_wxWindowID",0},
{ "_size_t","_uint",0},
{ "_wxPanel","_class_wxPrintDialog",SwigwxPrintDialogTowxPanel},
{ "_wxPanel","_wxPrintDialog",SwigwxPrintDialogTowxPanel},
{ "_wxPanel","_class_wxPageSetupDialog",SwigwxPageSetupDialogTowxPanel},
{ "_wxPanel","_wxPageSetupDialog",SwigwxPageSetupDialogTowxPanel},
{ "_wxTopLevelWindow","_class_wxPreviewFrame",SwigwxPreviewFrameTowxTopLevelWindow},
{ "_wxTopLevelWindow","_wxPreviewFrame",SwigwxPreviewFrameTowxTopLevelWindow},
{ "_wxTopLevelWindow","_class_wxPrintDialog",SwigwxPrintDialogTowxTopLevelWindow},
{ "_wxTopLevelWindow","_wxPrintDialog",SwigwxPrintDialogTowxTopLevelWindow},
{ "_wxTopLevelWindow","_class_wxPageSetupDialog",SwigwxPageSetupDialogTowxTopLevelWindow},
{ "_wxTopLevelWindow","_wxPageSetupDialog",SwigwxPageSetupDialogTowxTopLevelWindow},
{ "_class_wxDialog","_class_wxPrintDialog",SwigwxPrintDialogTowxDialog},
{ "_class_wxDialog","_wxPrintDialog",SwigwxPrintDialogTowxDialog},
{ "_class_wxDialog","_class_wxPageSetupDialog",SwigwxPageSetupDialogTowxDialog},
@@ -5357,15 +5367,17 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_EBool","_wxWindowID",0},
{ "_unsigned_long","_long",0},
{ "_wxNativeFontInfo","_struct_wxNativeFontInfo",0},
{ "_class_wxPanel","_class_wxPrintDialog",SwigwxPrintDialogTowxPanel},
{ "_class_wxPanel","_wxPrintDialog",SwigwxPrintDialogTowxPanel},
{ "_class_wxPanel","_class_wxPageSetupDialog",SwigwxPageSetupDialogTowxPanel},
{ "_class_wxPanel","_wxPageSetupDialog",SwigwxPageSetupDialogTowxPanel},
{ "_signed_int","_wxCoord",0},
{ "_signed_int","_wxPrintQuality",0},
{ "_signed_int","_EBool",0},
{ "_signed_int","_wxWindowID",0},
{ "_signed_int","_int",0},
{ "_class_wxTopLevelWindow","_class_wxPreviewFrame",SwigwxPreviewFrameTowxTopLevelWindow},
{ "_class_wxTopLevelWindow","_wxPreviewFrame",SwigwxPreviewFrameTowxTopLevelWindow},
{ "_class_wxTopLevelWindow","_class_wxPrintDialog",SwigwxPrintDialogTowxTopLevelWindow},
{ "_class_wxTopLevelWindow","_wxPrintDialog",SwigwxPrintDialogTowxTopLevelWindow},
{ "_class_wxTopLevelWindow","_class_wxPageSetupDialog",SwigwxPageSetupDialogTowxTopLevelWindow},
{ "_class_wxTopLevelWindow","_wxPageSetupDialog",SwigwxPageSetupDialogTowxTopLevelWindow},
{ "_WXTYPE","_short",0},
{ "_WXTYPE","_signed_short",0},
{ "_WXTYPE","_unsigned_short",0},

2
wxPython/src/gtk/sizers.cpp
View File

@@ -3005,12 +3005,14 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxBoxSizer","_class_wxStaticBoxSizer",SwigwxStaticBoxSizerTowxBoxSizer},
{ "_wxBoxSizer","_wxStaticBoxSizer",SwigwxStaticBoxSizerTowxBoxSizer},
{ "_char","_wxChar",0},
{ "_struct_wxNativeFontInfo","_wxNativeFontInfo",0},
{ "_EBool","_wxCoord",0},
{ "_EBool","_wxPrintQuality",0},
{ "_EBool","_signed_int",0},
{ "_EBool","_int",0},
{ "_EBool","_wxWindowID",0},
{ "_unsigned_long","_long",0},
{ "_wxNativeFontInfo","_struct_wxNativeFontInfo",0},
{ "_signed_int","_wxCoord",0},
{ "_signed_int","_wxPrintQuality",0},
{ "_signed_int","_EBool",0},

2
wxPython/src/gtk/stattool.cpp
View File

@@ -3595,12 +3595,14 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_uint","_wxWindowID",0},
{ "_wxChar","_char",0},
{ "_char","_wxChar",0},
{ "_struct_wxNativeFontInfo","_wxNativeFontInfo",0},
{ "_EBool","_wxCoord",0},
{ "_EBool","_wxPrintQuality",0},
{ "_EBool","_signed_int",0},
{ "_EBool","_int",0},
{ "_EBool","_wxWindowID",0},
{ "_unsigned_long","_long",0},
{ "_wxNativeFontInfo","_struct_wxNativeFontInfo",0},
{ "_signed_int","_wxCoord",0},
{ "_signed_int","_wxPrintQuality",0},
{ "_signed_int","_EBool",0},

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

@@ -3642,43 +3642,6 @@ static PyObject *_wrap_wxWindow_ScrollWindow(PyObject *self, PyObject *args, PyO
return _resultobj;
}
#define wxWindow_SetAcceleratorTable(_swigobj,_swigarg0) (_swigobj->SetAcceleratorTable(_swigarg0))
static PyObject *_wrap_wxWindow_SetAcceleratorTable(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxWindow * _arg0;
wxAcceleratorTable * _arg1;
PyObject * _argo0 = 0;
PyObject * _argo1 = 0;
char *_kwnames[] = { "self","accel", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWindow_SetAcceleratorTable",_kwnames,&_argo0,&_argo1))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetAcceleratorTable. Expected _wxWindow_p.");
return NULL;
}
}
if (_argo1) {
if (_argo1 == Py_None) { _arg1 = NULL; }
else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxAcceleratorTable_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_SetAcceleratorTable. Expected _wxAcceleratorTable_p.");
return NULL;
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
wxWindow_SetAcceleratorTable(_arg0,*_arg1);
wxPy_END_ALLOW_THREADS;
if (PyErr_Occurred()) return NULL;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
}
#define wxWindow_SetAutoLayout(_swigobj,_swigarg0) (_swigobj->SetAutoLayout(_swigarg0))
static PyObject *_wrap_wxWindow_SetAutoLayout(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -5658,6 +5621,43 @@ static PyObject *_wrap_wxWindow_PrevControlId(PyObject *self, PyObject *args, Py
return _resultobj;
}
#define wxWindow_SetAcceleratorTable(_swigobj,_swigarg0) (_swigobj->SetAcceleratorTable(_swigarg0))
static PyObject *_wrap_wxWindow_SetAcceleratorTable(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxWindow * _arg0;
wxAcceleratorTable * _arg1;
PyObject * _argo0 = 0;
PyObject * _argo1 = 0;
char *_kwnames[] = { "self","accel", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWindow_SetAcceleratorTable",_kwnames,&_argo0,&_argo1))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetAcceleratorTable. Expected _wxWindow_p.");
return NULL;
}
}
if (_argo1) {
if (_argo1 == Py_None) { _arg1 = NULL; }
else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxAcceleratorTable_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_SetAcceleratorTable. Expected _wxAcceleratorTable_p.");
return NULL;
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
wxWindow_SetAcceleratorTable(_arg0,*_arg1);
wxPy_END_ALLOW_THREADS;
if (PyErr_Occurred()) return NULL;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
}
#define wxWindow_GetAcceleratorTable(_swigobj) (_swigobj->GetAcceleratorTable())
static PyObject *_wrap_wxWindow_GetAcceleratorTable(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -10009,6 +10009,7 @@ static PyMethodDef windowscMethods[] = {
{ "new_wxPrePanel", (PyCFunction) _wrap_new_wxPrePanel, METH_VARARGS | METH_KEYWORDS },
{ "new_wxPanel", (PyCFunction) _wrap_new_wxPanel, METH_VARARGS | METH_KEYWORDS },
{ "wxWindow_GetAcceleratorTable", (PyCFunction) _wrap_wxWindow_GetAcceleratorTable, METH_VARARGS | METH_KEYWORDS },
{ "wxWindow_SetAcceleratorTable", (PyCFunction) _wrap_wxWindow_SetAcceleratorTable, METH_VARARGS | METH_KEYWORDS },
{ "wxWindow_PrevControlId", (PyCFunction) _wrap_wxWindow_PrevControlId, METH_VARARGS | METH_KEYWORDS },
{ "wxWindow_NextControlId", (PyCFunction) _wrap_wxWindow_NextControlId, METH_VARARGS | METH_KEYWORDS },
{ "wxWindow_NewControlId", (PyCFunction) _wrap_wxWindow_NewControlId, METH_VARARGS | METH_KEYWORDS },
@@ -10071,7 +10072,6 @@ static PyMethodDef windowscMethods[] = {
{ "wxWindow_SetBackgroundColour", (PyCFunction) _wrap_wxWindow_SetBackgroundColour, METH_VARARGS | METH_KEYWORDS },
{ "wxWindow_GetAutoLayout", (PyCFunction) _wrap_wxWindow_GetAutoLayout, METH_VARARGS | METH_KEYWORDS },
{ "wxWindow_SetAutoLayout", (PyCFunction) _wrap_wxWindow_SetAutoLayout, METH_VARARGS | METH_KEYWORDS },
{ "wxWindow_SetAcceleratorTable", (PyCFunction) _wrap_wxWindow_SetAcceleratorTable, METH_VARARGS | METH_KEYWORDS },
{ "wxWindow_ScrollWindow", (PyCFunction) _wrap_wxWindow_ScrollWindow, METH_VARARGS | METH_KEYWORDS },
{ "wxWindow_ScreenToClient", (PyCFunction) _wrap_wxWindow_ScreenToClient, METH_VARARGS | METH_KEYWORDS },
{ "wxWindow_ScreenToClientXY", (PyCFunction) _wrap_wxWindow_ScreenToClientXY, METH_VARARGS | METH_KEYWORDS },

6
wxPython/src/gtk/windows.py
View File

@@ -357,9 +357,6 @@ class wxWindowPtr(wxEvtHandlerPtr):
def ScrollWindow(self, *_args, **_kwargs):
val = apply(windowsc.wxWindow_ScrollWindow,(self,) + _args, _kwargs)
return val
def SetAcceleratorTable(self, *_args, **_kwargs):
val = apply(windowsc.wxWindow_SetAcceleratorTable,(self,) + _args, _kwargs)
return val
def SetAutoLayout(self, *_args, **_kwargs):
val = apply(windowsc.wxWindow_SetAutoLayout,(self,) + _args, _kwargs)
return val
@@ -544,6 +541,9 @@ class wxWindowPtr(wxEvtHandlerPtr):
def PageDown(self, *_args, **_kwargs):
val = apply(windowsc.wxWindow_PageDown,(self,) + _args, _kwargs)
return val
def SetAcceleratorTable(self, *_args, **_kwargs):
val = apply(windowsc.wxWindow_SetAcceleratorTable,(self,) + _args, _kwargs)
return val
def GetAcceleratorTable(self, *_args, **_kwargs):
val = apply(windowsc.wxWindow_GetAcceleratorTable,(self,) + _args, _kwargs)
if val: val = wxAcceleratorTablePtr(val)

2
wxPython/src/gtk/windows3.cpp
View File

@@ -2137,12 +2137,14 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxCommandEvent","_class_wxSashEvent",SwigwxSashEventTowxCommandEvent},
{ "_wxCommandEvent","_wxSashEvent",SwigwxSashEventTowxCommandEvent},
{ "_char","_wxChar",0},
{ "_struct_wxNativeFontInfo","_wxNativeFontInfo",0},
{ "_EBool","_wxCoord",0},
{ "_EBool","_wxPrintQuality",0},
{ "_EBool","_signed_int",0},
{ "_EBool","_int",0},
{ "_EBool","_wxWindowID",0},
{ "_unsigned_long","_long",0},
{ "_wxNativeFontInfo","_struct_wxNativeFontInfo",0},
{ "_signed_int","_wxCoord",0},
{ "_signed_int","_wxPrintQuality",0},
{ "_signed_int","_EBool",0},

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

@@ -2116,6 +2116,16 @@ SWIGEXPORT(void) initwxc() {
PyDict_SetItemString(d,"wxJOY_BUTTON4", PyInt_FromLong((long) wxJOY_BUTTON4));
PyDict_SetItemString(d,"wxJOY_BUTTON_ANY", PyInt_FromLong((long) wxJOY_BUTTON_ANY));
PyDict_SetItemString(d,"wxWS_EX_VALIDATE_RECURSIVELY", PyInt_FromLong((long) wxWS_EX_VALIDATE_RECURSIVELY));
PyDict_SetItemString(d,"wxMM_TEXT", PyInt_FromLong((long) wxMM_TEXT));
PyDict_SetItemString(d,"wxMM_LOMETRIC", PyInt_FromLong((long) wxMM_LOMETRIC));
PyDict_SetItemString(d,"wxMM_HIMETRIC", PyInt_FromLong((long) wxMM_HIMETRIC));
PyDict_SetItemString(d,"wxMM_LOENGLISH", PyInt_FromLong((long) wxMM_LOENGLISH));
PyDict_SetItemString(d,"wxMM_HIENGLISH", PyInt_FromLong((long) wxMM_HIENGLISH));
PyDict_SetItemString(d,"wxMM_TWIPS", PyInt_FromLong((long) wxMM_TWIPS));
PyDict_SetItemString(d,"wxMM_ISOTROPIC", PyInt_FromLong((long) wxMM_ISOTROPIC));
PyDict_SetItemString(d,"wxMM_ANISOTROPIC", PyInt_FromLong((long) wxMM_ANISOTROPIC));
PyDict_SetItemString(d,"wxMM_POINTS", PyInt_FromLong((long) wxMM_POINTS));
PyDict_SetItemString(d,"wxMM_METRIC", PyInt_FromLong((long) wxMM_METRIC));
PyDict_SetItemString(d,"wxDEFAULT", PyInt_FromLong((long) wxDEFAULT));
PyDict_SetItemString(d,"wxDECORATIVE", PyInt_FromLong((long) wxDECORATIVE));
PyDict_SetItemString(d,"wxROMAN", PyInt_FromLong((long) wxROMAN));
@@ -2179,6 +2189,7 @@ SWIGEXPORT(void) initwxc() {
PyDict_SetItemString(d,"WXK_MBUTTON", PyInt_FromLong((long) WXK_MBUTTON));
PyDict_SetItemString(d,"WXK_CLEAR", PyInt_FromLong((long) WXK_CLEAR));
PyDict_SetItemString(d,"WXK_SHIFT", PyInt_FromLong((long) WXK_SHIFT));
PyDict_SetItemString(d,"WXK_ALT", PyInt_FromLong((long) WXK_ALT));
PyDict_SetItemString(d,"WXK_CONTROL", PyInt_FromLong((long) WXK_CONTROL));
PyDict_SetItemString(d,"WXK_MENU", PyInt_FromLong((long) WXK_MENU));
PyDict_SetItemString(d,"WXK_PAUSE", PyInt_FromLong((long) WXK_PAUSE));
@@ -2241,6 +2252,33 @@ SWIGEXPORT(void) initwxc() {
PyDict_SetItemString(d,"WXK_SCROLL", PyInt_FromLong((long) WXK_SCROLL));
PyDict_SetItemString(d,"WXK_PAGEUP", PyInt_FromLong((long) WXK_PAGEUP));
PyDict_SetItemString(d,"WXK_PAGEDOWN", PyInt_FromLong((long) WXK_PAGEDOWN));
PyDict_SetItemString(d,"WXK_NUMPAD_SPACE", PyInt_FromLong((long) WXK_NUMPAD_SPACE));
PyDict_SetItemString(d,"WXK_NUMPAD_TAB", PyInt_FromLong((long) WXK_NUMPAD_TAB));
PyDict_SetItemString(d,"WXK_NUMPAD_ENTER", PyInt_FromLong((long) WXK_NUMPAD_ENTER));
PyDict_SetItemString(d,"WXK_NUMPAD_F1", PyInt_FromLong((long) WXK_NUMPAD_F1));
PyDict_SetItemString(d,"WXK_NUMPAD_F2", PyInt_FromLong((long) WXK_NUMPAD_F2));
PyDict_SetItemString(d,"WXK_NUMPAD_F3", PyInt_FromLong((long) WXK_NUMPAD_F3));
PyDict_SetItemString(d,"WXK_NUMPAD_F4", PyInt_FromLong((long) WXK_NUMPAD_F4));
PyDict_SetItemString(d,"WXK_NUMPAD_HOME", PyInt_FromLong((long) WXK_NUMPAD_HOME));
PyDict_SetItemString(d,"WXK_NUMPAD_LEFT", PyInt_FromLong((long) WXK_NUMPAD_LEFT));
PyDict_SetItemString(d,"WXK_NUMPAD_UP", PyInt_FromLong((long) WXK_NUMPAD_UP));
PyDict_SetItemString(d,"WXK_NUMPAD_RIGHT", PyInt_FromLong((long) WXK_NUMPAD_RIGHT));
PyDict_SetItemString(d,"WXK_NUMPAD_DOWN", PyInt_FromLong((long) WXK_NUMPAD_DOWN));
PyDict_SetItemString(d,"WXK_NUMPAD_PRIOR", PyInt_FromLong((long) WXK_NUMPAD_PRIOR));
PyDict_SetItemString(d,"WXK_NUMPAD_PAGEUP", PyInt_FromLong((long) WXK_NUMPAD_PAGEUP));
PyDict_SetItemString(d,"WXK_NUMPAD_NEXT", PyInt_FromLong((long) WXK_NUMPAD_NEXT));
PyDict_SetItemString(d,"WXK_NUMPAD_PAGEDOWN", PyInt_FromLong((long) WXK_NUMPAD_PAGEDOWN));
PyDict_SetItemString(d,"WXK_NUMPAD_END", PyInt_FromLong((long) WXK_NUMPAD_END));
PyDict_SetItemString(d,"WXK_NUMPAD_BEGIN", PyInt_FromLong((long) WXK_NUMPAD_BEGIN));
PyDict_SetItemString(d,"WXK_NUMPAD_INSERT", PyInt_FromLong((long) WXK_NUMPAD_INSERT));
PyDict_SetItemString(d,"WXK_NUMPAD_DELETE", PyInt_FromLong((long) WXK_NUMPAD_DELETE));
PyDict_SetItemString(d,"WXK_NUMPAD_EQUAL", PyInt_FromLong((long) WXK_NUMPAD_EQUAL));
PyDict_SetItemString(d,"WXK_NUMPAD_MULTIPLY", PyInt_FromLong((long) WXK_NUMPAD_MULTIPLY));
PyDict_SetItemString(d,"WXK_NUMPAD_ADD", PyInt_FromLong((long) WXK_NUMPAD_ADD));
PyDict_SetItemString(d,"WXK_NUMPAD_SEPARATOR", PyInt_FromLong((long) WXK_NUMPAD_SEPARATOR));
PyDict_SetItemString(d,"WXK_NUMPAD_SUBTRACT", PyInt_FromLong((long) WXK_NUMPAD_SUBTRACT));
PyDict_SetItemString(d,"WXK_NUMPAD_DECIMAL", PyInt_FromLong((long) WXK_NUMPAD_DECIMAL));
PyDict_SetItemString(d,"WXK_NUMPAD_DIVIDE", PyInt_FromLong((long) WXK_NUMPAD_DIVIDE));
PyDict_SetItemString(d,"wxBITMAP_TYPE_INVALID", PyInt_FromLong((long) wxBITMAP_TYPE_INVALID));
PyDict_SetItemString(d,"wxBITMAP_TYPE_BMP", PyInt_FromLong((long) wxBITMAP_TYPE_BMP));
PyDict_SetItemString(d,"wxBITMAP_TYPE_BMP_RESOURCE", PyInt_FromLong((long) wxBITMAP_TYPE_BMP_RESOURCE));

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

@@ -428,6 +428,16 @@ wxJOY_BUTTON3 = wxc.wxJOY_BUTTON3
wxJOY_BUTTON4 = wxc.wxJOY_BUTTON4
wxJOY_BUTTON_ANY = wxc.wxJOY_BUTTON_ANY
wxWS_EX_VALIDATE_RECURSIVELY = wxc.wxWS_EX_VALIDATE_RECURSIVELY
wxMM_TEXT = wxc.wxMM_TEXT
wxMM_LOMETRIC = wxc.wxMM_LOMETRIC
wxMM_HIMETRIC = wxc.wxMM_HIMETRIC
wxMM_LOENGLISH = wxc.wxMM_LOENGLISH
wxMM_HIENGLISH = wxc.wxMM_HIENGLISH
wxMM_TWIPS = wxc.wxMM_TWIPS
wxMM_ISOTROPIC = wxc.wxMM_ISOTROPIC
wxMM_ANISOTROPIC = wxc.wxMM_ANISOTROPIC
wxMM_POINTS = wxc.wxMM_POINTS
wxMM_METRIC = wxc.wxMM_METRIC
wxDEFAULT = wxc.wxDEFAULT
wxDECORATIVE = wxc.wxDECORATIVE
wxROMAN = wxc.wxROMAN
@@ -491,6 +501,7 @@ WXK_CANCEL = wxc.WXK_CANCEL
WXK_MBUTTON = wxc.WXK_MBUTTON
WXK_CLEAR = wxc.WXK_CLEAR
WXK_SHIFT = wxc.WXK_SHIFT
WXK_ALT = wxc.WXK_ALT
WXK_CONTROL = wxc.WXK_CONTROL
WXK_MENU = wxc.WXK_MENU
WXK_PAUSE = wxc.WXK_PAUSE
@@ -553,6 +564,33 @@ WXK_NUMLOCK = wxc.WXK_NUMLOCK
WXK_SCROLL = wxc.WXK_SCROLL
WXK_PAGEUP = wxc.WXK_PAGEUP
WXK_PAGEDOWN = wxc.WXK_PAGEDOWN
WXK_NUMPAD_SPACE = wxc.WXK_NUMPAD_SPACE
WXK_NUMPAD_TAB = wxc.WXK_NUMPAD_TAB
WXK_NUMPAD_ENTER = wxc.WXK_NUMPAD_ENTER
WXK_NUMPAD_F1 = wxc.WXK_NUMPAD_F1
WXK_NUMPAD_F2 = wxc.WXK_NUMPAD_F2
WXK_NUMPAD_F3 = wxc.WXK_NUMPAD_F3
WXK_NUMPAD_F4 = wxc.WXK_NUMPAD_F4
WXK_NUMPAD_HOME = wxc.WXK_NUMPAD_HOME
WXK_NUMPAD_LEFT = wxc.WXK_NUMPAD_LEFT
WXK_NUMPAD_UP = wxc.WXK_NUMPAD_UP
WXK_NUMPAD_RIGHT = wxc.WXK_NUMPAD_RIGHT
WXK_NUMPAD_DOWN = wxc.WXK_NUMPAD_DOWN
WXK_NUMPAD_PRIOR = wxc.WXK_NUMPAD_PRIOR
WXK_NUMPAD_PAGEUP = wxc.WXK_NUMPAD_PAGEUP
WXK_NUMPAD_NEXT = wxc.WXK_NUMPAD_NEXT
WXK_NUMPAD_PAGEDOWN = wxc.WXK_NUMPAD_PAGEDOWN
WXK_NUMPAD_END = wxc.WXK_NUMPAD_END
WXK_NUMPAD_BEGIN = wxc.WXK_NUMPAD_BEGIN
WXK_NUMPAD_INSERT = wxc.WXK_NUMPAD_INSERT
WXK_NUMPAD_DELETE = wxc.WXK_NUMPAD_DELETE
WXK_NUMPAD_EQUAL = wxc.WXK_NUMPAD_EQUAL
WXK_NUMPAD_MULTIPLY = wxc.WXK_NUMPAD_MULTIPLY
WXK_NUMPAD_ADD = wxc.WXK_NUMPAD_ADD
WXK_NUMPAD_SEPARATOR = wxc.WXK_NUMPAD_SEPARATOR
WXK_NUMPAD_SUBTRACT = wxc.WXK_NUMPAD_SUBTRACT
WXK_NUMPAD_DECIMAL = wxc.WXK_NUMPAD_DECIMAL
WXK_NUMPAD_DIVIDE = wxc.WXK_NUMPAD_DIVIDE
wxBITMAP_TYPE_INVALID = wxc.wxBITMAP_TYPE_INVALID
wxBITMAP_TYPE_BMP = wxc.wxBITMAP_TYPE_BMP
wxBITMAP_TYPE_BMP_RESOURCE = wxc.wxBITMAP_TYPE_BMP_RESOURCE
@@ -1393,7 +1431,7 @@ NULL = None # For backwards compatibility only. You should really be
wxColor = wxColour
wxNamedColor = wxNamedColour
wxPen = wxPyPen
# backwards compatibility
wxNoRefBitmap = wxBitmap