From: Robin Dunn Date: Thu, 4 Oct 2001 17:13:28 +0000 (+0000) Subject: Regenerated some swig code, added some missing WXK_ constants, etc... X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/65fe3842bf62e64307050edb554cc0ef08d6bbae Regenerated some swig code, added some missing WXK_ constants, etc... git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11835 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/wxPython/contrib/glcanvas/msw/glcanvas.cpp b/wxPython/contrib/glcanvas/msw/glcanvas.cpp index 98432e4221..4c1b8e5095 100644 --- a/wxPython/contrib/glcanvas/msw/glcanvas.cpp +++ b/wxPython/contrib/glcanvas/msw/glcanvas.cpp @@ -578,12 +578,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}, diff --git a/wxPython/contrib/stc/stc_.cpp b/wxPython/contrib/stc/stc_.cpp index 67ba91300c..1ad2814880 100644 --- a/wxPython/contrib/stc/stc_.cpp +++ b/wxPython/contrib/stc/stc_.cpp @@ -10119,7 +10119,6 @@ static PyMethodDef stc_cMethods[] = { * This table is used by the pointer type-checker */ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { - { "_wxEvent","_class_wxStyledTextEvent",SwigwxStyledTextEventTowxEvent}, { "_wxEvent","_wxStyledTextEvent",SwigwxStyledTextEventTowxEvent}, { "_signed_long","_long",0}, { "_wxPrintQuality","_wxCoord",0}, @@ -10131,15 +10130,9 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxPrintQuality","_EBool",0}, { "_wxPrintQuality","_size_t",0}, { "_wxPrintQuality","_time_t",0}, - { "_class_wxEvtHandler","_class_wxStyledTextCtrl",SwigwxStyledTextCtrlTowxEvtHandler}, - { "_class_wxEvtHandler","_wxStyledTextCtrl",SwigwxStyledTextCtrlTowxEvtHandler}, { "_byte","_unsigned_char",0}, { "_long","_unsigned_long",0}, { "_long","_signed_long",0}, - { "_class_wxObject","_class_wxStyledTextEvent",SwigwxStyledTextEventTowxObject}, - { "_class_wxObject","_wxStyledTextEvent",SwigwxStyledTextEventTowxObject}, - { "_class_wxObject","_class_wxStyledTextCtrl",SwigwxStyledTextCtrlTowxObject}, - { "_class_wxObject","_wxStyledTextCtrl",SwigwxStyledTextCtrlTowxObject}, { "_size_t","_wxCoord",0}, { "_size_t","_wxPrintQuality",0}, { "_size_t","_time_t",0}, @@ -10155,9 +10148,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_uint","_int",0}, { "_uint","_wxWindowID",0}, { "_wxChar","_char",0}, - { "_class_wxEvent","_class_wxStyledTextEvent",SwigwxStyledTextEventTowxEvent}, - { "_class_wxEvent","_wxStyledTextEvent",SwigwxStyledTextEventTowxEvent}, - { "_wxCommandEvent","_class_wxStyledTextEvent",SwigwxStyledTextEventTowxCommandEvent}, { "_wxCommandEvent","_wxStyledTextEvent",SwigwxStyledTextEventTowxCommandEvent}, { "_char","_wxChar",0}, { "_struct_wxNativeFontInfo","_wxNativeFontInfo",0}, @@ -10180,16 +10170,11 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_unsigned_short","_wxDateTime_t",0}, { "_unsigned_short","_WXTYPE",0}, { "_unsigned_short","_short",0}, - { "_class_wxWindow","_class_wxStyledTextCtrl",SwigwxStyledTextCtrlTowxWindow}, - { "_class_wxWindow","_wxStyledTextCtrl",SwigwxStyledTextCtrlTowxWindow}, - { "_wxObject","_class_wxStyledTextEvent",SwigwxStyledTextEventTowxObject}, { "_wxObject","_wxStyledTextEvent",SwigwxStyledTextEventTowxObject}, - { "_wxObject","_class_wxStyledTextCtrl",SwigwxStyledTextCtrlTowxObject}, { "_wxObject","_wxStyledTextCtrl",SwigwxStyledTextCtrlTowxObject}, { "_signed_short","_WXTYPE",0}, { "_signed_short","_short",0}, { "_unsigned_char","_byte",0}, - { "_wxControl","_class_wxStyledTextCtrl",SwigwxStyledTextCtrlTowxControl}, { "_wxControl","_wxStyledTextCtrl",SwigwxStyledTextCtrlTowxControl}, { "_unsigned_int","_wxCoord",0}, { "_unsigned_int","_wxPrintQuality",0}, @@ -10230,8 +10215,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_time_t","_wxWindowID",0}, { "_time_t","_uint",0}, { "_time_t","_size_t",0}, - { "_class_wxControl","_class_wxStyledTextCtrl",SwigwxStyledTextCtrlTowxControl}, - { "_class_wxControl","_wxStyledTextCtrl",SwigwxStyledTextCtrlTowxControl}, { "_wxCoord","_int",0}, { "_wxCoord","_signed_int",0}, { "_wxCoord","_unsigned_int",0}, @@ -10241,11 +10224,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxCoord","_size_t",0}, { "_wxCoord","_time_t",0}, { "_wxCoord","_wxPrintQuality",0}, - { "_class_wxCommandEvent","_class_wxStyledTextEvent",SwigwxStyledTextEventTowxCommandEvent}, - { "_class_wxCommandEvent","_wxStyledTextEvent",SwigwxStyledTextEventTowxCommandEvent}, - { "_wxEvtHandler","_class_wxStyledTextCtrl",SwigwxStyledTextCtrlTowxEvtHandler}, { "_wxEvtHandler","_wxStyledTextCtrl",SwigwxStyledTextCtrlTowxEvtHandler}, - { "_wxWindow","_class_wxStyledTextCtrl",SwigwxStyledTextCtrlTowxWindow}, { "_wxWindow","_wxStyledTextCtrl",SwigwxStyledTextCtrlTowxWindow}, {0,0,0}}; diff --git a/wxPython/contrib/xrc/xrc.cpp b/wxPython/contrib/xrc/xrc.cpp index 7b981740ca..08f29cf8d3 100644 --- a/wxPython/contrib/xrc/xrc.cpp +++ b/wxPython/contrib/xrc/xrc.cpp @@ -1183,12 +1183,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}, diff --git a/wxPython/src/.cvsignore b/wxPython/src/.cvsignore index 71b0afd835..7e68c2a590 100644 --- a/wxPython/src/.cvsignore +++ b/wxPython/src/.cvsignore @@ -43,3 +43,4 @@ wxpc.exp wxpc.lib wxpc.res wxpc.res.save +*.dsp \ No newline at end of file diff --git a/wxPython/src/__version__.py b/wxPython/src/__version__.py index 91734e84b8..b6ddc1a64d 100644 --- a/wxPython/src/__version__.py +++ b/wxPython/src/__version__.py @@ -1 +1 @@ -ver = '2.3.2b4' +ver = '2.3.2b5' diff --git a/wxPython/src/_defs.i b/wxPython/src/_defs.i index e148c21622..4d7168fab4 100644 --- a/wxPython/src/_defs.i +++ b/wxPython/src/_defs.i @@ -552,83 +552,113 @@ typedef enum { // wxSRC_AND // source _bitmap_ AND destination } form_ops_t; -enum _Virtual_keycodes { - WXK_BACK = 8, - WXK_TAB = 9, - WXK_RETURN = 13, - WXK_ESCAPE = 27, - WXK_SPACE = 32, - WXK_DELETE = 127, - - WXK_START = 300, - WXK_LBUTTON, - WXK_RBUTTON, - WXK_CANCEL, - WXK_MBUTTON, - WXK_CLEAR, - WXK_SHIFT, - WXK_CONTROL, - WXK_MENU, - WXK_PAUSE, - WXK_CAPITAL, - WXK_PRIOR, // Page up - WXK_NEXT, // Page down - WXK_END, - WXK_HOME, - WXK_LEFT, - WXK_UP, - WXK_RIGHT, - WXK_DOWN, - WXK_SELECT, - WXK_PRINT, - WXK_EXECUTE, - WXK_SNAPSHOT, - WXK_INSERT, - WXK_HELP, - WXK_NUMPAD0, - WXK_NUMPAD1, - WXK_NUMPAD2, - WXK_NUMPAD3, - WXK_NUMPAD4, - WXK_NUMPAD5, - WXK_NUMPAD6, - WXK_NUMPAD7, - WXK_NUMPAD8, - WXK_NUMPAD9, - WXK_MULTIPLY, - WXK_ADD, - WXK_SEPARATOR, - WXK_SUBTRACT, - WXK_DECIMAL, - WXK_DIVIDE, - WXK_F1, - WXK_F2, - WXK_F3, - WXK_F4, - WXK_F5, - WXK_F6, - WXK_F7, - WXK_F8, - WXK_F9, - WXK_F10, - WXK_F11, - WXK_F12, - WXK_F13, - WXK_F14, - WXK_F15, - WXK_F16, - WXK_F17, - WXK_F18, - WXK_F19, - WXK_F20, - WXK_F21, - WXK_F22, - WXK_F23, - WXK_F24, - WXK_NUMLOCK, - WXK_SCROLL, - WXK_PAGEUP, - WXK_PAGEDOWN +enum wxKeyCode { + WXK_BACK = 8, + WXK_TAB = 9, + WXK_RETURN = 13, + WXK_ESCAPE = 27, + WXK_SPACE = 32, + WXK_DELETE = 127, + + WXK_START = 300, + WXK_LBUTTON, + WXK_RBUTTON, + WXK_CANCEL, + WXK_MBUTTON, + WXK_CLEAR, + WXK_SHIFT, + WXK_ALT, + WXK_CONTROL, + WXK_MENU, + WXK_PAUSE, + WXK_CAPITAL, + WXK_PRIOR, /* Page up */ + WXK_NEXT, /* Page down */ + WXK_END, + WXK_HOME, + WXK_LEFT, + WXK_UP, + WXK_RIGHT, + WXK_DOWN, + WXK_SELECT, + WXK_PRINT, + WXK_EXECUTE, + WXK_SNAPSHOT, + WXK_INSERT, + WXK_HELP, + WXK_NUMPAD0, + WXK_NUMPAD1, + WXK_NUMPAD2, + WXK_NUMPAD3, + WXK_NUMPAD4, + WXK_NUMPAD5, + WXK_NUMPAD6, + WXK_NUMPAD7, + WXK_NUMPAD8, + WXK_NUMPAD9, + WXK_MULTIPLY, + WXK_ADD, + WXK_SEPARATOR, + WXK_SUBTRACT, + WXK_DECIMAL, + WXK_DIVIDE, + WXK_F1, + WXK_F2, + WXK_F3, + WXK_F4, + WXK_F5, + WXK_F6, + WXK_F7, + WXK_F8, + WXK_F9, + WXK_F10, + WXK_F11, + WXK_F12, + WXK_F13, + WXK_F14, + WXK_F15, + WXK_F16, + WXK_F17, + WXK_F18, + WXK_F19, + WXK_F20, + WXK_F21, + WXK_F22, + WXK_F23, + WXK_F24, + WXK_NUMLOCK, + WXK_SCROLL, + WXK_PAGEUP, + WXK_PAGEDOWN, + + WXK_NUMPAD_SPACE, + WXK_NUMPAD_TAB, + WXK_NUMPAD_ENTER, + WXK_NUMPAD_F1, + WXK_NUMPAD_F2, + WXK_NUMPAD_F3, + WXK_NUMPAD_F4, + WXK_NUMPAD_HOME, + WXK_NUMPAD_LEFT, + WXK_NUMPAD_UP, + WXK_NUMPAD_RIGHT, + WXK_NUMPAD_DOWN, + WXK_NUMPAD_PRIOR, + WXK_NUMPAD_PAGEUP, + WXK_NUMPAD_NEXT, + WXK_NUMPAD_PAGEDOWN, + WXK_NUMPAD_END, + WXK_NUMPAD_BEGIN, + WXK_NUMPAD_INSERT, + WXK_NUMPAD_DELETE, + WXK_NUMPAD_EQUAL, + WXK_NUMPAD_MULTIPLY, + WXK_NUMPAD_ADD, + WXK_NUMPAD_SEPARATOR, + WXK_NUMPAD_SUBTRACT, + WXK_NUMPAD_DECIMAL, + WXK_NUMPAD_DIVIDE + }; diff --git a/wxPython/src/msw/cmndlgs.cpp b/wxPython/src/msw/cmndlgs.cpp index c29aea81b3..b37cf401bc 100644 --- a/wxPython/src/msw/cmndlgs.cpp +++ b/wxPython/src/msw/cmndlgs.cpp @@ -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; @@ -3028,13 +3036,14 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_size_t","_int",0}, { "_size_t","_wxWindowID",0}, { "_size_t","_uint",0}, - { "_wxPanel","_wxMessageDialog",SwigwxMessageDialogTowxPanel}, - { "_wxPanel","_wxFontDialog",SwigwxFontDialogTowxPanel}, - { "_wxPanel","_wxTextEntryDialog",SwigwxTextEntryDialogTowxPanel}, - { "_wxPanel","_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxPanel}, - { "_wxPanel","_wxFileDialog",SwigwxFileDialogTowxPanel}, - { "_wxPanel","_wxDirDialog",SwigwxDirDialogTowxPanel}, - { "_wxPanel","_wxColourDialog",SwigwxColourDialogTowxPanel}, + { "_wxTopLevelWindow","_wxProgressDialog",SwigwxProgressDialogTowxTopLevelWindow}, + { "_wxTopLevelWindow","_wxMessageDialog",SwigwxMessageDialogTowxTopLevelWindow}, + { "_wxTopLevelWindow","_wxFontDialog",SwigwxFontDialogTowxTopLevelWindow}, + { "_wxTopLevelWindow","_wxTextEntryDialog",SwigwxTextEntryDialogTowxTopLevelWindow}, + { "_wxTopLevelWindow","_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxTopLevelWindow}, + { "_wxTopLevelWindow","_wxFileDialog",SwigwxFileDialogTowxTopLevelWindow}, + { "_wxTopLevelWindow","_wxDirDialog",SwigwxDirDialogTowxTopLevelWindow}, + { "_wxTopLevelWindow","_wxColourDialog",SwigwxColourDialogTowxTopLevelWindow}, { "_uint","_wxCoord",0}, { "_uint","_wxPrintQuality",0}, { "_uint","_time_t",0}, diff --git a/wxPython/src/msw/htmlhelp.cpp b/wxPython/src/msw/htmlhelp.cpp index 50e2892d5e..5e00be3dea 100644 --- a/wxPython/src/msw/htmlhelp.cpp +++ b/wxPython/src/msw/htmlhelp.cpp @@ -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; @@ -2520,6 +2528,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_size_t","_int",0}, { "_size_t","_wxWindowID",0}, { "_size_t","_uint",0}, + { "_wxTopLevelWindow","_wxHtmlHelpFrame",SwigwxHtmlHelpFrameTowxTopLevelWindow}, { "_uint","_wxCoord",0}, { "_uint","_wxPrintQuality",0}, { "_uint","_time_t",0}, diff --git a/wxPython/src/msw/mdi.cpp b/wxPython/src/msw/mdi.cpp index b130ccbeb9..7a481eddbd 100644 --- a/wxPython/src/msw/mdi.cpp +++ b/wxPython/src/msw/mdi.cpp @@ -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; @@ -646,6 +654,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; @@ -1122,6 +1138,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","_wxMDIChildFrame",SwigwxMDIChildFrameTowxTopLevelWindow}, + { "_wxTopLevelWindow","_wxMDIParentFrame",SwigwxMDIParentFrameTowxTopLevelWindow}, { "_uint","_wxCoord",0}, { "_uint","_wxPrintQuality",0}, { "_uint","_time_t",0}, diff --git a/wxPython/src/msw/printfw.cpp b/wxPython/src/msw/printfw.cpp index 97fe82d6f5..0e4204d5ee 100644 --- a/wxPython/src/msw/printfw.cpp +++ b/wxPython/src/msw/printfw.cpp @@ -2641,11 +2641,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; } @@ -3511,11 +3511,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; } @@ -5145,6 +5145,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; @@ -5464,8 +5472,9 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_size_t","_int",0}, { "_size_t","_wxWindowID",0}, { "_size_t","_uint",0}, - { "_wxPanel","_wxPrintDialog",SwigwxPrintDialogTowxPanel}, - { "_wxPanel","_wxPageSetupDialog",SwigwxPageSetupDialogTowxPanel}, + { "_wxTopLevelWindow","_wxPreviewFrame",SwigwxPreviewFrameTowxTopLevelWindow}, + { "_wxTopLevelWindow","_wxPrintDialog",SwigwxPrintDialogTowxTopLevelWindow}, + { "_wxTopLevelWindow","_wxPageSetupDialog",SwigwxPageSetupDialogTowxTopLevelWindow}, { "_uint","_wxCoord",0}, { "_uint","_wxPrintQuality",0}, { "_uint","_time_t",0}, diff --git a/wxPython/src/msw/wx.cpp b/wxPython/src/msw/wx.cpp index 257180ea85..004f34a585 100644 --- a/wxPython/src/msw/wx.cpp +++ b/wxPython/src/msw/wx.cpp @@ -2242,6 +2242,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)); @@ -2304,6 +2305,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)); diff --git a/wxPython/src/msw/wx.py b/wxPython/src/msw/wx.py index d112c77830..ffc7d1d086 100644 --- a/wxPython/src/msw/wx.py +++ b/wxPython/src/msw/wx.py @@ -507,6 +507,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 @@ -569,6 +570,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