From f3d9dc1d8798f445a5f74db680808afdab2b11be Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Mon, 2 Apr 2001 03:49:52 +0000 Subject: [PATCH] Other odds and ends... git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9633 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/BUILD.win32.txt | 2 +- wxPython/contrib/stc/stc_.cpp | 88 ++-- wxPython/contrib/stc/stc_.py | 6 +- wxPython/demo/ActiveXWrapper_Acrobat.py | 5 +- wxPython/demo/GridSimple.py | 2 + wxPython/demo/Main.py | 15 + wxPython/demo/wxOGL.py | 63 ++- wxPython/demo/wxScrolledWindow.py | 2 - wxPython/src/_defs.i | 6 + wxPython/src/html.i | 2 +- wxPython/src/msw/gdi.cpp | 20 +- wxPython/src/msw/windows.cpp | 599 +++++++++++++++++++++++- wxPython/src/msw/windows.py | 66 +++ wxPython/src/msw/wx.cpp | 4 + wxPython/src/msw/wx.py | 4 + wxPython/src/windows.i | 42 +- 16 files changed, 848 insertions(+), 78 deletions(-) diff --git a/wxPython/BUILD.win32.txt b/wxPython/BUILD.win32.txt index ec32d89b58..a23b4270e0 100644 --- a/wxPython/BUILD.win32.txt +++ b/wxPython/BUILD.win32.txt @@ -155,7 +155,7 @@ B. There are three different types of wxWindows DLLs that can be C. Change to the wx2\src\msw directory and type the following command, using the value for FINAL that you want: - nmake -f makefile.vc dll pch USE_GLCANVAS=1 FINAL=hybrid + nmake -f makefile.vc dll pch FINAL=hybrid Your machine will then crunch away for possibly a long time, depending on your hardware, and when it's done you should have a diff --git a/wxPython/contrib/stc/stc_.cpp b/wxPython/contrib/stc/stc_.cpp index 1cc989c49c..42a1397080 100644 --- a/wxPython/contrib/stc/stc_.cpp +++ b/wxPython/contrib/stc/stc_.cpp @@ -60,12 +60,12 @@ extern PyObject *SWIG_newvarlink(void); static PyObject* l_output_helper(PyObject* target, PyObject* o) { PyObject* o2; - if (!target) { + if (!target) { target = o; - } else if (target == Py_None) { + } else if (target == Py_None) { Py_DECREF(Py_None); target = o; - } else { + } else { if (!PyList_Check(target)) { o2 = target; target = PyList_New(0); @@ -82,23 +82,23 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) { PyObject* o2; PyObject* o3; - if (!target) { + if (!target) { target = o; - } else if (target == Py_None) { + } else if (target == Py_None) { Py_DECREF(Py_None); target = o; - } else { + } else { if (!PyTuple_Check(target)) { o2 = target; target = PyTuple_New(1); PyTuple_SetItem(target, 0, o2); } - o3 = PyTuple_New(1); - PyTuple_SetItem(o3, 0, o); + o3 = PyTuple_New(1); + PyTuple_SetItem(o3, 0, o); o2 = target; - target = PySequence_Concat(o2, o3); - Py_DECREF(o2); + target = PySequence_Concat(o2, o3); + Py_DECREF(o2); Py_DECREF(o3); } return target; @@ -8533,9 +8533,9 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxPyBitmapDataObject","_class_wxPyBitmapDataObject",0}, { "_wxBitmapDataObject","_class_wxBitmapDataObject",0}, { "_class_wxPyCommandEvent","_wxPyCommandEvent",0}, + { "_wxFlexGridSizer","_class_wxFlexGridSizer",0}, { "_wxBMPHandler","_class_wxBMPHandler",0}, { "_wxImage","_class_wxImage",0}, - { "_wxFlexGridSizer","_class_wxFlexGridSizer",0}, { "_wxWindowDisabler","_class_wxWindowDisabler",0}, { "_class_wxDateTime","_wxDateTime",0}, { "_wxPrintQuality","_wxCoord",0}, @@ -8552,15 +8552,15 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxFontData","_class_wxFontData",0}, { "_class_wxRegionIterator","_wxRegionIterator",0}, { "_class_wxPyTextDropTarget","_wxPyTextDropTarget",0}, + { "_class_wxStaticBoxSizer","_wxStaticBoxSizer",0}, { "_class_wxMenuBar","_wxMenuBar",0}, { "_class_wxPyTreeItemData","_wxPyTreeItemData",0}, - { "_class_wxStaticBoxSizer","_wxStaticBoxSizer",0}, + { "_wxPaintEvent","_class_wxPaintEvent",0}, + { "_wxPySizer","_class_wxPySizer",0}, { "_class_wxEvtHandler","_class_wxStyledTextCtrl",SwigwxStyledTextCtrlTowxEvtHandler}, { "_class_wxEvtHandler","_wxStyledTextCtrl",SwigwxStyledTextCtrlTowxEvtHandler}, { "_class_wxEvtHandler","_wxEvtHandler",0}, - { "_wxPaintEvent","_class_wxPaintEvent",0}, { "_wxGIFHandler","_class_wxGIFHandler",0}, - { "_wxPySizer","_class_wxPySizer",0}, { "_wxInternetFSHandler","_class_wxInternetFSHandler",0}, { "_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0}, { "_wxCursor","_class_wxCursor",0}, @@ -8568,6 +8568,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxPyProcess","_class_wxPyProcess",0}, { "_wxPyTreeCtrl","_class_wxPyTreeCtrl",0}, { "_wxImageHandler","_class_wxImageHandler",0}, + { "_wxMutexGuiLocker","_class_wxMutexGuiLocker",0}, { "_wxLog","_class_wxLog",0}, { "_class_wxToolBarBase","_wxToolBarBase",0}, { "_wxMask","_class_wxMask",0}, @@ -8582,8 +8583,9 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxNotebookSizer","_wxNotebookSizer",0}, { "_byte","_unsigned_char",0}, { "_wxDataObject","_class_wxDataObject",0}, - { "_class_wxPyFontEnumerator","_wxPyFontEnumerator",0}, { "_wxStaticBox","_class_wxStaticBox",0}, + { "_class_wxPyFontEnumerator","_wxPyFontEnumerator",0}, + { "_wxColourDatabase","_class_wxColourDatabase",0}, { "_wxPyDataObjectSimple","_class_wxPyDataObjectSimple",0}, { "_wxPyDropSource","_class_wxPyDropSource",0}, { "_wxChoice","_class_wxChoice",0}, @@ -8596,11 +8598,11 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxDataObjectSimple","_class_wxDataObjectSimple",0}, { "_wxDropFilesEvent","_class_wxDropFilesEvent",0}, { "_wxBitmapButton","_class_wxBitmapButton",0}, - { "_wxSashWindow","_class_wxSashWindow",0}, { "_class_wxSizer","_wxSizer",0}, + { "_wxSashWindow","_class_wxSashWindow",0}, + { "_wxGridSizer","_class_wxGridSizer",0}, { "_class_wxTIFFHandler","_wxTIFFHandler",0}, { "_class_wxPrintDialogData","_wxPrintDialogData",0}, - { "_wxGridSizer","_class_wxGridSizer",0}, { "_class_wxAcceleratorTable","_wxAcceleratorTable",0}, { "_class_wxClipboard","_wxClipboard",0}, { "_class_wxGauge","_wxGauge",0}, @@ -8608,12 +8610,12 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxDC","_class_wxDC",0}, { "_wxSizerItem","_class_wxSizerItem",0}, { "_class_wxBitmapDataObject","_wxBitmapDataObject",0}, + { "_class_wxFlexGridSizer","_wxFlexGridSizer",0}, { "_wxListEvent","_class_wxListEvent",0}, { "_class_wxSingleChoiceDialog","_wxSingleChoiceDialog",0}, { "_wxProgressDialog","_class_wxProgressDialog",0}, { "_class_wxBMPHandler","_wxBMPHandler",0}, { "_wxPrintPreview","_class_wxPrintPreview",0}, - { "_class_wxFlexGridSizer","_wxFlexGridSizer",0}, { "_wxSpinEvent","_class_wxSpinEvent",0}, { "_wxSashLayoutWindow","_class_wxSashLayoutWindow",0}, { "_size_t","_wxCoord",0}, @@ -8629,15 +8631,15 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxWindowCreateEvent","_class_wxWindowCreateEvent",0}, { "_wxLogGui","_class_wxLogGui",0}, { "_wxPrinterDC","_class_wxPrinterDC",0}, - { "_class_wxMenuItem","_wxMenuItem",0}, { "_class_wxPaintEvent","_wxPaintEvent",0}, { "_wxSysColourChangedEvent","_class_wxSysColourChangedEvent",0}, + { "_class_wxPySizer","_wxPySizer",0}, + { "_class_wxMenuItem","_wxMenuItem",0}, { "_class_wxStatusBar","_wxStatusBar",0}, { "_class_wxGIFHandler","_wxGIFHandler",0}, - { "_class_wxPySizer","_wxPySizer",0}, - { "_wxPanel","_class_wxPanel",0}, { "_wxInitDialogEvent","_class_wxInitDialogEvent",0}, { "_wxCheckBox","_class_wxCheckBox",0}, + { "_wxPanel","_class_wxPanel",0}, { "_class_wxPyTreeCtrl","_wxPyTreeCtrl",0}, { "_wxPyEvent","_class_wxPyEvent",0}, { "_wxTextCtrl","_class_wxTextCtrl",0}, @@ -8657,8 +8659,8 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxUpdateUIEvent","_wxUpdateUIEvent",0}, { "_wxToolBar","_class_wxToolBar",0}, { "_class_wxDataObject","_wxDataObject",0}, - { "_wxCaret","_class_wxCaret",0}, { "_wxStaticLine","_class_wxStaticLine",0}, + { "_wxCaret","_class_wxCaret",0}, { "_class_wxLayoutAlgorithm","_wxLayoutAlgorithm",0}, { "_wxBrush","_class_wxBrush",0}, { "_wxMiniFrame","_class_wxMiniFrame",0}, @@ -8676,11 +8678,11 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_uint","_int",0}, { "_uint","_wxWindowID",0}, { "_wxChar","_char",0}, - { "_wxPyValidator","_class_wxPyValidator",0}, { "_class_wxEvent","_class_wxStyledTextEvent",SwigwxStyledTextEventTowxEvent}, { "_class_wxEvent","_wxStyledTextEvent",SwigwxStyledTextEventTowxEvent}, { "_class_wxEvent","_wxEvent",0}, { "_wxCheckListBox","_class_wxCheckListBox",0}, + { "_wxPyValidator","_class_wxPyValidator",0}, { "_wxSplitterEvent","_class_wxSplitterEvent",0}, { "_wxRect","_class_wxRect",0}, { "_wxCommandEvent","_class_wxStyledTextEvent",SwigwxStyledTextEventTowxCommandEvent}, @@ -8695,27 +8697,29 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxButton","_wxButton",0}, { "_wxRadioBox","_class_wxRadioBox",0}, { "_class_wxSpinCtrl","_wxSpinCtrl",0}, + { "_wxBoxSizer","_class_wxBoxSizer",0}, { "_class_wxFontData","_wxFontData",0}, { "_class_wxPNMHandler","_wxPNMHandler",0}, - { "_wxBoxSizer","_class_wxBoxSizer",0}, { "_class_wxZipFSHandler","_wxZipFSHandler",0}, { "_char","_wxChar",0}, { "_wxBitmap","_class_wxBitmap",0}, + { "_wxPenList","_class_wxPenList",0}, { "_wxTaskBarIcon","_class_wxTaskBarIcon",0}, { "_wxPrintDialog","_class_wxPrintDialog",0}, { "_wxWindowDC","_class_wxWindowDC",0}, { "_wxTimerEvent","_class_wxTimerEvent",0}, - { "_wxPyTimer","_class_wxPyTimer",0}, { "_wxScrollBar","_class_wxScrollBar",0}, { "_wxSpinButton","_class_wxSpinButton",0}, + { "_wxPyTimer","_class_wxPyTimer",0}, { "_wxColourDialog","_class_wxColourDialog",0}, { "_wxPrintData","_class_wxPrintData",0}, { "_class_wxInternetFSHandler","_wxInternetFSHandler",0}, { "_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0}, { "_class_wxNotifyEvent","_wxNotifyEvent",0}, { "_wxMessageDialog","_class_wxMessageDialog",0}, - { "_class_wxValidator","_wxValidator",0}, { "_class_wxPyEvent","_wxPyEvent",0}, + { "_class_wxValidator","_wxValidator",0}, + { "_class_wxMutexGuiLocker","_wxMutexGuiLocker",0}, { "_wxTextEntryDialog","_class_wxTextEntryDialog",0}, { "_wxConfig","_class_wxConfig",0}, { "_class_wxIconizeEvent","_wxIconizeEvent",0}, @@ -8728,6 +8732,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxToolBar","_wxToolBar",0}, { "_wxDropTarget","_class_wxDropTarget",0}, { "_class_wxStaticLine","_wxStaticLine",0}, + { "_class_wxColourDatabase","_wxColourDatabase",0}, { "_wxScrollEvent","_class_wxScrollEvent",0}, { "_wxToolBarToolBase","_class_wxToolBarToolBase",0}, { "_wxCalculateLayoutEvent","_class_wxCalculateLayoutEvent",0}, @@ -8756,9 +8761,11 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxScrollWinEvent","_class_wxScrollWinEvent",0}, { "_wxGenericDragImage","_class_wxGenericDragImage",0}, { "_class_wxProgressDialog","_wxProgressDialog",0}, + { "_class_wxBrushList","_wxBrushList",0}, { "_wxQueryNewPaletteEvent","_class_wxQueryNewPaletteEvent",0}, { "_wxPyInputStream","_class_wxPyInputStream",0}, { "_wxPyApp","_class_wxPyApp",0}, + { "_class_wxPenList","_wxPenList",0}, { "_class_wxWindowCreateEvent","_wxWindowCreateEvent",0}, { "_class_wxOutputStream","_wxOutputStream",0}, { "_wxLogTextCtrl","_class_wxLogTextCtrl",0}, @@ -8769,13 +8776,13 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxFocusEvent","_class_wxFocusEvent",0}, { "_wxMaximizeEvent","_class_wxMaximizeEvent",0}, { "_class_wxTimerEvent","_wxTimerEvent",0}, - { "_class_wxPyTimer","_wxPyTimer",0}, { "_class_wxSpinButton","_wxSpinButton",0}, + { "_class_wxPyTimer","_wxPyTimer",0}, { "_wxAcceleratorEntry","_class_wxAcceleratorEntry",0}, - { "_class_wxPanel","_wxPanel",0}, { "_class_wxCheckBox","_wxCheckBox",0}, { "_wxComboBox","_class_wxComboBox",0}, { "_wxRadioButton","_class_wxRadioButton",0}, + { "_class_wxPanel","_wxPanel",0}, { "_class_wxMessageDialog","_wxMessageDialog",0}, { "_signed_int","_wxCoord",0}, { "_signed_int","_wxPrintQuality",0}, @@ -8787,9 +8794,9 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxLayoutConstraints","_class_wxLayoutConstraints",0}, { "_wxMetaFileDC","_class_wxMetaFileDC",0}, { "_class_wxTextDataObject","_wxTextDataObject",0}, - { "_wxMenu","_class_wxMenu",0}, { "_class_wxMoveEvent","_wxMoveEvent",0}, { "_wxListBox","_class_wxListBox",0}, + { "_wxMenu","_class_wxMenu",0}, { "_wxScreenDC","_class_wxScreenDC",0}, { "_class_wxToolBarSimple","_wxToolBarSimple",0}, { "_class_wxMDIChildFrame","_wxMDIChildFrame",0}, @@ -8817,10 +8824,11 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxPrintDialogData","_class_wxPrintDialogData",0}, { "_class_wxFont","_wxFont",0}, { "_wxClipboard","_class_wxClipboard",0}, - { "_class_wxPyValidator","_wxPyValidator",0}, { "_class_wxCloseEvent","_wxCloseEvent",0}, + { "_class_wxPyValidator","_wxPyValidator",0}, { "_wxSashEvent","_class_wxSashEvent",0}, { "_wxBusyInfo","_class_wxBusyInfo",0}, + { "_wxFontList","_class_wxFontList",0}, { "_class_wxMenuEvent","_wxMenuEvent",0}, { "_wxPaletteChangedEvent","_class_wxPaletteChangedEvent",0}, { "_wxJoystick","_class_wxJoystick",0}, @@ -8857,11 +8865,11 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxTreeItemId","_class_wxTreeItemId",0}, { "_unsigned_char","_byte",0}, { "_class_wxMetaFileDC","_wxMetaFileDC",0}, - { "_class_wxMenu","_wxMenu",0}, { "_wxControl","_class_wxStyledTextCtrl",SwigwxStyledTextCtrlTowxControl}, { "_wxControl","_wxStyledTextCtrl",SwigwxStyledTextCtrlTowxControl}, { "_wxControl","_class_wxControl",0}, { "_class_wxListBox","_wxListBox",0}, + { "_class_wxMenu","_wxMenu",0}, { "_unsigned_int","_wxCoord",0}, { "_unsigned_int","_wxPrintQuality",0}, { "_unsigned_int","_time_t",0}, @@ -8892,10 +8900,10 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxImageList","_wxImageList",0}, { "_class_wxBitmapButton","_wxBitmapButton",0}, { "_wxFileSystemHandler","_class_wxFileSystemHandler",0}, + { "_class_wxGridSizer","_wxGridSizer",0}, { "_wxPyTipProvider","_class_wxPyTipProvider",0}, { "_wxFrame","_class_wxFrame",0}, { "_wxPCXHandler","_class_wxPCXHandler",0}, - { "_class_wxGridSizer","_wxGridSizer",0}, { "_class_wxPaletteChangedEvent","_wxPaletteChangedEvent",0}, { "_class_wxNotebook","_wxNotebook",0}, { "_wxJPEGHandler","_class_wxJPEGHandler",0}, @@ -8938,19 +8946,19 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_time_t","_uint",0}, { "_time_t","_size_t",0}, { "_class_wxNavigationKeyEvent","_wxNavigationKeyEvent",0}, - { "_wxLogNull","_class_wxLogNull",0}, { "_wxButton","_class_wxButton",0}, + { "_wxLogNull","_class_wxLogNull",0}, { "_wxZipFSHandler","_class_wxZipFSHandler",0}, { "_class_wxPyApp","_wxPyApp",0}, { "_wxSize","_class_wxSize",0}, { "_wxRegionIterator","_class_wxRegionIterator",0}, { "_class_wxPyTextDataObject","_wxPyTextDataObject",0}, + { "_wxStaticBoxSizer","_class_wxStaticBoxSizer",0}, { "_class_wxLogTextCtrl","_wxLogTextCtrl",0}, { "_class_wxLogGui","_wxLogGui",0}, { "_class_wxMDIParentFrame","_wxMDIParentFrame",0}, { "_wxPyTreeItemData","_class_wxPyTreeItemData",0}, { "_class_wxPrinterDC","_wxPrinterDC",0}, - { "_wxStaticBoxSizer","_class_wxStaticBoxSizer",0}, { "_class_wxTimeSpan","_wxTimeSpan",0}, { "_class_wxPyFileSystemHandler","_wxPyFileSystemHandler",0}, { "_class_wxPaintDC","_wxPaintDC",0}, @@ -8993,9 +9001,9 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxFontDialog","_class_wxFontDialog",0}, { "_wxMemoryFSHandler","_class_wxMemoryFSHandler",0}, { "_wxRegion","_class_wxRegion",0}, + { "_wxSizer","_class_wxSizer",0}, { "_class_wxSplitterWindow","_wxSplitterWindow",0}, { "_wxPreviewFrame","_class_wxPreviewFrame",0}, - { "_wxSizer","_class_wxSizer",0}, { "_class_wxDateSpan","_wxDateSpan",0}, { "_wxFileSystem","_class_wxFileSystem",0}, { "_class_wxShowEvent","_wxShowEvent",0}, @@ -9007,6 +9015,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxGauge","_class_wxGauge",0}, { "_class_wxCheckListBox","_wxCheckListBox",0}, { "_class_wxBusyInfo","_wxBusyInfo",0}, + { "_class_wxFontList","_wxFontList",0}, { "_class_wxJoystick","_wxJoystick",0}, { "_class_wxCommandEvent","_class_wxStyledTextEvent",SwigwxStyledTextEventTowxCommandEvent}, { "_class_wxCommandEvent","_wxStyledTextEvent",SwigwxStyledTextEventTowxCommandEvent}, @@ -9014,6 +9023,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxClientDC","_wxClientDC",0}, { "_class_wxSizeEvent","_wxSizeEvent",0}, { "_class_wxListCtrl","_wxListCtrl",0}, + { "_wxBrushList","_class_wxBrushList",0}, { "_wxCustomDataObject","_class_wxCustomDataObject",0}, { "_class_wxLogNull","_wxLogNull",0}, { "_class_wxSize","_wxSize",0}, @@ -9024,11 +9034,11 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxOutputStream","_class_wxOutputStream",0}, { "_wxTreeEvent","_class_wxTreeEvent",0}, { "_wxDirDialog","_class_wxDirDialog",0}, + { "_class_wxScrollBar","_wxScrollBar",0}, { "_wxEvtHandler","_class_wxStyledTextCtrl",SwigwxStyledTextCtrlTowxEvtHandler}, { "_wxEvtHandler","_wxStyledTextCtrl",SwigwxStyledTextCtrlTowxEvtHandler}, { "_wxEvtHandler","_class_wxEvtHandler",0}, { "_wxMenuItem","_class_wxMenuItem",0}, - { "_class_wxScrollBar","_wxScrollBar",0}, { "_class_wxColourDialog","_wxColourDialog",0}, { "_class_wxPrintData","_wxPrintData",0}, { "_class_wxScrolledWindow","_wxScrolledWindow",0}, @@ -9041,18 +9051,18 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxPageSetupDialogData","_class_wxPageSetupDialogData",0}, { "_class_wxPalette","_wxPalette",0}, { "_wxFileDataObject","_class_wxFileDataObject",0}, - { "_class_wxQueryLayoutInfoEvent","_wxQueryLayoutInfoEvent",0}, { "_wxNotebookSizer","_class_wxNotebookSizer",0}, + { "_class_wxQueryLayoutInfoEvent","_wxQueryLayoutInfoEvent",0}, { "_class_wxEraseEvent","_wxEraseEvent",0}, { "_wxPyFontEnumerator","_class_wxPyFontEnumerator",0}, { "_wxMDIClientWindow","_class_wxMDIClientWindow",0}, { "_class_wxDataObjectComposite","_wxDataObjectComposite",0}, { "_class_wxToolBarToolBase","_wxToolBarToolBase",0}, { "_class_wxFontDialog","_wxFontDialog",0}, + { "_class_wxWindowDestroyEvent","_wxWindowDestroyEvent",0}, { "_wxWindow","_class_wxStyledTextCtrl",SwigwxStyledTextCtrlTowxWindow}, { "_wxWindow","_wxStyledTextCtrl",SwigwxStyledTextCtrlTowxWindow}, { "_wxWindow","_class_wxWindow",0}, - { "_class_wxWindowDestroyEvent","_wxWindowDestroyEvent",0}, { "_wxLogStderr","_class_wxLogStderr",0}, { "_class_wxFileSystemHandler","_wxFileSystemHandler",0}, { "_class_wxFileSystem","_wxFileSystem",0}, @@ -9131,7 +9141,7 @@ SWIGEXPORT(void) initstc_c() { PyDict_SetItemString(d,"wxSTC_INDIC0_MASK", PyInt_FromLong((long) 32)); PyDict_SetItemString(d,"wxSTC_INDIC1_MASK", PyInt_FromLong((long) 64)); PyDict_SetItemString(d,"wxSTC_INDIC2_MASK", PyInt_FromLong((long) 128)); - PyDict_SetItemString(d,"wxSTC_INDICS_MASK", PyInt_FromLong((long) 32|64|128)); + PyDict_SetItemString(d,"wxSTC_INDICS_MASK", PyInt_FromLong((long) 224)); PyDict_SetItemString(d,"wxSTC_PRINT_NORMAL", PyInt_FromLong((long) 0)); PyDict_SetItemString(d,"wxSTC_PRINT_INVERTLIGHT", PyInt_FromLong((long) 1)); PyDict_SetItemString(d,"wxSTC_PRINT_BLACKONWHITE", PyInt_FromLong((long) 2)); diff --git a/wxPython/contrib/stc/stc_.py b/wxPython/contrib/stc/stc_.py index b77cd7e8d0..4b8f210b2c 100644 --- a/wxPython/contrib/stc/stc_.py +++ b/wxPython/contrib/stc/stc_.py @@ -11,6 +11,8 @@ from gdi import * from clip_dnd import * +from controls import * + from events import * from streams import * @@ -21,8 +23,6 @@ from frames import * from stattool import * -from controls import * - from controls2 import * from windows2 import * @@ -35,8 +35,6 @@ from image import * from printfw import * -from sizers import * - from filesys import * from utils import * diff --git a/wxPython/demo/ActiveXWrapper_Acrobat.py b/wxPython/demo/ActiveXWrapper_Acrobat.py index 349429acc3..06da8cc699 100644 --- a/wxPython/demo/ActiveXWrapper_Acrobat.py +++ b/wxPython/demo/ActiveXWrapper_Acrobat.py @@ -29,7 +29,7 @@ if wxPlatform == '__WXMSW__': #---------------------------------------------------------------------- class TestPanel(wxPanel): - def __init__(self, parent): + def __init__(self, parent, log): wxPanel.__init__(self, parent, -1) self.pdf = None @@ -94,7 +94,7 @@ class TestPanel(wxPanel): def runTest(frame, nb, log): if wxPlatform == '__WXMSW__': - win = TestPanel(nb) + win = TestPanel(nb, log) return win else: dlg = wxMessageDialog(frame, 'This demo only works on MSW.', @@ -117,6 +117,7 @@ if __name__ == '__main__': EVT_CLOSE(self, self.OnCloseWindow) def OnCloseWindow(self, event): + self.tp.pdf.Cleanup() self.Destroy() diff --git a/wxPython/demo/GridSimple.py b/wxPython/demo/GridSimple.py index bafd643cf2..a45d1841c6 100644 --- a/wxPython/demo/GridSimple.py +++ b/wxPython/demo/GridSimple.py @@ -37,6 +37,8 @@ class SimpleGrid(wxGrid): self.SetColLabelValue(1, "column") self.SetColLabelValue(2, "labels") + self.SetColLabelAlignment(wxALIGN_LEFT, wxALIGN_BOTTOM) + # test all the events EVT_GRID_CELL_LEFT_CLICK(self, self.OnCellLeftClick) EVT_GRID_CELL_RIGHT_CLICK(self, self.OnCellRightClick) diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py index 8c7b09d699..bc8bb4fde3 100644 --- a/wxPython/demo/Main.py +++ b/wxPython/demo/Main.py @@ -91,6 +91,8 @@ class wxPythonDemo(wxFrame): self.otherWin = None EVT_IDLE(self, self.OnIdle) EVT_CLOSE(self, self.OnCloseWindow) + EVT_ICONIZE(self, self.OnIconfiy) + EVT_MAXIMIZE(self, self.OnMaximize) self.Centre(wxBOTH) self.CreateStatusBar(1, wxST_SIZEGRIP) @@ -403,6 +405,19 @@ class wxPythonDemo(wxFrame): wxGetApp().ProcessIdle() + #--------------------------------------------- + def OnIconfiy(self, evt): + wxLogMessage("OnIconfiy") + evt.Skip() + + #--------------------------------------------- + def OnMaximize(self, evt): + wxLogMessage("OnMaximize") + evt.Skip() + + + + #--------------------------------------------------------------------------- #--------------------------------------------------------------------------- diff --git a/wxPython/demo/wxOGL.py b/wxPython/demo/wxOGL.py index c963fdd847..934152255a 100644 --- a/wxPython/demo/wxOGL.py +++ b/wxPython/demo/wxOGL.py @@ -41,6 +41,40 @@ class RoundedRectangleShape(wxRectangleShape): self.SetCornerRadius(-0.3) +#---------------------------------------------------------------------- + +## class LabeledBitmapShape(wxBitmapShape): +## def __init__(self, bmp, text): +## wxBitmapShape.__init__(self) +## self.SetBitmap(bmp) +## self.region = r = wxShapeRegion() +## r.SetPosition(0, 0) #bmp.GetHeight()) +## r.SetSize(bmp.GetWidth(), bmp.GetHeight()) +## r.SetText(text) +## self.AddRegion(r) + +## def OnMovePost(self, dc, x, y, old_x, old_y, display): +## self.region.SetPosition(x, y) +## self.base_OnMovePost(dc, x, y, old_x, old_y, display) + + +## class LabeledBitmapShape(wxCompositeShape): +## def __init__(self, canvas, bmp, text): +## wxCompositeShape.__init__(self) +## self.bs = wxBitmapShape() +## self.bs.SetBitmap(bmp) +## self.ts = wxTextShape() +## self.ts.AddText(text) + +## self.AddChild(self.bs) +## self.AddChild(self.ts, self.bs) + +## self.AddConstrainedShapes(gyCONSTRAINT_CENTRED_VERTICALLY, self, [self.bs, self.ts]) +## self.AddSimpleConstraint(gyCONSTRAINT_BELOW, self.bs, self.ts) +## self.AddSimpleConstraint(gyCONSTRAINT_ALIGNED_TOP, self, self.bs) +## self.AddSimpleConstraint(gyCONSTRAINT_ALIGNED_BOTTOM, self, self.ts) + + #---------------------------------------------------------------------- class MyEvtHandler(wxShapeEvtHandler): @@ -49,7 +83,6 @@ class MyEvtHandler(wxShapeEvtHandler): self.log = log self.statbarFrame = frame - def UpdateStatusBar(self, shape): x,y = shape.GetX(), shape.GetY() width, height = shape.GetBoundingBoxMax() @@ -126,6 +159,7 @@ class TestWindow(wxShapeCanvas): self.SetDiagram(self.diagram) self.diagram.SetCanvas(self) self.shapes = [] + self.save_gdi = [] rRectBrush = wxBrush(wxNamedColour("MEDIUM TURQUOISE"), wxSOLID) @@ -134,6 +168,24 @@ class TestWindow(wxShapeCanvas): self.MyAddShape(DiamondShape(90, 90), 345, 235, wxPen(wxBLUE, 3, wxDOT), wxRED_BRUSH, "Polygon") self.MyAddShape(RoundedRectangleShape(95,70), 140, 255, wxPen(wxRED, 1), rRectBrush, "Rounded Rect") + bmp = wxBitmap('bitmaps/test2.bmp', wxBITMAP_TYPE_BMP) + mask = wxMaskColour(bmp, wxBLUE) + bmp.SetMask(mask) +## s = LabeledBitmapShape(self, bmp, "Hello") +## self.MyAddShape(s, 225, 150, None, None, None) +## print s.Recompute() +## s.CalculateSize() +## print s.GetX(), s.GetY() +## s.SetSize(225) +## s.SetY(150) +## s.SetSize(80, 80) +## print s.GetX(), s.GetY() +## #print s.GetSize() + + s = wxBitmapShape() + s.SetBitmap(bmp) + self.MyAddShape(s, 225, 150, None, None, "Bitmap") + dc = wxClientDC(self) self.PrepareDC(dc) for x in range(len(self.shapes)): @@ -158,13 +210,13 @@ class TestWindow(wxShapeCanvas): def MyAddShape(self, shape, x, y, pen, brush, text): - shape.SetDraggable(true) + shape.SetDraggable(true, true) shape.SetCanvas(self) shape.SetX(x) shape.SetY(y) - shape.SetPen(pen) - shape.SetBrush(brush) - shape.AddText(text) + if pen: shape.SetPen(pen) + if brush: shape.SetBrush(brush) + if text: shape.AddText(text) #shape.SetShadowMode(SHADOW_RIGHT) self.diagram.AddShape(shape) shape.Show(true) @@ -177,6 +229,7 @@ class TestWindow(wxShapeCanvas): self.shapes.append(shape) + def __del__(self): for shape in self.diagram.GetShapeList(): if shape.GetParent() == None: diff --git a/wxPython/demo/wxScrolledWindow.py b/wxPython/demo/wxScrolledWindow.py index c772f2ed66..c248b4ba98 100644 --- a/wxPython/demo/wxScrolledWindow.py +++ b/wxPython/demo/wxScrolledWindow.py @@ -42,7 +42,6 @@ class MyCanvas(wxScrolledWindow): def DoDrawing(self, dc): dc.BeginDrawing() - #pen1 = wxPen(wxNamedColour('RED')) dc.SetPen(wxPen(wxNamedColour('RED'))) dc.DrawRectangle(5, 5, 50, 50) @@ -50,7 +49,6 @@ class MyCanvas(wxScrolledWindow): dc.SetPen(wxPen(wxNamedColour('BLUE'), 4)) dc.DrawRectangle(15, 15, 50, 50) - #font = wxFont(14, wxSWISS, wxNORMAL, wxNORMAL) dc.SetFont(wxFont(14, wxSWISS, wxNORMAL, wxNORMAL)) dc.SetTextForeground(wxColour(0xFF, 0x20, 0xFF)) te = dc.GetTextExtent("Hello World") diff --git a/wxPython/src/_defs.i b/wxPython/src/_defs.i index ec7525fc0d..32c5b75d57 100644 --- a/wxPython/src/_defs.i +++ b/wxPython/src/_defs.i @@ -366,6 +366,7 @@ enum { wxMORE, wxSETUP, + wxCENTRE, wxCENTER, wxSIZE_AUTO_WIDTH, @@ -418,6 +419,11 @@ enum { wxID_NO, wxID_STATIC, wxID_SEPARATOR, + wxID_FORWARD, + wxID_BACKWARD, + wxID_SETUP, + wxID_MORE, + wxBITMAP_TYPE_BMP, wxBITMAP_TYPE_BMP_RESOURCE, diff --git a/wxPython/src/html.i b/wxPython/src/html.i index 4b5ef2274c..dfc8fa6e8d 100644 --- a/wxPython/src/html.i +++ b/wxPython/src/html.i @@ -523,7 +523,7 @@ enum { class wxHtmlPrintout : public wxPyPrintout { public: wxHtmlPrintout(const char* title = "Printout"); - //~wxHtmlPrintout(); + //~wxHtmlPrintout(); wxPrintPreview object takes ownership... void SetHtmlText(const wxString& html, const wxString &basepath = wxEmptyString, diff --git a/wxPython/src/msw/gdi.cpp b/wxPython/src/msw/gdi.cpp index 03637d9ee0..33724225cd 100644 --- a/wxPython/src/msw/gdi.cpp +++ b/wxPython/src/msw/gdi.cpp @@ -64,12 +64,12 @@ extern PyObject *SWIG_newvarlink(void); static PyObject* l_output_helper(PyObject* target, PyObject* o) { PyObject* o2; - if (!target) { + if (!target) { target = o; - } else if (target == Py_None) { + } else if (target == Py_None) { Py_DECREF(Py_None); target = o; - } else { + } else { if (!PyList_Check(target)) { o2 = target; target = PyList_New(0); @@ -86,23 +86,23 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) { PyObject* o2; PyObject* o3; - if (!target) { + if (!target) { target = o; - } else if (target == Py_None) { + } else if (target == Py_None) { Py_DECREF(Py_None); target = o; - } else { + } else { if (!PyTuple_Check(target)) { o2 = target; target = PyTuple_New(1); PyTuple_SetItem(target, 0, o2); } - o3 = PyTuple_New(1); - PyTuple_SetItem(o3, 0, o); + o3 = PyTuple_New(1); + PyTuple_SetItem(o3, 0, o); o2 = target; - target = PySequence_Concat(o2, o3); - Py_DECREF(o2); + target = PySequence_Concat(o2, o3); + Py_DECREF(o2); Py_DECREF(o3); } return target; diff --git a/wxPython/src/msw/windows.cpp b/wxPython/src/msw/windows.cpp index 4b6b9dbd86..e2f14a3ff1 100644 --- a/wxPython/src/msw/windows.cpp +++ b/wxPython/src/msw/windows.cpp @@ -60,12 +60,12 @@ extern PyObject *SWIG_newvarlink(void); static PyObject* l_output_helper(PyObject* target, PyObject* o) { PyObject* o2; - if (!target) { + if (!target) { target = o; - } else if (target == Py_None) { + } else if (target == Py_None) { Py_DECREF(Py_None); target = o; - } else { + } else { if (!PyList_Check(target)) { o2 = target; target = PyList_New(0); @@ -82,23 +82,23 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) { PyObject* o2; PyObject* o3; - if (!target) { + if (!target) { target = o; - } else if (target == Py_None) { + } else if (target == Py_None) { Py_DECREF(Py_None); target = o; - } else { + } else { if (!PyTuple_Check(target)) { o2 = target; target = PyTuple_New(1); PyTuple_SetItem(target, 0, o2); } - o3 = PyTuple_New(1); - PyTuple_SetItem(o3, 0, o); + o3 = PyTuple_New(1); + PyTuple_SetItem(o3, 0, o); o2 = target; - target = PySequence_Concat(o2, o3); - Py_DECREF(o2); + target = PySequence_Concat(o2, o3); + Py_DECREF(o2); Py_DECREF(o3); } return target; @@ -5826,6 +5826,99 @@ static PyObject *_wrap_wxDialog_SetReturnCode(PyObject *self, PyObject *args, Py return _resultobj; } +#define wxDialog_CreateTextSizer(_swigobj,_swigarg0) (_swigobj->CreateTextSizer(_swigarg0)) +static PyObject *_wrap_wxDialog_CreateTextSizer(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxSizer * _result; + wxDialog * _arg0; + wxString * _arg1; + PyObject * _argo0 = 0; + PyObject * _obj1 = 0; + char *_kwnames[] = { "self","message", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxDialog_CreateTextSizer",_kwnames,&_argo0,&_obj1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDialog_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDialog_CreateTextSizer. Expected _wxDialog_p."); + return NULL; + } + } +{ +#if PYTHON_API_VERSION >= 1009 + char* tmpPtr; int tmpSize; + if (!PyString_Check(_obj1) && !PyUnicode_Check(_obj1)) { + PyErr_SetString(PyExc_TypeError, "String or Unicode type required"); + return NULL; + } + if (PyString_AsStringAndSize(_obj1, &tmpPtr, &tmpSize) == -1) + return NULL; + _arg1 = new wxString(tmpPtr, tmpSize); +#else + if (!PyString_Check(_obj1)) { + PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); + return NULL; + } + _arg1 = new wxString(PyString_AS_STRING(_obj1), PyString_GET_SIZE(_obj1)); +#endif +} +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (wxSizer *)wxDialog_CreateTextSizer(_arg0,*_arg1); + + wxPy_END_ALLOW_THREADS; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxSizer_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } +{ + if (_obj1) + delete _arg1; +} + return _resultobj; +} + +#define wxDialog_CreateButtonSizer(_swigobj,_swigarg0) (_swigobj->CreateButtonSizer(_swigarg0)) +static PyObject *_wrap_wxDialog_CreateButtonSizer(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxSizer * _result; + wxDialog * _arg0; + long _arg1; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","flags", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxDialog_CreateButtonSizer",_kwnames,&_argo0,&_arg1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDialog_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDialog_CreateButtonSizer. Expected _wxDialog_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (wxSizer *)wxDialog_CreateButtonSizer(_arg0,_arg1); + + wxPy_END_ALLOW_THREADS; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxSizer_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + static void *SwigwxScrolledWindowTowxPanel(void *ptr) { wxScrolledWindow *src; wxPanel *dest; @@ -6543,14 +6636,15 @@ static PyObject *_wrap_wxMenu_Append(PyObject *self, PyObject *args, PyObject *k int _arg1; wxString * _arg2; wxString * _arg3 = (wxString *) &wxPyEmptyStr; - int _arg4 = (int ) FALSE; + bool _arg4 = (bool ) FALSE; PyObject * _argo0 = 0; PyObject * _obj2 = 0; PyObject * _obj3 = 0; + int tempbool4 = (int) FALSE; char *_kwnames[] = { "self","id","item","helpString","checkable", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO|Oi:wxMenu_Append",_kwnames,&_argo0,&_arg1,&_obj2,&_obj3,&_arg4)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO|Oi:wxMenu_Append",_kwnames,&_argo0,&_arg1,&_obj2,&_obj3,&tempbool4)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -6596,6 +6690,7 @@ static PyObject *_wrap_wxMenu_Append(PyObject *self, PyObject *args, PyObject *k _arg3 = new wxString(PyString_AS_STRING(_obj3), PyString_GET_SIZE(_obj3)); #endif } + _arg4 = (bool ) tempbool4; { wxPy_BEGIN_ALLOW_THREADS; wxMenu_Append(_arg0,_arg1,*_arg2,*_arg3,_arg4); @@ -9536,7 +9631,477 @@ static PyObject *_wrap_wxMenuItem_GetLabelFromText(PyObject *self, PyObject *arg return _resultobj; } +#define wxMenuItem_SetFont(_swigobj,_swigarg0) (_swigobj->SetFont(_swigarg0)) +static PyObject *_wrap_wxMenuItem_SetFont(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxMenuItem * _arg0; + wxFont * _arg1; + PyObject * _argo0 = 0; + PyObject * _argo1 = 0; + char *_kwnames[] = { "self","font", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxMenuItem_SetFont",_kwnames,&_argo0,&_argo1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuItem_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_SetFont. Expected _wxMenuItem_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxFont_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxMenuItem_SetFont. Expected _wxFont_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxMenuItem_SetFont(_arg0,*_arg1); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxMenuItem_GetFont(_swigobj) (_swigobj->GetFont()) +static PyObject *_wrap_wxMenuItem_GetFont(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxFont * _result; + wxMenuItem * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMenuItem_GetFont",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuItem_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_GetFont. Expected _wxMenuItem_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxFont & _result_ref = wxMenuItem_GetFont(_arg0); + _result = (wxFont *) &_result_ref; + + wxPy_END_ALLOW_THREADS; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxFont_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + +#define wxMenuItem_SetTextColour(_swigobj,_swigarg0) (_swigobj->SetTextColour(_swigarg0)) +static PyObject *_wrap_wxMenuItem_SetTextColour(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxMenuItem * _arg0; + wxColour * _arg1; + PyObject * _argo0 = 0; + wxColour temp; + PyObject * _obj1 = 0; + char *_kwnames[] = { "self","colText", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxMenuItem_SetTextColour",_kwnames,&_argo0,&_obj1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuItem_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_SetTextColour. Expected _wxMenuItem_p."); + return NULL; + } + } +{ + _arg1 = &temp; + if (! wxColour_helper(_obj1, &_arg1)) + return NULL; +} +{ + wxPy_BEGIN_ALLOW_THREADS; + wxMenuItem_SetTextColour(_arg0,*_arg1); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxMenuItem_GetTextColour(_swigobj) (_swigobj->GetTextColour()) +static PyObject *_wrap_wxMenuItem_GetTextColour(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxColour * _result; + wxMenuItem * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMenuItem_GetTextColour",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuItem_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_GetTextColour. Expected _wxMenuItem_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxColour & _result_ref = wxMenuItem_GetTextColour(_arg0); + _result = (wxColour *) &_result_ref; + + wxPy_END_ALLOW_THREADS; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxColour_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + +#define wxMenuItem_SetBackgroundColour(_swigobj,_swigarg0) (_swigobj->SetBackgroundColour(_swigarg0)) +static PyObject *_wrap_wxMenuItem_SetBackgroundColour(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxMenuItem * _arg0; + wxColour * _arg1; + PyObject * _argo0 = 0; + wxColour temp; + PyObject * _obj1 = 0; + char *_kwnames[] = { "self","colBack", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxMenuItem_SetBackgroundColour",_kwnames,&_argo0,&_obj1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuItem_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_SetBackgroundColour. Expected _wxMenuItem_p."); + return NULL; + } + } +{ + _arg1 = &temp; + if (! wxColour_helper(_obj1, &_arg1)) + return NULL; +} +{ + wxPy_BEGIN_ALLOW_THREADS; + wxMenuItem_SetBackgroundColour(_arg0,*_arg1); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxMenuItem_GetBackgroundColour(_swigobj) (_swigobj->GetBackgroundColour()) +static PyObject *_wrap_wxMenuItem_GetBackgroundColour(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxColour * _result; + wxMenuItem * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMenuItem_GetBackgroundColour",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuItem_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_GetBackgroundColour. Expected _wxMenuItem_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxColour & _result_ref = wxMenuItem_GetBackgroundColour(_arg0); + _result = (wxColour *) &_result_ref; + + wxPy_END_ALLOW_THREADS; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxColour_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + +#define wxMenuItem_SetBitmaps(_swigobj,_swigarg0,_swigarg1) (_swigobj->SetBitmaps(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxMenuItem_SetBitmaps(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxMenuItem * _arg0; + wxBitmap * _arg1; + wxBitmap * _arg2 = (wxBitmap *) &wxNullBitmap; + PyObject * _argo0 = 0; + PyObject * _argo1 = 0; + PyObject * _argo2 = 0; + char *_kwnames[] = { "self","bmpChecked","bmpUnchecked", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|O:wxMenuItem_SetBitmaps",_kwnames,&_argo0,&_argo1,&_argo2)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuItem_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_SetBitmaps. Expected _wxMenuItem_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxBitmap_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxMenuItem_SetBitmaps. Expected _wxBitmap_p."); + return NULL; + } + } + if (_argo2) { + if (_argo2 == Py_None) { _arg2 = NULL; } + else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxBitmap_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxMenuItem_SetBitmaps. Expected _wxBitmap_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxMenuItem_SetBitmaps(_arg0,*_arg1,*_arg2); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxMenuItem_SetBitmap(_swigobj,_swigarg0) (_swigobj->SetBitmap(_swigarg0)) +static PyObject *_wrap_wxMenuItem_SetBitmap(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxMenuItem * _arg0; + wxBitmap * _arg1; + PyObject * _argo0 = 0; + PyObject * _argo1 = 0; + char *_kwnames[] = { "self","bmpChecked", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxMenuItem_SetBitmap",_kwnames,&_argo0,&_argo1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuItem_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_SetBitmap. Expected _wxMenuItem_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxBitmap_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxMenuItem_SetBitmap. Expected _wxBitmap_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxMenuItem_SetBitmap(_arg0,*_arg1); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxMenuItem_GetBitmap(_swigobj,_swigarg0) (_swigobj->GetBitmap(_swigarg0)) +static PyObject *_wrap_wxMenuItem_GetBitmap(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxBitmap * _result; + wxMenuItem * _arg0; + bool _arg1 = (bool ) TRUE; + PyObject * _argo0 = 0; + int tempbool1 = (int) TRUE; + char *_kwnames[] = { "self","bChecked", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|i:wxMenuItem_GetBitmap",_kwnames,&_argo0,&tempbool1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuItem_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_GetBitmap. Expected _wxMenuItem_p."); + return NULL; + } + } + _arg1 = (bool ) tempbool1; +{ + wxPy_BEGIN_ALLOW_THREADS; + const wxBitmap & _result_ref = wxMenuItem_GetBitmap(_arg0,_arg1); + _result = (wxBitmap *) &_result_ref; + + wxPy_END_ALLOW_THREADS; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmap_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + +#define wxMenuItem_SetMarginWidth(_swigobj,_swigarg0) (_swigobj->SetMarginWidth(_swigarg0)) +static PyObject *_wrap_wxMenuItem_SetMarginWidth(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxMenuItem * _arg0; + int _arg1; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","nWidth", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxMenuItem_SetMarginWidth",_kwnames,&_argo0,&_arg1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuItem_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_SetMarginWidth. Expected _wxMenuItem_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxMenuItem_SetMarginWidth(_arg0,_arg1); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxMenuItem_GetMarginWidth(_swigobj) (_swigobj->GetMarginWidth()) +static PyObject *_wrap_wxMenuItem_GetMarginWidth(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + int _result; + wxMenuItem * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMenuItem_GetMarginWidth",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuItem_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_GetMarginWidth. Expected _wxMenuItem_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (int )wxMenuItem_GetMarginWidth(_arg0); + + wxPy_END_ALLOW_THREADS; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +static PyObject *_wrap_wxMenuItem_GetDefaultMarginWidth(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + int _result; + char *_kwnames[] = { NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxMenuItem_GetDefaultMarginWidth",_kwnames)) + return NULL; +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (int )wxMenuItem::GetDefaultMarginWidth(); + + wxPy_END_ALLOW_THREADS; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxMenuItem_IsOwnerDrawn(_swigobj) (_swigobj->IsOwnerDrawn()) +static PyObject *_wrap_wxMenuItem_IsOwnerDrawn(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + wxMenuItem * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMenuItem_IsOwnerDrawn",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuItem_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_IsOwnerDrawn. Expected _wxMenuItem_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (bool )wxMenuItem_IsOwnerDrawn(_arg0); + + wxPy_END_ALLOW_THREADS; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxMenuItem_ResetOwnerDrawn(_swigobj) (_swigobj->ResetOwnerDrawn()) +static PyObject *_wrap_wxMenuItem_ResetOwnerDrawn(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxMenuItem * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMenuItem_ResetOwnerDrawn",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuItem_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_ResetOwnerDrawn. Expected _wxMenuItem_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxMenuItem_ResetOwnerDrawn(_arg0); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + static PyMethodDef windowscMethods[] = { + { "wxMenuItem_ResetOwnerDrawn", (PyCFunction) _wrap_wxMenuItem_ResetOwnerDrawn, METH_VARARGS | METH_KEYWORDS }, + { "wxMenuItem_IsOwnerDrawn", (PyCFunction) _wrap_wxMenuItem_IsOwnerDrawn, METH_VARARGS | METH_KEYWORDS }, + { "wxMenuItem_GetDefaultMarginWidth", (PyCFunction) _wrap_wxMenuItem_GetDefaultMarginWidth, METH_VARARGS | METH_KEYWORDS }, + { "wxMenuItem_GetMarginWidth", (PyCFunction) _wrap_wxMenuItem_GetMarginWidth, METH_VARARGS | METH_KEYWORDS }, + { "wxMenuItem_SetMarginWidth", (PyCFunction) _wrap_wxMenuItem_SetMarginWidth, METH_VARARGS | METH_KEYWORDS }, + { "wxMenuItem_GetBitmap", (PyCFunction) _wrap_wxMenuItem_GetBitmap, METH_VARARGS | METH_KEYWORDS }, + { "wxMenuItem_SetBitmap", (PyCFunction) _wrap_wxMenuItem_SetBitmap, METH_VARARGS | METH_KEYWORDS }, + { "wxMenuItem_SetBitmaps", (PyCFunction) _wrap_wxMenuItem_SetBitmaps, METH_VARARGS | METH_KEYWORDS }, + { "wxMenuItem_GetBackgroundColour", (PyCFunction) _wrap_wxMenuItem_GetBackgroundColour, METH_VARARGS | METH_KEYWORDS }, + { "wxMenuItem_SetBackgroundColour", (PyCFunction) _wrap_wxMenuItem_SetBackgroundColour, METH_VARARGS | METH_KEYWORDS }, + { "wxMenuItem_GetTextColour", (PyCFunction) _wrap_wxMenuItem_GetTextColour, METH_VARARGS | METH_KEYWORDS }, + { "wxMenuItem_SetTextColour", (PyCFunction) _wrap_wxMenuItem_SetTextColour, METH_VARARGS | METH_KEYWORDS }, + { "wxMenuItem_GetFont", (PyCFunction) _wrap_wxMenuItem_GetFont, METH_VARARGS | METH_KEYWORDS }, + { "wxMenuItem_SetFont", (PyCFunction) _wrap_wxMenuItem_SetFont, METH_VARARGS | METH_KEYWORDS }, { "wxMenuItem_GetLabelFromText", (PyCFunction) _wrap_wxMenuItem_GetLabelFromText, METH_VARARGS | METH_KEYWORDS }, { "wxMenuItem_SetAccel", (PyCFunction) _wrap_wxMenuItem_SetAccel, METH_VARARGS | METH_KEYWORDS }, { "wxMenuItem_GetAccel", (PyCFunction) _wrap_wxMenuItem_GetAccel, METH_VARARGS | METH_KEYWORDS }, @@ -9633,6 +10198,8 @@ static PyMethodDef windowscMethods[] = { { "wxScrolledWindow_GetScrollPageSize", (PyCFunction) _wrap_wxScrolledWindow_GetScrollPageSize, METH_VARARGS | METH_KEYWORDS }, { "wxScrolledWindow_EnableScrolling", (PyCFunction) _wrap_wxScrolledWindow_EnableScrolling, METH_VARARGS | METH_KEYWORDS }, { "new_wxScrolledWindow", (PyCFunction) _wrap_new_wxScrolledWindow, METH_VARARGS | METH_KEYWORDS }, + { "wxDialog_CreateButtonSizer", (PyCFunction) _wrap_wxDialog_CreateButtonSizer, METH_VARARGS | METH_KEYWORDS }, + { "wxDialog_CreateTextSizer", (PyCFunction) _wrap_wxDialog_CreateTextSizer, METH_VARARGS | METH_KEYWORDS }, { "wxDialog_SetReturnCode", (PyCFunction) _wrap_wxDialog_SetReturnCode, METH_VARARGS | METH_KEYWORDS }, { "wxDialog_GetReturnCode", (PyCFunction) _wrap_wxDialog_GetReturnCode, METH_VARARGS | METH_KEYWORDS }, { "wxDialog_ShowModal", (PyCFunction) _wrap_wxDialog_ShowModal, METH_VARARGS | METH_KEYWORDS }, @@ -9849,6 +10416,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxPen","_class_wxPen",0}, { "_byte","_unsigned_char",0}, { "_wxDataObject","_class_wxDataObject",0}, + { "_wxColourDatabase","_class_wxColourDatabase",0}, { "_wxPyDataObjectSimple","_class_wxPyDataObjectSimple",0}, { "_wxPyDropSource","_class_wxPyDropSource",0}, { "_long","_unsigned_long",0}, @@ -9895,12 +10463,14 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxPoint","_class_wxPoint",0}, { "_char","_wxChar",0}, { "_wxBitmap","_class_wxBitmap",0}, + { "_wxPenList","_class_wxPenList",0}, { "_wxWindowDC","_class_wxWindowDC",0}, { "_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0}, { "_class_wxValidator","_class_wxPyValidator",SwigwxPyValidatorTowxValidator}, { "_class_wxValidator","_wxPyValidator",SwigwxPyValidatorTowxValidator}, { "_class_wxValidator","_wxValidator",0}, { "_wxDropTarget","_class_wxDropTarget",0}, + { "_class_wxColourDatabase","_wxColourDatabase",0}, { "_EBool","_wxCoord",0}, { "_EBool","_wxPrintQuality",0}, { "_EBool","_signed_int",0}, @@ -9913,6 +10483,8 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_unsigned_long","_long",0}, { "_class_wxRect","_wxRect",0}, { "_class_wxDC","_wxDC",0}, + { "_class_wxBrushList","_wxBrushList",0}, + { "_class_wxPenList","_wxPenList",0}, { "_wxAcceleratorEntry","_class_wxAcceleratorEntry",0}, { "_class_wxPanel","_class_wxScrolledWindow",SwigwxScrolledWindowTowxPanel}, { "_class_wxPanel","_wxScrolledWindow",SwigwxScrolledWindowTowxPanel}, @@ -9949,6 +10521,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxClipboard","_class_wxClipboard",0}, { "_class_wxPyValidator","_wxPyValidator",0}, { "_wxBusyInfo","_class_wxBusyInfo",0}, + { "_wxFontList","_class_wxFontList",0}, { "_class_wxPyBitmapDataObject","_wxPyBitmapDataObject",0}, { "_wxClientDC","_class_wxClientDC",0}, { "_class_wxPoint","_wxPoint",0}, @@ -10033,7 +10606,9 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxRegion","_class_wxRegion",0}, { "_wxPyDropTarget","_class_wxPyDropTarget",0}, { "_class_wxBusyInfo","_wxBusyInfo",0}, + { "_class_wxFontList","_wxFontList",0}, { "_class_wxClientDC","_wxClientDC",0}, + { "_wxBrushList","_class_wxBrushList",0}, { "_wxCustomDataObject","_class_wxCustomDataObject",0}, { "_class_wxSize","_wxSize",0}, { "_class_wxBitmap","_wxBitmap",0}, diff --git a/wxPython/src/msw/windows.py b/wxPython/src/msw/windows.py index 722c52a385..5ec801920f 100644 --- a/wxPython/src/msw/windows.py +++ b/wxPython/src/msw/windows.py @@ -623,8 +623,29 @@ class wxDialogPtr(wxPanelPtr): def SetReturnCode(self, *_args, **_kwargs): val = apply(windowsc.wxDialog_SetReturnCode,(self,) + _args, _kwargs) return val + def CreateTextSizer(self, *_args, **_kwargs): + val = apply(windowsc.wxDialog_CreateTextSizer,(self,) + _args, _kwargs) + if val: val = wxSizerPtr(val) + return val + def CreateButtonSizer(self, *_args, **_kwargs): + val = apply(windowsc.wxDialog_CreateButtonSizer,(self,) + _args, _kwargs) + if val: val = wxSizerPtr(val) + return val def __repr__(self): return "" % (self.this,) + + # replace swig generated shadow methods to resolve import issues + def CreateTextSizer(self, *_args, **_kwargs): + import sizers + val = apply(windowsc.wxDialog_CreateTextSizer,(self,) + _args, _kwargs) + if val: val = sizers.wxSizerPtr(val) + return val + def CreateButtonSizer(self, *_args, **_kwargs): + import sizers + val = apply(windowsc.wxDialog_CreateButtonSizer,(self,) + _args, _kwargs) + if val: val = sizers.wxSizerPtr(val) + return val + class wxDialog(wxDialogPtr): def __init__(self,*_args,**_kwargs): self.this = apply(windowsc.new_wxDialog,_args,_kwargs) @@ -969,6 +990,49 @@ class wxMenuItemPtr : def SetAccel(self, *_args, **_kwargs): val = apply(windowsc.wxMenuItem_SetAccel,(self,) + _args, _kwargs) return val + def SetFont(self, *_args, **_kwargs): + val = apply(windowsc.wxMenuItem_SetFont,(self,) + _args, _kwargs) + return val + def GetFont(self, *_args, **_kwargs): + val = apply(windowsc.wxMenuItem_GetFont,(self,) + _args, _kwargs) + if val: val = wxFontPtr(val) + return val + def SetTextColour(self, *_args, **_kwargs): + val = apply(windowsc.wxMenuItem_SetTextColour,(self,) + _args, _kwargs) + return val + def GetTextColour(self, *_args, **_kwargs): + val = apply(windowsc.wxMenuItem_GetTextColour,(self,) + _args, _kwargs) + if val: val = wxColourPtr(val) + return val + def SetBackgroundColour(self, *_args, **_kwargs): + val = apply(windowsc.wxMenuItem_SetBackgroundColour,(self,) + _args, _kwargs) + return val + def GetBackgroundColour(self, *_args, **_kwargs): + val = apply(windowsc.wxMenuItem_GetBackgroundColour,(self,) + _args, _kwargs) + if val: val = wxColourPtr(val) + return val + def SetBitmaps(self, *_args, **_kwargs): + val = apply(windowsc.wxMenuItem_SetBitmaps,(self,) + _args, _kwargs) + return val + def SetBitmap(self, *_args, **_kwargs): + val = apply(windowsc.wxMenuItem_SetBitmap,(self,) + _args, _kwargs) + return val + def GetBitmap(self, *_args, **_kwargs): + val = apply(windowsc.wxMenuItem_GetBitmap,(self,) + _args, _kwargs) + if val: val = wxBitmapPtr(val) + return val + def SetMarginWidth(self, *_args, **_kwargs): + val = apply(windowsc.wxMenuItem_SetMarginWidth,(self,) + _args, _kwargs) + return val + def GetMarginWidth(self, *_args, **_kwargs): + val = apply(windowsc.wxMenuItem_GetMarginWidth,(self,) + _args, _kwargs) + return val + def IsOwnerDrawn(self, *_args, **_kwargs): + val = apply(windowsc.wxMenuItem_IsOwnerDrawn,(self,) + _args, _kwargs) + return val + def ResetOwnerDrawn(self, *_args, **_kwargs): + val = apply(windowsc.wxMenuItem_ResetOwnerDrawn,(self,) + _args, _kwargs) + return val def __repr__(self): return "" % (self.this,) class wxMenuItem(wxMenuItemPtr): @@ -1005,6 +1069,8 @@ wxWindow_PrevControlId = windowsc.wxWindow_PrevControlId wxMenuItem_GetLabelFromText = windowsc.wxMenuItem_GetLabelFromText +wxMenuItem_GetDefaultMarginWidth = windowsc.wxMenuItem_GetDefaultMarginWidth + #-------------- VARIABLE WRAPPERS ------------------ diff --git a/wxPython/src/msw/wx.cpp b/wxPython/src/msw/wx.cpp index 52a36713d9..c18fedafd0 100644 --- a/wxPython/src/msw/wx.cpp +++ b/wxPython/src/msw/wx.cpp @@ -2561,6 +2561,10 @@ SWIGEXPORT(void) initwxc() { PyDict_SetItemString(d,"wxID_NO", PyInt_FromLong((long) wxID_NO)); PyDict_SetItemString(d,"wxID_STATIC", PyInt_FromLong((long) wxID_STATIC)); PyDict_SetItemString(d,"wxID_SEPARATOR", PyInt_FromLong((long) wxID_SEPARATOR)); + PyDict_SetItemString(d,"wxID_FORWARD", PyInt_FromLong((long) wxID_FORWARD)); + PyDict_SetItemString(d,"wxID_BACKWARD", PyInt_FromLong((long) wxID_BACKWARD)); + PyDict_SetItemString(d,"wxID_SETUP", PyInt_FromLong((long) wxID_SETUP)); + PyDict_SetItemString(d,"wxID_MORE", PyInt_FromLong((long) wxID_MORE)); 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)); PyDict_SetItemString(d,"wxBITMAP_TYPE_ICO", PyInt_FromLong((long) wxBITMAP_TYPE_ICO)); diff --git a/wxPython/src/msw/wx.py b/wxPython/src/msw/wx.py index fc3390761e..b94a92458c 100644 --- a/wxPython/src/msw/wx.py +++ b/wxPython/src/msw/wx.py @@ -400,6 +400,10 @@ wxID_YES = wxc.wxID_YES wxID_NO = wxc.wxID_NO wxID_STATIC = wxc.wxID_STATIC wxID_SEPARATOR = wxc.wxID_SEPARATOR +wxID_FORWARD = wxc.wxID_FORWARD +wxID_BACKWARD = wxc.wxID_BACKWARD +wxID_SETUP = wxc.wxID_SETUP +wxID_MORE = wxc.wxID_MORE wxBITMAP_TYPE_BMP = wxc.wxBITMAP_TYPE_BMP wxBITMAP_TYPE_BMP_RESOURCE = wxc.wxBITMAP_TYPE_BMP_RESOURCE wxBITMAP_TYPE_ICO = wxc.wxBITMAP_TYPE_ICO diff --git a/wxPython/src/windows.i b/wxPython/src/windows.i index c3818aa5eb..eaa557ec26 100644 --- a/wxPython/src/windows.i +++ b/wxPython/src/windows.i @@ -540,6 +540,24 @@ public: int GetReturnCode(); void SetReturnCode(int retCode); + + wxSizer* CreateTextSizer( const wxString &message ); + wxSizer* CreateButtonSizer( long flags ); + + %pragma(python) addtoclass = " + # replace swig generated shadow methods to resolve import issues + def CreateTextSizer(self, *_args, **_kwargs): + import sizers + val = apply(windowsc.wxDialog_CreateTextSizer,(self,) + _args, _kwargs) + if val: val = sizers.wxSizerPtr(val) + return val + def CreateButtonSizer(self, *_args, **_kwargs): + import sizers + val = apply(windowsc.wxDialog_CreateButtonSizer,(self,) + _args, _kwargs) + if val: val = sizers.wxSizerPtr(val) + return val +" + }; //--------------------------------------------------------------------------- @@ -586,7 +604,7 @@ public: void Append(int id, const wxString& item, const wxString& helpString = wxPyEmptyStr, - int checkable = FALSE); + bool checkable = FALSE); %name(AppendMenu)void Append(int id, const wxString& item, wxMenu *subMenu, const wxString& helpString = wxPyEmptyStr); %name(AppendItem)void Append(const wxMenuItem* item); @@ -712,7 +730,27 @@ public: static wxString GetLabelFromText(const wxString& text); - // TODO: Add wxOwnerDrawn methods, also look at other ownerdrawn classes... + // wxOwnerDrawn methods + // TODO: also look at other ownerdrawn classes... + void SetFont(const wxFont& font); + wxFont& GetFont(); + void SetTextColour(const wxColour& colText); + wxColour& GetTextColour(); + void SetBackgroundColour(const wxColour& colBack); + wxColour& GetBackgroundColour(); + void SetBitmaps(const wxBitmap& bmpChecked, + const wxBitmap& bmpUnchecked = wxNullBitmap); + void SetBitmap(const wxBitmap& bmpChecked); + const wxBitmap& GetBitmap(bool bChecked = TRUE); + void SetMarginWidth(int nWidth); + int GetMarginWidth(); + static int GetDefaultMarginWidth(); + //void SetName(const wxString& strName); + //const wxString& GetName(); + //void SetCheckable(bool checkable); + //bool IsCheckable(); + bool IsOwnerDrawn(); + void ResetOwnerDrawn(); }; -- 2.45.2