Fixed duplicate definition of wxWindow::SetAcceleratorTable, more swig
code regenerated. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11839 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -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},
|
||||
|
Reference in New Issue
Block a user