wxPython stuff:
1. Added Clipboard and Drag-and-Drop classes 2. Added wxFontEnumerator 3. Many changes to wxMenu, wxMenubar 4. Various other changes and additions 5. Updates to the demo 6. Documentation updates git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4387 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -118,87 +118,6 @@ wxPoint wxPyDefaultPosition(wxDefaultPosition);
|
||||
wxSize wxPyDefaultSize(wxDefaultSize);
|
||||
#endif
|
||||
|
||||
|
||||
#if 0
|
||||
static PyObject* mod_dict = NULL; // will be set by init
|
||||
|
||||
#include <wx/html/mod_templ.h>
|
||||
|
||||
TAG_HANDLER_BEGIN(PYTHONTAG, "PYTHON")
|
||||
TAG_HANDLER_PROC(tag)
|
||||
{
|
||||
wxWindow *wnd;
|
||||
wxString errmsg;
|
||||
char pbuf[256];
|
||||
|
||||
int fl = 0;
|
||||
|
||||
bool doSave = wxPyRestoreThread();
|
||||
while (1) {
|
||||
if (tag.HasParam("FLOAT"))
|
||||
tag.ScanParam("FLOAT", "%i", &fl);
|
||||
PyObject* pyfunc = PyDict_GetItemString(mod_dict, "WidgetStarter");
|
||||
if (pyfunc == NULL) {
|
||||
errmsg = "Could not find object WidgetStarter";
|
||||
break;
|
||||
}
|
||||
if (! PyCallable_Check(pyfunc)) {
|
||||
errmsg = "WidgetStarter does not appear to be callable";
|
||||
break;
|
||||
}
|
||||
SWIG_MakePtr(pbuf, m_WParser->GetWindow(), "_wxPyHtmlWindow_p");
|
||||
PyObject* arglist = Py_BuildValue("(s,s)", pbuf,
|
||||
(const char*)tag.GetAllParams());
|
||||
if (! arglist) {
|
||||
errmsg = "Failed making argument list";
|
||||
break;
|
||||
}
|
||||
PyObject* ret = PyEval_CallObject(pyfunc, arglist);
|
||||
Py_DECREF(arglist);
|
||||
if (ret == NULL) {
|
||||
errmsg = "An error occured while calling WidgetStarter";
|
||||
if (PyErr_Occurred())
|
||||
PyErr_Print();
|
||||
break;
|
||||
}
|
||||
wnd = NULL;
|
||||
if (PyString_Check(ret)) {
|
||||
char* thisc = PyString_AsString(ret);
|
||||
SWIG_GetPtr(thisc, (void**)&wnd, "_wxWindow_p");
|
||||
}
|
||||
Py_DECREF(ret);
|
||||
if (! wnd) {
|
||||
errmsg = "Could not make a wxWindow pointer from return ptr";
|
||||
break;
|
||||
}
|
||||
wxPySaveThread(doSave);
|
||||
wnd -> Show(TRUE);
|
||||
m_WParser->OpenContainer()->InsertCell(new wxHtmlWidgetCell(wnd, fl));
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
wxPySaveThread(doSave);
|
||||
|
||||
/* we got out of the loop. Must be an error. Show a box stating it. */
|
||||
wnd = new wxTextCtrl( m_WParser -> GetWindow(), -1,
|
||||
errmsg, wxPoint(0,0),
|
||||
wxSize(300, 100), wxTE_MULTILINE );
|
||||
wnd -> Show(TRUE);
|
||||
m_WParser->OpenContainer()->InsertCell(new wxHtmlWidgetCell(wnd, 100));
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
TAG_HANDLER_END(PYTHONTAG)
|
||||
|
||||
TAGS_MODULE_BEGIN(PythonTag)
|
||||
|
||||
TAGS_MODULE_ADD(PYTHONTAG)
|
||||
|
||||
TAGS_MODULE_END(PythonTag)
|
||||
|
||||
// Note: see also the init function where we add the module!
|
||||
#endif
|
||||
|
||||
class wxPyHtmlTagHandler : public wxHtmlTagHandler {
|
||||
public:
|
||||
wxPyHtmlTagHandler() : wxHtmlTagHandler() {};
|
||||
@@ -5499,9 +5418,12 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_signed_long","_long",0},
|
||||
{ "_wxMenuEvent","_class_wxMenuEvent",0},
|
||||
{ "_class_wxJPEGHandler","_wxJPEGHandler",0},
|
||||
{ "_wxPyBitmapDataObject","_class_wxPyBitmapDataObject",0},
|
||||
{ "_wxBitmapDataObject","_class_wxBitmapDataObject",0},
|
||||
{ "_class_wxPyCommandEvent","_wxPyCommandEvent",0},
|
||||
{ "_wxBMPHandler","_class_wxBMPHandler",0},
|
||||
{ "_wxImage","_class_wxImage",0},
|
||||
{ "_wxPrintQuality","_wxCoord",0},
|
||||
{ "_wxPrintQuality","_int",0},
|
||||
{ "_wxPrintQuality","_signed_int",0},
|
||||
{ "_wxPrintQuality","_unsigned_int",0},
|
||||
@@ -5509,10 +5431,11 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_wxPrintQuality","_uint",0},
|
||||
{ "_wxPrintQuality","_EBool",0},
|
||||
{ "_wxPrintQuality","_size_t",0},
|
||||
{ "_class_wxCustomDataObject","_wxCustomDataObject",0},
|
||||
{ "_wxFontData","_class_wxFontData",0},
|
||||
{ "___wxPyCleanup","_class___wxPyCleanup",0},
|
||||
{ "_class_HtmlHistoryItem","_HtmlHistoryItem",0},
|
||||
{ "_class_wxRegionIterator","_wxRegionIterator",0},
|
||||
{ "_class_wxPyTextDropTarget","_wxPyTextDropTarget",0},
|
||||
{ "_class_wxMenuBar","_wxMenuBar",0},
|
||||
{ "_class_wxPyTreeItemData","_wxPyTreeItemData",0},
|
||||
{ "_class_wxStaticBoxSizer","_wxStaticBoxSizer",0},
|
||||
@@ -5540,7 +5463,9 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_wxPen","_class_wxPen",0},
|
||||
{ "_wxUpdateUIEvent","_class_wxUpdateUIEvent",0},
|
||||
{ "_byte","_unsigned_char",0},
|
||||
{ "_wxDataObject","_class_wxDataObject",0},
|
||||
{ "_wxStaticBox","_class_wxStaticBox",0},
|
||||
{ "_wxPyDataObjectSimple","_class_wxPyDataObjectSimple",0},
|
||||
{ "_wxChoice","_class_wxChoice",0},
|
||||
{ "_wxSlider","_class_wxSlider",0},
|
||||
{ "_wxNotebookEvent","_class_wxNotebookEvent",0},
|
||||
@@ -5551,16 +5476,19 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_long","_unsigned_long",0},
|
||||
{ "_long","_signed_long",0},
|
||||
{ "_wxImageList","_class_wxImageList",0},
|
||||
{ "_wxDataObjectSimple","_class_wxDataObjectSimple",0},
|
||||
{ "_wxDropFilesEvent","_class_wxDropFilesEvent",0},
|
||||
{ "_wxBitmapButton","_class_wxBitmapButton",0},
|
||||
{ "_wxSashWindow","_class_wxSashWindow",0},
|
||||
{ "_class_wxSizer","_wxSizer",0},
|
||||
{ "_class_wxPrintDialogData","_wxPrintDialogData",0},
|
||||
{ "_class_wxAcceleratorTable","_wxAcceleratorTable",0},
|
||||
{ "_class_wxClipboard","_wxClipboard",0},
|
||||
{ "_class_wxGauge","_wxGauge",0},
|
||||
{ "_class_wxSashEvent","_wxSashEvent",0},
|
||||
{ "_wxDC","_class_wxDC",0},
|
||||
{ "_wxSizerItem","_class_wxSizerItem",0},
|
||||
{ "_class_wxBitmapDataObject","_wxBitmapDataObject",0},
|
||||
{ "_wxListEvent","_class_wxListEvent",0},
|
||||
{ "_class_wxSingleChoiceDialog","_wxSingleChoiceDialog",0},
|
||||
{ "_wxProgressDialog","_class_wxProgressDialog",0},
|
||||
@@ -5568,6 +5496,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_wxPrintPreview","_class_wxPrintPreview",0},
|
||||
{ "_wxSpinEvent","_class_wxSpinEvent",0},
|
||||
{ "_wxSashLayoutWindow","_class_wxSashLayoutWindow",0},
|
||||
{ "_size_t","_wxCoord",0},
|
||||
{ "_size_t","_wxPrintQuality",0},
|
||||
{ "_size_t","_unsigned_int",0},
|
||||
{ "_size_t","_int",0},
|
||||
@@ -5592,6 +5521,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_wxPyEvent","_class_wxPyEvent",0},
|
||||
{ "_wxTextCtrl","_class_wxTextCtrl",0},
|
||||
{ "_class_wxMask","_wxMask",0},
|
||||
{ "_wxTextDataObject","_class_wxTextDataObject",0},
|
||||
{ "_class_wxToolTip","_wxToolTip",0},
|
||||
{ "_class_wxKeyEvent","_wxKeyEvent",0},
|
||||
{ "_class_wxGrid","_wxGrid",0},
|
||||
@@ -5601,9 +5531,11 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_wxBusyCursor","_class_wxBusyCursor",0},
|
||||
{ "_wxPageSetupDialog","_class_wxPageSetupDialog",0},
|
||||
{ "_class_wxPrinter","_wxPrinter",0},
|
||||
{ "_class_wxFileDataObject","_wxFileDataObject",0},
|
||||
{ "_wxIdleEvent","_class_wxIdleEvent",0},
|
||||
{ "_class_wxUpdateUIEvent","_wxUpdateUIEvent",0},
|
||||
{ "_wxToolBar","_class_wxToolBar",0},
|
||||
{ "_class_wxDataObject","_wxDataObject",0},
|
||||
{ "_wxCaret","_class_wxCaret",0},
|
||||
{ "_wxStaticLine","_class_wxStaticLine",0},
|
||||
{ "_class_wxLayoutAlgorithm","_wxLayoutAlgorithm",0},
|
||||
@@ -5614,8 +5546,11 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_class_wxPyPrintout","_class_wxHtmlPrintout",SwigwxHtmlPrintoutTowxPyPrintout},
|
||||
{ "_class_wxPyPrintout","_wxHtmlPrintout",SwigwxHtmlPrintoutTowxPyPrintout},
|
||||
{ "_class_wxPyPrintout","_wxPyPrintout",0},
|
||||
{ "_wxDataFormat","_class_wxDataFormat",0},
|
||||
{ "_class_wxDataObjectSimple","_wxDataObjectSimple",0},
|
||||
{ "_class_wxSashWindow","_wxSashWindow",0},
|
||||
{ "_wxShowEvent","_class_wxShowEvent",0},
|
||||
{ "_uint","_wxCoord",0},
|
||||
{ "_uint","_wxPrintQuality",0},
|
||||
{ "_uint","_size_t",0},
|
||||
{ "_uint","_unsigned_int",0},
|
||||
@@ -5637,7 +5572,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_class_wxFontData","_wxFontData",0},
|
||||
{ "_class_wxPNMHandler","_wxPNMHandler",0},
|
||||
{ "_wxBoxSizer","_class_wxBoxSizer",0},
|
||||
{ "_class___wxPyCleanup","___wxPyCleanup",0},
|
||||
{ "_wxHtmlCell","_class_wxHtmlWidgetCell",SwigwxHtmlWidgetCellTowxHtmlCell},
|
||||
{ "_wxHtmlCell","_wxHtmlWidgetCell",SwigwxHtmlWidgetCellTowxHtmlCell},
|
||||
{ "_wxHtmlCell","_class_wxHtmlContainerCell",SwigwxHtmlContainerCellTowxHtmlCell},
|
||||
@@ -5666,23 +5600,27 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_wxMDIChildFrame","_class_wxMDIChildFrame",0},
|
||||
{ "_wxListItem","_class_wxListItem",0},
|
||||
{ "_class_wxToolBar","_wxToolBar",0},
|
||||
{ "_wxDropTarget","_class_wxDropTarget",0},
|
||||
{ "_class_wxStaticLine","_wxStaticLine",0},
|
||||
{ "_wxScrollEvent","_class_wxScrollEvent",0},
|
||||
{ "_wxCalculateLayoutEvent","_class_wxCalculateLayoutEvent",0},
|
||||
{ "_wxPyHtmlTagHandler","_class_wxPyHtmlWinTagHandler",SwigwxPyHtmlWinTagHandlerTowxPyHtmlTagHandler},
|
||||
{ "_wxPyHtmlTagHandler","_wxPyHtmlWinTagHandler",SwigwxPyHtmlWinTagHandlerTowxPyHtmlTagHandler},
|
||||
{ "_wxPyHtmlTagHandler","_class_wxPyHtmlTagHandler",0},
|
||||
{ "_EBool","_wxCoord",0},
|
||||
{ "_EBool","_wxPrintQuality",0},
|
||||
{ "_EBool","_signed_int",0},
|
||||
{ "_EBool","_int",0},
|
||||
{ "_EBool","_wxWindowID",0},
|
||||
{ "_class_wxRegion","_wxRegion",0},
|
||||
{ "_class_wxDataFormat","_wxDataFormat",0},
|
||||
{ "_class_wxDropFilesEvent","_wxDropFilesEvent",0},
|
||||
{ "_wxWindowDestroyEvent","_class_wxWindowDestroyEvent",0},
|
||||
{ "_class_wxPreviewFrame","_wxPreviewFrame",0},
|
||||
{ "_wxHtmlContainerCell","_class_wxHtmlContainerCell",0},
|
||||
{ "_wxStaticText","_class_wxStaticText",0},
|
||||
{ "_wxFont","_class_wxFont",0},
|
||||
{ "_class_wxPyDropTarget","_wxPyDropTarget",0},
|
||||
{ "_wxCloseEvent","_class_wxCloseEvent",0},
|
||||
{ "_class_wxSplitterEvent","_wxSplitterEvent",0},
|
||||
{ "_wxNotebook","_class_wxNotebook",0},
|
||||
@@ -5712,12 +5650,14 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_wxRadioButton","_class_wxRadioButton",0},
|
||||
{ "_class_wxMessageDialog","_wxMessageDialog",0},
|
||||
{ "_wxHtmlTag","_class_wxHtmlTag",0},
|
||||
{ "_signed_int","_wxCoord",0},
|
||||
{ "_signed_int","_wxPrintQuality",0},
|
||||
{ "_signed_int","_EBool",0},
|
||||
{ "_signed_int","_wxWindowID",0},
|
||||
{ "_signed_int","_int",0},
|
||||
{ "_class_wxTextCtrl","_wxTextCtrl",0},
|
||||
{ "_wxLayoutConstraints","_class_wxLayoutConstraints",0},
|
||||
{ "_class_wxTextDataObject","_wxTextDataObject",0},
|
||||
{ "_wxMenu","_class_wxMenu",0},
|
||||
{ "_class_wxMoveEvent","_wxMoveEvent",0},
|
||||
{ "_wxListBox","_class_wxListBox",0},
|
||||
@@ -5728,6 +5668,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_WXTYPE","_signed_short",0},
|
||||
{ "_WXTYPE","_unsigned_short",0},
|
||||
{ "_wxFileDialog","_class_wxFileDialog",0},
|
||||
{ "_class_wxDropTarget","_wxDropTarget",0},
|
||||
{ "_class_wxCaret","_wxCaret",0},
|
||||
{ "_class_wxMDIClientWindow","_wxMDIClientWindow",0},
|
||||
{ "_class_wxBrush","_wxBrush",0},
|
||||
@@ -5743,12 +5684,14 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_class_wxStaticText","_wxStaticText",0},
|
||||
{ "_wxPrintDialogData","_class_wxPrintDialogData",0},
|
||||
{ "_class_wxFont","_wxFont",0},
|
||||
{ "_wxClipboard","_class_wxClipboard",0},
|
||||
{ "_class_wxPyValidator","_wxPyValidator",0},
|
||||
{ "_class_wxCloseEvent","_wxCloseEvent",0},
|
||||
{ "_wxSashEvent","_class_wxSashEvent",0},
|
||||
{ "_wxBusyInfo","_class_wxBusyInfo",0},
|
||||
{ "_class_wxMenuEvent","_wxMenuEvent",0},
|
||||
{ "_wxPaletteChangedEvent","_class_wxPaletteChangedEvent",0},
|
||||
{ "_class_wxPyBitmapDataObject","_wxPyBitmapDataObject",0},
|
||||
{ "_wxClientDC","_class_wxClientDC",0},
|
||||
{ "_wxMouseEvent","_class_wxMouseEvent",0},
|
||||
{ "_wxListCtrl","_class_wxListCtrl",0},
|
||||
@@ -5767,6 +5710,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_signed_short","_WXTYPE",0},
|
||||
{ "_signed_short","_short",0},
|
||||
{ "_wxMemoryDC","_class_wxMemoryDC",0},
|
||||
{ "_wxPyTextDataObject","_class_wxPyTextDataObject",0},
|
||||
{ "_class_wxPrintDialog","_wxPrintDialog",0},
|
||||
{ "_wxPaintDC","_class_wxPaintDC",0},
|
||||
{ "_class_wxWindowDC","_wxWindowDC",0},
|
||||
@@ -5777,6 +5721,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_class_wxAcceleratorEntry","_wxAcceleratorEntry",0},
|
||||
{ "_class_wxCursor","_wxCursor",0},
|
||||
{ "_wxPostScriptDC","_class_wxPostScriptDC",0},
|
||||
{ "_wxPyFileDropTarget","_class_wxPyFileDropTarget",0},
|
||||
{ "_class_wxImageHandler","_wxImageHandler",0},
|
||||
{ "_class_wxHtmlTag","_wxHtmlTag",0},
|
||||
{ "_wxScrolledWindow","_class_wxPyHtmlWindow",SwigwxPyHtmlWindowTowxScrolledWindow},
|
||||
@@ -5784,9 +5729,11 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_wxScrolledWindow","_class_wxScrolledWindow",0},
|
||||
{ "_wxTreeItemId","_class_wxTreeItemId",0},
|
||||
{ "_unsigned_char","_byte",0},
|
||||
{ "_wxDropSource","_class_wxDropSource",0},
|
||||
{ "_class_wxMenu","_wxMenu",0},
|
||||
{ "_wxControl","_class_wxControl",0},
|
||||
{ "_class_wxListBox","_wxListBox",0},
|
||||
{ "_unsigned_int","_wxCoord",0},
|
||||
{ "_unsigned_int","_wxPrintQuality",0},
|
||||
{ "_unsigned_int","_size_t",0},
|
||||
{ "_unsigned_int","_uint",0},
|
||||
@@ -5804,6 +5751,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_class_wxStaticBox","_wxStaticBox",0},
|
||||
{ "_wxLayoutAlgorithm","_class_wxLayoutAlgorithm",0},
|
||||
{ "_wxHtmlPrintout","_class_wxHtmlPrintout",0},
|
||||
{ "_class_wxPyDataObjectSimple","_wxPyDataObjectSimple",0},
|
||||
{ "_class_wxScrollEvent","_wxScrollEvent",0},
|
||||
{ "_wxJoystickEvent","_class_wxJoystickEvent",0},
|
||||
{ "_class_wxChoice","_wxChoice",0},
|
||||
@@ -5817,6 +5765,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_class_wxPaletteChangedEvent","_wxPaletteChangedEvent",0},
|
||||
{ "_class_wxNotebook","_wxNotebook",0},
|
||||
{ "_wxJPEGHandler","_class_wxJPEGHandler",0},
|
||||
{ "_wxWindowID","_wxCoord",0},
|
||||
{ "_wxWindowID","_wxPrintQuality",0},
|
||||
{ "_wxWindowID","_size_t",0},
|
||||
{ "_wxWindowID","_EBool",0},
|
||||
@@ -5826,6 +5775,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_wxWindowID","_unsigned_int",0},
|
||||
{ "_class_wxScrollWinEvent","_wxScrollWinEvent",0},
|
||||
{ "_class_wxSizerItem","_wxSizerItem",0},
|
||||
{ "_int","_wxCoord",0},
|
||||
{ "_int","_wxPrintQuality",0},
|
||||
{ "_int","_size_t",0},
|
||||
{ "_int","_EBool",0},
|
||||
@@ -5845,12 +5795,14 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_class_wxPyApp","_wxPyApp",0},
|
||||
{ "_wxSize","_class_wxSize",0},
|
||||
{ "_wxRegionIterator","_class_wxRegionIterator",0},
|
||||
{ "_class_wxPyTextDataObject","_wxPyTextDataObject",0},
|
||||
{ "_class_wxMDIParentFrame","_wxMDIParentFrame",0},
|
||||
{ "_wxPyTreeItemData","_class_wxPyTreeItemData",0},
|
||||
{ "_wxStaticBoxSizer","_class_wxStaticBoxSizer",0},
|
||||
{ "_wxHtmlDCRenderer","_class_wxHtmlDCRenderer",0},
|
||||
{ "_class_wxPaintDC","_wxPaintDC",0},
|
||||
{ "_class_wxSysColourChangedEvent","_wxSysColourChangedEvent",0},
|
||||
{ "_class_wxPyFileDropTarget","_wxPyFileDropTarget",0},
|
||||
{ "_class_wxInitDialogEvent","_wxInitDialogEvent",0},
|
||||
{ "_class_wxComboBox","_wxComboBox",0},
|
||||
{ "_class_wxRadioButton","_wxRadioButton",0},
|
||||
@@ -5858,6 +5810,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_class_wxTreeItemId","_wxTreeItemId",0},
|
||||
{ "_wxTreeCtrl","_class_wxTreeCtrl",0},
|
||||
{ "_class_wxLayoutConstraints","_wxLayoutConstraints",0},
|
||||
{ "_class_wxDropSource","_wxDropSource",0},
|
||||
{ "_wxIconizeEvent","_class_wxIconizeEvent",0},
|
||||
{ "_class_wxControl","_wxControl",0},
|
||||
{ "_wxStaticBitmap","_class_wxStaticBitmap",0},
|
||||
@@ -5867,7 +5820,16 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_class_wxPageSetupDialog","_wxPageSetupDialog",0},
|
||||
{ "_wxPalette","_class_wxPalette",0},
|
||||
{ "_class_wxIdleEvent","_wxIdleEvent",0},
|
||||
{ "_wxCoord","_int",0},
|
||||
{ "_wxCoord","_signed_int",0},
|
||||
{ "_wxCoord","_unsigned_int",0},
|
||||
{ "_wxCoord","_wxWindowID",0},
|
||||
{ "_wxCoord","_uint",0},
|
||||
{ "_wxCoord","_EBool",0},
|
||||
{ "_wxCoord","_size_t",0},
|
||||
{ "_wxCoord","_wxPrintQuality",0},
|
||||
{ "_wxEraseEvent","_class_wxEraseEvent",0},
|
||||
{ "_wxDataObjectComposite","_class_wxDataObjectComposite",0},
|
||||
{ "_class_wxJoystickEvent","_wxJoystickEvent",0},
|
||||
{ "_class_wxMiniFrame","_wxMiniFrame",0},
|
||||
{ "_wxFontDialog","_class_wxFontDialog",0},
|
||||
@@ -5877,6 +5839,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_wxSizer","_class_wxSizer",0},
|
||||
{ "_class_wxShowEvent","_wxShowEvent",0},
|
||||
{ "_class_wxPCXHandler","_wxPCXHandler",0},
|
||||
{ "_wxPyDropTarget","_class_wxPyDropTarget",0},
|
||||
{ "_wxActivateEvent","_class_wxActivateEvent",0},
|
||||
{ "_wxGauge","_class_wxGauge",0},
|
||||
{ "_class_wxCheckListBox","_wxCheckListBox",0},
|
||||
@@ -5890,11 +5853,13 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_class_wxSizeEvent","_wxSizeEvent",0},
|
||||
{ "_class_wxListCtrl","_wxListCtrl",0},
|
||||
{ "_class_wxPyHtmlWinTagHandler","_wxPyHtmlWinTagHandler",0},
|
||||
{ "_wxCustomDataObject","_class_wxCustomDataObject",0},
|
||||
{ "_class_wxGridCell","_wxGridCell",0},
|
||||
{ "_HtmlHistoryItem","_class_HtmlHistoryItem",0},
|
||||
{ "_class_wxSize","_wxSize",0},
|
||||
{ "_class_wxBitmap","_wxBitmap",0},
|
||||
{ "_class_wxMemoryDC","_wxMemoryDC",0},
|
||||
{ "_wxPyTextDropTarget","_class_wxPyTextDropTarget",0},
|
||||
{ "_wxMenuBar","_class_wxMenuBar",0},
|
||||
{ "_wxTreeEvent","_class_wxTreeEvent",0},
|
||||
{ "_wxDirDialog","_class_wxDirDialog",0},
|
||||
@@ -5919,9 +5884,11 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_wxPageSetupDialogData","_class_wxPageSetupDialogData",0},
|
||||
{ "_wxPyHtmlWindow","_class_wxPyHtmlWindow",0},
|
||||
{ "_class_wxPalette","_wxPalette",0},
|
||||
{ "_wxFileDataObject","_class_wxFileDataObject",0},
|
||||
{ "_class_wxQueryLayoutInfoEvent","_wxQueryLayoutInfoEvent",0},
|
||||
{ "_class_wxEraseEvent","_wxEraseEvent",0},
|
||||
{ "_wxMDIClientWindow","_class_wxMDIClientWindow",0},
|
||||
{ "_class_wxDataObjectComposite","_wxDataObjectComposite",0},
|
||||
{ "_class_wxFontDialog","_wxFontDialog",0},
|
||||
{ "_wxWindow","_class_wxPyHtmlWindow",SwigwxPyHtmlWindowTowxWindow},
|
||||
{ "_wxWindow","_wxPyHtmlWindow",SwigwxPyHtmlWindowTowxWindow},
|
||||
@@ -5963,23 +5930,11 @@ SWIGEXPORT(void) inithtmlc() {
|
||||
PyDict_SetItemString(d,"wxPAGE_ALL", PyInt_FromLong((long) wxPAGE_ALL));
|
||||
|
||||
|
||||
#if 0
|
||||
/* This is a bit cheesy. SWIG happens to call the dictionary d...
|
||||
* I save it here, 'cause I don't know how to get it back later! */
|
||||
mod_dict = d;
|
||||
#endif
|
||||
|
||||
inithtmlhelpc();
|
||||
|
||||
wxClassInfo::CleanUpClasses();
|
||||
wxClassInfo::InitializeClasses();
|
||||
|
||||
#if 0
|
||||
/* specifically add our python tag handler; it doesn't seem to
|
||||
* happen by itself... */
|
||||
wxHtmlWinParser::AddModule(new HTML_ModulePythonTag());
|
||||
#endif
|
||||
|
||||
// Until wxFileSystem is wrapped...
|
||||
#if wxUSE_FS_ZIP
|
||||
wxFileSystem::AddHandler(new wxZipFSHandler);
|
||||
|
Reference in New Issue
Block a user