class FileBrowseButton:
++%s ++
class FileBrowseButtonWithHistory(FileBrowseButton):
++%s +-overview = FileBrowseButton.__doc__ +
class DirBrowseButton(FileBrowseButton):
++%s ++ +< +""" % ( FileBrowseButton.__doc__, + FileBrowseButtonWithHistory.__doc__ , + str(DirBrowseButton.__doc__) ) diff --git a/wxPython/demo/LayoutAnchors.py b/wxPython/demo/LayoutAnchors.py new file mode 100644 index 0000000000..b201372a7e --- /dev/null +++ b/wxPython/demo/LayoutAnchors.py @@ -0,0 +1,140 @@ + +from wxPython.wx import * +from wxPython.lib.anchors import LayoutAnchors + +#---------------------------------------------------------------------- + + +[wxID_ANCHORSDEMOFRAMEANCHOREDPANEL, wxID_ANCHORSDEMOFRAMEHELPSTATICTEXT, + wxID_ANCHORSDEMOFRAMEMAINPANEL, wxID_ANCHORSDEMOFRAMEBACKGROUNDPANEL, + wxID_ANCHORSDEMOFRAMERIGHTCHECKBOX, wxID_ANCHORSDEMOFRAMEOKBUTTON, + wxID_ANCHORSDEMOFRAMETOPCHECKBOX, wxID_ANCHORSDEMOFRAMEBOTTOMCHECKBOX, + wxID_ANCHORSDEMOFRAME, wxID_ANCHORSDEMOFRAMELEFTCHECKBOX, + ] = map(lambda _init_ctrls: wxNewId(), range(10)) + +class AnchorsDemoFrame(wxFrame): + def _init_utils(self): + pass + + def _init_ctrls(self, prnt): + wxFrame.__init__(self, size = wxSize(328, 187), id = wxID_ANCHORSDEMOFRAME, title = 'LayoutAnchors Demonstration', parent = prnt, name = 'AnchorsDemoFrame', style = wxDEFAULT_FRAME_STYLE | wxCLIP_CHILDREN, pos = wxPoint(261, 123)) + self._init_utils() + + self.mainPanel = wxPanel(size = wxSize(320, 160), parent = self, id = wxID_ANCHORSDEMOFRAMEMAINPANEL, name = 'panel1', style = wxTAB_TRAVERSAL | wxCLIP_CHILDREN, pos = wxPoint(0, 0)) + self.mainPanel.SetAutoLayout(true) + + self.okButton = wxButton(label = 'OK', id = wxID_ANCHORSDEMOFRAMEOKBUTTON, parent = self.mainPanel, name = 'okButton', size = wxSize(72, 24), style = 0, pos = wxPoint(240, 128)) + self.okButton.SetConstraints(LayoutAnchors(self.okButton, false, false, true, true)) + EVT_BUTTON(self.okButton, wxID_ANCHORSDEMOFRAMEOKBUTTON, self.OnOkButtonButton) + + self.backgroundPanel = wxPanel(size = wxSize(304, 80), parent = self.mainPanel, id = wxID_ANCHORSDEMOFRAMEBACKGROUNDPANEL, name = 'backgroundPanel', style = wxSIMPLE_BORDER | wxCLIP_CHILDREN, pos = wxPoint(8, 40)) + self.backgroundPanel.SetBackgroundColour(wxColour(255, 255, 255)) + self.backgroundPanel.SetConstraints(LayoutAnchors(self.backgroundPanel, true, true, true, true)) + + self.anchoredPanel = wxPanel(size = wxSize(88, 48), id = wxID_ANCHORSDEMOFRAMEANCHOREDPANEL, parent = self.backgroundPanel, name = 'anchoredPanel', style = wxSIMPLE_BORDER, pos = wxPoint(104, 16)) + self.anchoredPanel.SetBackgroundColour(wxColour(0, 0, 222)) + self.anchoredPanel.SetConstraints(LayoutAnchors(self.anchoredPanel, false, false, false, false)) + + self.leftCheckBox = wxCheckBox(label = 'Left', id = wxID_ANCHORSDEMOFRAMELEFTCHECKBOX, parent = self.mainPanel, name = 'leftCheckBox', size = wxSize(40, 16), style = 0, pos = wxPoint(8, 8)) + self.leftCheckBox.SetConstraints(LayoutAnchors(self.leftCheckBox, false, true, false, false)) + EVT_CHECKBOX(self.leftCheckBox, wxID_ANCHORSDEMOFRAMELEFTCHECKBOX, self.OnCheckboxCheckbox) + + self.topCheckBox = wxCheckBox(label = 'Top', id = wxID_ANCHORSDEMOFRAMETOPCHECKBOX, parent = self.mainPanel, name = 'topCheckBox', size = wxSize(40, 16), style = 0, pos = wxPoint(88, 8)) + self.topCheckBox.SetConstraints(LayoutAnchors(self.topCheckBox, false, true, false, false)) + EVT_CHECKBOX(self.topCheckBox, wxID_ANCHORSDEMOFRAMETOPCHECKBOX, self.OnCheckboxCheckbox) + + self.rightCheckBox = wxCheckBox(label = 'Right', id = wxID_ANCHORSDEMOFRAMERIGHTCHECKBOX, parent = self.mainPanel, name = 'rightCheckBox', size = wxSize(48, 16), style = 0, pos = wxPoint(168, 8)) + self.rightCheckBox.SetConstraints(LayoutAnchors(self.rightCheckBox, false, true, false, false)) + EVT_CHECKBOX(self.rightCheckBox, wxID_ANCHORSDEMOFRAMERIGHTCHECKBOX, self.OnCheckboxCheckbox) + + self.bottomCheckBox = wxCheckBox(label = 'Bottom', id = wxID_ANCHORSDEMOFRAMEBOTTOMCHECKBOX, parent = self.mainPanel, name = 'bottomCheckBox', size = wxSize(56, 16), style = 0, pos = wxPoint(248, 8)) + self.bottomCheckBox.SetConstraints(LayoutAnchors(self.bottomCheckBox, false, true, false, false)) + EVT_CHECKBOX(self.bottomCheckBox, wxID_ANCHORSDEMOFRAMEBOTTOMCHECKBOX, self.OnCheckboxCheckbox) + + self.helpStaticText = wxStaticText(label = 'Select anchor options above, then resize window to see the effect', id = wxID_ANCHORSDEMOFRAMEHELPSTATICTEXT, parent = self.mainPanel, name = 'helpStaticText', size = wxSize(224, 24), style = wxST_NO_AUTORESIZE, pos = wxPoint(8, 128)) + self.helpStaticText.SetConstraints(LayoutAnchors(self.helpStaticText, true, false, true, true)) + + def __init__(self, parent): + self._init_ctrls(parent) + + def OnCheckboxCheckbox(self, event): + self.anchoredPanel.SetConstraints( + LayoutAnchors(self.anchoredPanel, + self.leftCheckBox.GetValue(), self.topCheckBox.GetValue(), + self.rightCheckBox.GetValue(), self.bottomCheckBox.GetValue()) ) + + def OnOkButtonButton(self, event): + self.Close() + +#---------------------------------------------------------------------- + +def runTest(frame, nb, log): + win = AnchorsDemoFrame(frame) + frame.otherWin = win + win.Show(true) + + + + +#---------------------------------------------------------------------- + + + + +overview = """ +
LayoutAnchors
+ A class that implements Delphi's Anchors with wxLayoutConstraints. ++ Anchored sides maintain the distance from the edge of the + control to the same edge of the parent. + When neither side is selected, the control keeps the same + relative position to both sides. +
+ The current position and size of the control and it's parent + is used when setting up the constraints. To change the size or + position of an already anchored control, set the constraints to + None, reposition or resize and reapply the anchors. +
+ Examples: +
+ Let's anchor the right and bottom edge of a control and + resize it's parent. +
+
+ ctrl.SetConstraints(LayoutAnchors(ctrl, left=0, top=0, right=1, bottom=1)) + + +=========+ +===================+ + | +-----+ | | | + | | * | -> | | + | +--*--+ | | +-----+ | + +---------+ | | * | + | +--*--+ | + +-------------------+ + * = anchored edge ++
+ When anchored on both sides the control will stretch horizontally. +
+
+ ctrl.SetConstraints(LayoutAnchors(ctrl, 1, 0, 1, 1)) + + +=========+ +===================+ + | +-----+ | | | + | * * | -> | | + | +--*--+ | | +---------------+ | + +---------+ | * ctrl * | + | +-------*-------+ | + +-------------------+ + * = anchored edge ++ +""" + + + + + + + + + diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py index 893fca90d2..7379e4db9f 100644 --- a/wxPython/demo/Main.py +++ b/wxPython/demo/Main.py @@ -20,7 +20,7 @@ from wxPython.html import wxHtmlWindow _treeList = [ - ('New since last release', ['wxProcess', + ('New since last release', ['LayoutAnchors', "FancyText", ]), ('Managed Windows', ['wxFrame', 'wxDialog', 'wxMiniFrame']), @@ -43,14 +43,14 @@ _treeList = [ 'wxCalendarCtrl', ]), - ('Window Layout', ['wxLayoutConstraints', 'Sizers', ]), + ('Window Layout', ['wxLayoutConstraints', 'LayoutAnchors', 'Sizers', ]), ('Miscellaneous', [ 'DragAndDrop', 'CustomDragAndDrop', 'FontEnumerator', 'wxTimer', 'wxValidator', 'wxGLCanvas', 'DialogUnits', 'wxImage', 'wxMask', 'PrintFramework', 'wxOGL', 'PythonEvents', 'Threads', 'ActiveXWrapper_Acrobat', 'ActiveXWrapper_IE', - 'wxDragImage', + 'wxDragImage', "wxProcess", "FancyText", ]), ('wxPython Library', ['Layoutf', 'wxScrolledMessageDialog', diff --git a/wxPython/demo/bitmaps/robin.jpg b/wxPython/demo/bitmaps/robin.jpg new file mode 100644 index 0000000000..f559cad0c1 Binary files /dev/null and b/wxPython/demo/bitmaps/robin.jpg differ diff --git a/wxPython/demo/bitmaps/test2.bmp b/wxPython/demo/bitmaps/test2.bmp index 3a65473212..6f57c102c1 100644 Binary files a/wxPython/demo/bitmaps/test2.bmp and b/wxPython/demo/bitmaps/test2.bmp differ diff --git a/wxPython/demo/data/pic2.gif b/wxPython/demo/data/pic2.gif new file mode 100644 index 0000000000..a7f522a20d Binary files /dev/null and b/wxPython/demo/data/pic2.gif differ diff --git a/wxPython/demo/data/test.htm b/wxPython/demo/data/test.htm index 8ab006086e..f226786737 100644 --- a/wxPython/demo/data/test.htm +++ b/wxPython/demo/data/test.htm @@ -57,6 +57,10 @@ display some tiny nice image, he? this is text......
(try clicking on the image :-) and
this is text......
+
++Here is a GIF:
+
-
diff --git a/wxPython/demo/wxChoice.py b/wxPython/demo/wxChoice.py
index 55ddbb5ebf..20b706694b 100644
--- a/wxPython/demo/wxChoice.py
+++ b/wxPython/demo/wxChoice.py
@@ -15,8 +15,8 @@ class TestChoice(wxPanel):
wxPoint(15, 10))
wxStaticText(self, -1, "Select one:", wxPoint(15, 50), wxSize(75, 20))
- wxChoice(self, 40, wxPoint(80, 50), wxSize(95, 20), #wxDefaultSize,
- sampleList)
+ wxChoice(self, 40, (80, 50), (95, 125),
+ choices = sampleList)
EVT_CHOICE(self, 40, self.EvtChoice)
def EvtChoice(self, event):
diff --git a/wxPython/demo/wxColourDialog.py b/wxPython/demo/wxColourDialog.py
index 1f06f5cb28..e750561b93 100644
--- a/wxPython/demo/wxColourDialog.py
+++ b/wxPython/demo/wxColourDialog.py
@@ -4,9 +4,8 @@ from wxPython.wx import *
#---------------------------------------------------------------------------
def runTest(frame, nb, log):
- data = wxColourData()
- data.SetChooseFull(true)
- dlg = wxColourDialog(frame, data)
+ dlg = wxColourDialog(frame)
+ dlg.GetColourData().SetChooseFull(true)
if dlg.ShowModal() == wxID_OK:
data = dlg.GetColourData()
log.WriteText('You selected: %s\n' % str(data.GetColour().Get()))
diff --git a/wxPython/demo/wxListBox.py b/wxPython/demo/wxListBox.py
index ce659bd79c..11c21d9d90 100644
--- a/wxPython/demo/wxListBox.py
+++ b/wxPython/demo/wxListBox.py
@@ -66,7 +66,7 @@ class TestListBox(wxPanel):
EVT_LISTBOX(self, 60, self.EvtListBox)
EVT_LISTBOX_DCLICK(self, 60, self.EvtListBoxDClick)
EVT_RIGHT_UP(self.lb1, self.EvtRightButton)
- self.lb1.SetSelection(0)
+ self.lb1.SetSelection(3)
wxStaticText(self, -1, "Select many:", wxPoint(200, 50), wxSize(65, 18))
diff --git a/wxPython/demo/wxSashWindow.py b/wxPython/demo/wxSashWindow.py
index 620427eaeb..be6a46d7c5 100644
--- a/wxPython/demo/wxSashWindow.py
+++ b/wxPython/demo/wxSashWindow.py
@@ -15,7 +15,7 @@ class TestSashWindow(wxPanel):
self.log = log
- # will accupy the space not uised by the Layout Algorithm
+ # will occupy the space not used by the Layout Algorithm
self.remainingSpace = wxPanel(self, -1, style=wxSUNKEN_BORDER)
EVT_SASH_DRAGGED_RANGE(self, self.ID_WINDOW_TOP,
diff --git a/wxPython/demo/wxStaticBitmap.py b/wxPython/demo/wxStaticBitmap.py
index cb9c8df10b..5075e946c4 100644
--- a/wxPython/demo/wxStaticBitmap.py
+++ b/wxPython/demo/wxStaticBitmap.py
@@ -14,10 +14,16 @@ class TestPanel(wxPanel):
wxStaticText(self, -1, "This is a wxStaticBitmap.", wxPoint(45, 15))
bmp = wxBitmap('bitmaps/test2.bmp', wxBITMAP_TYPE_BMP)
+ mask = wxMaskColour(bmp, wxBLUE)
+ bmp.SetMask(mask)
wxStaticBitmap(self, -1, bmp, wxPoint(80, 50),
wxSize(bmp.GetWidth(), bmp.GetHeight()))
+ bmp = wxBitmap('bitmaps/robin.jpg', wxBITMAP_TYPE_JPEG)
+ wxStaticBitmap(self, -1, bmp, (80, 150))
+ wxStaticText(self, -1, "Hey, if Ousterhout can do it, so can I.",
+ (200, 175))
#----------------------------------------------------------------------
diff --git a/wxPython/demo/wxTextEntryDialog.py b/wxPython/demo/wxTextEntryDialog.py
index 08e93e237e..b0049d6506 100644
--- a/wxPython/demo/wxTextEntryDialog.py
+++ b/wxPython/demo/wxTextEntryDialog.py
@@ -26,25 +26,5 @@ def runTest(frame, nb, log):
overview = """\
-This class represents a dialog that requests a one-line text string from the user. It is implemented as a generic wxWindows dialog.
-wxTextEntryDialog()
-----------------------------------
-
-wxTextEntryDialog(wxWindow* parent, const wxString& message, const wxString& caption = "Please enter text", const wxString& defaultValue = "", long style = wxOK | wxCANCEL | wxCENTRE, const wxPoint& pos = wxDefaultPosition)
-
-Constructor. Use wxTextEntryDialog::ShowModal to show the dialog.
-
-Parameters
--------------------
-
-parent = Parent window.
-
-message = Message to show on the dialog.
-
-defaultValue = The default value, which may be the empty string.
-
-style = A dialog style, specifying the buttons (wxOK, wxCANCEL) and an optional wxCENTRE style.
-
-pos = Dialog position.
"""
diff --git a/wxPython/demo/wxToolBar.py b/wxPython/demo/wxToolBar.py
index 4a4df1b506..e8deb0b9d3 100644
--- a/wxPython/demo/wxToolBar.py
+++ b/wxPython/demo/wxToolBar.py
@@ -13,7 +13,7 @@ class TestToolBar(wxFrame):
wxWindow(self, -1).SetBackgroundColour(wxNamedColour("WHITE"))
- tb = self.CreateToolBar(wxTB_HORIZONTAL|wxNO_BORDER) #|wxTB_FLAT)
+ tb = self.CreateToolBar(wxTB_HORIZONTAL|wxNO_BORDER|wxTB_FLAT)
#tb = wxToolBarSimple(self, -1, wxDefaultPosition, wxDefaultSize,
# wxTB_HORIZONTAL | wxNO_BORDER | wxTB_FLAT)
#self.SetToolBar(tb)
diff --git a/wxPython/distrib/wxPython.WSM b/wxPython/distrib/wxPython.WSM
index 1a9e35266f..075f558178 100644
Binary files a/wxPython/distrib/wxPython.WSM and b/wxPython/distrib/wxPython.WSM differ
diff --git a/wxPython/distrib/wxPython.wse b/wxPython/distrib/wxPython.wse
index 900319ee72..bf3321be82 100644
--- a/wxPython/distrib/wxPython.wse
+++ b/wxPython/distrib/wxPython.wse
@@ -1,7 +1,7 @@
Document Type: WSE
item: Global
Version=6.01
- Title=wxPython 2.3 Installation
+ Title=wxPython 2.2 Installation
Flags=10010111
Languages=65 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Japanese Font Name=MS Gothic
@@ -17,7 +17,7 @@ item: Global
Patch Flags=0000000000001001
Patch Threshold=85
Patch Memory=4000
- EXE Filename=wxPython-2.3b1.exe
+ EXE Filename=wxPython-2.2.5-PyXX.exe
FTP Cluster Size=20
Per-User Version ID=1
Dialogs Version=6
@@ -55,12 +55,12 @@ item: End Block
end
item: Set Variable
Variable=APPTITLE
- Value=wxPython 2.3
+ Value=wxPython 2.2
Flags=10000000
end
item: Set Variable
Variable=GROUP
- Value=wxPython 2.3
+ Value=wxPython 2.2
Flags=10000000
end
item: Set Variable
@@ -72,17 +72,17 @@ item: Set Variable
Value=wxPython
Flags=10000000
end
-item: Check Configuration
- Flags=10111011
-end
item: Remark
end
item: Set Variable
Variable=PYTHONVER
- Value=2.0
+ Value=1.5
end
item: Remark
end
+item: Check Configuration
+ Flags=10111011
+end
item: Get Registry Key Value
Variable=PYTHONDIR
Key=SOFTWARE\Python\PythonCore\%PYTHONVER%\InstallPath
@@ -814,8 +814,8 @@ item: Install File
Flags=0000001010000011
end
item: Install File
- Source=c:\projects\wx\lib\wx23_0.dll
- Destination=%MAINDIR%\wxPython\wx23_0.dll
+ Source=c:\projects\wx\lib\wx22_5.dll
+ Destination=%MAINDIR%\wxPython\wx22_5.dll
Flags=0000000010010010
end
item: Install File
@@ -909,7 +909,7 @@ item: Install File
Flags=0000000010000010
end
item: Install File
- Source=c:\Projects\wx\wxPython\demo\data\*.htm
+ Source=c:\Projects\wx\wxPython\demo\data\*.html
Destination=%MAINDIR%\wxPython\demo\data
Description=Demos
Flags=0000000010000010
@@ -965,7 +965,7 @@ item: Install File
Flags=0000000010000010
end
item: Install File
- Source=c:\PROJECTS\wx\docs\html\ogl\ogl.chm
+ Source=c:\PROJECTS\wx\docs\htmlhelp\ogl.chm
Destination=%MAINDIR%\wxPython\docs\ogl.chm
Description=wxPython documentation
Flags=0000000010000010
diff --git a/wxPython/distrib/zipall.bat b/wxPython/distrib/zipall.bat
new file mode 100755
index 0000000000..c044043d11
--- /dev/null
+++ b/wxPython/distrib/zipall.bat
@@ -0,0 +1,4 @@
+
+find . | grep -v "/CVS" | grep -v "./build/" | grep -v "./distrib/" | grep -v ".pyd" | grep -v ".pdb" | grep -v "contrib/ogl/contrib" | grep -v "contrib/stc/contrib" | zip -@ wxPython.zip
+
+
diff --git a/wxPython/setup.py b/wxPython/setup.py
index 5064aaf328..6d0138973f 100755
--- a/wxPython/setup.py
+++ b/wxPython/setup.py
@@ -13,7 +13,7 @@ from my_distutils import run_swig, contrib_copy_tree
# flags and values that affect this script
#----------------------------------------------------------------------
-VERSION = "2.3b2"
+VERSION = "2.3b3"
DESCRIPTION = "Cross platform GUI toolkit for Python"
AUTHOR = "Robin Dunn"
AUTHOR_EMAIL = "robin@alldunn.com"
@@ -22,7 +22,7 @@ LICENCE = "wxWindows (LGPL derivative)"
LONG_DESCRIPTION = """\
wxPython is a GUI toolkit for Python that is a wrapper around the
wxWindows C++ GUI library. wxPython provides a large variety of
-window types and controls, all imlemented with a native look and
+window types and controls, all implemented with a native look and
feel (and native runtime speed) on the platforms it is supported
on.
"""
@@ -32,6 +32,8 @@ BUILD_GLCANVAS = 1 # If true, build the contrib/glcanvas extension module
BUILD_OGL = 1 # If true, build the contrib/ogl extension module
BUILD_STC = 1 # If true, build the contrib/stc extension module
CORE_ONLY = 0 # if true, don't build any of the above
+GL_ONLY = 0 # Only used when making the -gl RPM. See the "b" script
+ # for the ugly details
USE_SWIG = 0 # Should we actually execute SWIG, or just use the
# files already in the distribution?
@@ -189,120 +191,128 @@ else:
if IN_CVS_TREE and newer('setup.py', 'src/__version__.py'):
open('src/__version__.py', 'w').write("ver = '%s'\n" % VERSION)
+
+
#----------------------------------------------------------------------
-# Define the CORE extension module
+# SWIG defaults
#----------------------------------------------------------------------
-print 'Preparing CORE...'
swig_force = force
swig_args = ['-c++', '-shadow', '-python', '-keyword', '-dnone', #'-dascii',
'-I./src', '-D'+WXPLAT]
swig_deps = ['src/my_typemaps.i']
-swig_files = [ 'wx.i', 'windows.i', 'windows2.i', 'windows3.i', 'events.i',
- 'misc.i', 'misc2.i', 'gdi.i', 'mdi.i', 'controls.i',
- 'controls2.i', 'cmndlgs.i', 'stattool.i', 'frames.i', 'image.i',
- 'printfw.i', 'sizers.i', 'clip_dnd.i',
- 'filesys.i', 'streams.i',
- ##'grid.i', 'html.i', 'htmlhelp.i', 'calendar.i', 'utils.i',
- ]
-swig_sources = run_swig(swig_files, 'src', GENDIR, PKGDIR,
- USE_SWIG, swig_force, swig_args, swig_deps)
+#----------------------------------------------------------------------
+# Define the CORE extension module
+#----------------------------------------------------------------------
-copy_file('src/__init__.py', PKGDIR, update=1, verbose=0)
-copy_file('src/__version__.py', PKGDIR, update=1, verbose=0)
+if not GL_ONLY:
+ print 'Preparing CORE...'
+ swig_files = [ 'wx.i', 'windows.i', 'windows2.i', 'windows3.i', 'events.i',
+ 'misc.i', 'misc2.i', 'gdi.i', 'mdi.i', 'controls.i',
+ 'controls2.i', 'cmndlgs.i', 'stattool.i', 'frames.i', 'image.i',
+ 'printfw.i', 'sizers.i', 'clip_dnd.i',
+ 'filesys.i', 'streams.i',
+ ##'grid.i', 'html.i', 'htmlhelp.i', 'calendar.i', 'utils.i',
+ ]
+
+ swig_sources = run_swig(swig_files, 'src', GENDIR, PKGDIR,
+ USE_SWIG, swig_force, swig_args, swig_deps)
+
+ copy_file('src/__init__.py', PKGDIR, update=1, verbose=0)
+ copy_file('src/__version__.py', PKGDIR, update=1, verbose=0)
-if IN_CVS_TREE: # update the licence files
- mkpath('licence')
- for file in ['preamble.txt', 'licence.txt', 'licendoc.txt', 'lgpl.txt']:
- copy_file(WXDIR+'/docs/'+file, 'licence/'+file, update=1, verbose=0)
+ if IN_CVS_TREE: # update the licence files
+ mkpath('licence')
+ for file in ['preamble.txt', 'licence.txt', 'licendoc.txt', 'lgpl.txt']:
+ copy_file(WXDIR+'/docs/'+file, 'licence/'+file, update=1, verbose=0)
-if os.name == 'nt':
- rc_file = ['src/wxc.rc']
-else:
- rc_file = []
+ if os.name == 'nt':
+ rc_file = ['src/wxc.rc']
+ else:
+ rc_file = []
-ext = Extension('wxc', ['src/helpers.cpp',
- 'src/libpy.c',
- ] + rc_file + swig_sources,
+ ext = Extension('wxc', ['src/helpers.cpp',
+ 'src/libpy.c',
+ ] + rc_file + swig_sources,
- include_dirs = includes,
- define_macros = defines,
+ include_dirs = includes,
+ define_macros = defines,
- library_dirs = libdirs,
- libraries = libs,
+ library_dirs = libdirs,
+ libraries = libs,
- extra_compile_args = cflags,
- extra_link_args = lflags,
- )
-wxpExtensions.append(ext)
+ extra_compile_args = cflags,
+ extra_link_args = lflags,
+ )
+ wxpExtensions.append(ext)
-# Extension for the grid module
-swig_sources = run_swig(['grid.i'], 'src', GENDIR, PKGDIR,
- USE_SWIG, swig_force, swig_args, swig_deps)
-ext = Extension('gridc', swig_sources,
- include_dirs = includes,
- define_macros = defines,
- library_dirs = libdirs,
- libraries = libs,
- extra_compile_args = cflags,
- extra_link_args = lflags,
- )
-wxpExtensions.append(ext)
+ # Extension for the grid module
+ swig_sources = run_swig(['grid.i'], 'src', GENDIR, PKGDIR,
+ USE_SWIG, swig_force, swig_args, swig_deps)
+ ext = Extension('gridc', swig_sources,
+ include_dirs = includes,
+ define_macros = defines,
+ library_dirs = libdirs,
+ libraries = libs,
+ extra_compile_args = cflags,
+ extra_link_args = lflags,
+ )
+ wxpExtensions.append(ext)
-# Extension for the html modules
-swig_sources = run_swig(['html.i', 'htmlhelp.i'], 'src', GENDIR, PKGDIR,
- USE_SWIG, swig_force, swig_args, swig_deps)
-ext = Extension('htmlc', swig_sources,
- include_dirs = includes,
- define_macros = defines,
- library_dirs = libdirs,
- libraries = libs,
- extra_compile_args = cflags,
- extra_link_args = lflags,
- )
-wxpExtensions.append(ext)
+ # Extension for the html modules
+ swig_sources = run_swig(['html.i', 'htmlhelp.i'], 'src', GENDIR, PKGDIR,
+ USE_SWIG, swig_force, swig_args, swig_deps)
+ ext = Extension('htmlc', swig_sources,
+ include_dirs = includes,
+ define_macros = defines,
+ library_dirs = libdirs,
+ libraries = libs,
+ extra_compile_args = cflags,
+ extra_link_args = lflags,
+ )
+ wxpExtensions.append(ext)
-# Extension for the utils module
-swig_sources = run_swig(['utils.i'], 'src', GENDIR, PKGDIR,
- USE_SWIG, swig_force, swig_args, swig_deps)
-ext = Extension('utilsc', swig_sources,
- include_dirs = includes,
- define_macros = defines,
- library_dirs = libdirs,
- libraries = libs,
- extra_compile_args = cflags,
- extra_link_args = lflags,
- )
-wxpExtensions.append(ext)
+ # Extension for the utils module
+ swig_sources = run_swig(['utils.i'], 'src', GENDIR, PKGDIR,
+ USE_SWIG, swig_force, swig_args, swig_deps)
+ ext = Extension('utilsc', swig_sources,
+ include_dirs = includes,
+ define_macros = defines,
+ library_dirs = libdirs,
+ libraries = libs,
+ extra_compile_args = cflags,
+ extra_link_args = lflags,
+ )
+ wxpExtensions.append(ext)
-# Extension for the calendar module
-swig_sources = run_swig(['calendar.i'], 'src', GENDIR, PKGDIR,
- USE_SWIG, swig_force, swig_args, swig_deps)
-ext = Extension('calendarc', swig_sources,
- include_dirs = includes,
- define_macros = defines,
- library_dirs = libdirs,
- libraries = libs,
- extra_compile_args = cflags,
- extra_link_args = lflags,
- )
-wxpExtensions.append(ext)
+ # Extension for the calendar module
+ swig_sources = run_swig(['calendar.i'], 'src', GENDIR, PKGDIR,
+ USE_SWIG, swig_force, swig_args, swig_deps)
+ ext = Extension('calendarc', swig_sources,
+ include_dirs = includes,
+ define_macros = defines,
+ library_dirs = libdirs,
+ libraries = libs,
+ extra_compile_args = cflags,
+ extra_link_args = lflags,
+ )
+ wxpExtensions.append(ext)
#----------------------------------------------------------------------
# Define the GLCanvas extension module
#----------------------------------------------------------------------
-if BUILD_GLCANVAS:
+if BUILD_GLCANVAS or GL_ONLY:
print 'Preparing GLCANVAS...'
location = 'contrib/glcanvas'
swig_files = ['glcanvas.i']
@@ -337,8 +347,7 @@ if BUILD_GLCANVAS:
# Define the OGL extension module
#----------------------------------------------------------------------
-
-if BUILD_OGL:
+if not GL_ONLY and BUILD_OGL:
print 'Preparing OGL...'
location = 'contrib/ogl'
OGLLOC = location + '/contrib/src/ogl'
@@ -387,7 +396,7 @@ if BUILD_OGL:
# Define the STC extension module
#----------------------------------------------------------------------
-if BUILD_STC:
+if not GL_ONLY and BUILD_STC:
print 'Preparing STC...'
location = 'contrib/stc'
STCLOC = location + '/contrib/src/stc'
@@ -472,193 +481,44 @@ if BUILD_STC:
# Do the Setup/Build/Install/Whatever
#----------------------------------------------------------------------
-setup(name = PKGDIR,
- version = VERSION,
- description = DESCRIPTION,
- long_description = LONG_DESCRIPTION,
- author = AUTHOR,
- author_email = AUTHOR_EMAIL,
- url = URL,
- licence = LICENCE,
+if __name__ == "__main__":
+ if not GL_ONLY:
+ setup(name = PKGDIR,
+ version = VERSION,
+ description = DESCRIPTION,
+ long_description = LONG_DESCRIPTION,
+ author = AUTHOR,
+ author_email = AUTHOR_EMAIL,
+ url = URL,
+ licence = LICENCE,
- packages = [PKGDIR,
- PKGDIR+'.lib',
- PKGDIR+'.lib.editor',
- ],
+ packages = [PKGDIR,
+ PKGDIR+'.lib',
+ PKGDIR+'.lib.editor',
+ ],
- ext_package = PKGDIR,
- ext_modules = wxpExtensions,
+ ext_package = PKGDIR,
+ ext_modules = wxpExtensions,
+ )
- )
+ else:
+
+ setup(name = "wxPython-gl",
+ version = VERSION,
+ description = "wxGLCanvas class for wxPython",
+ author = AUTHOR,
+ author_email = AUTHOR_EMAIL,
+ url = URL,
+ licence = LICENCE,
+
+ py_modules = [ "wxPython.glcanvas" ],
+
+ ext_package = PKGDIR,
+ ext_modules = wxpExtensions,
+ )
#----------------------------------------------------------------------
#----------------------------------------------------------------------
-#----------------------------------------------------------------------
-
-# The pre-distutils binary distributions of wxPython included the demo
-# as a subdirectory of the package dir. This doesn't really make sense
-# for Linux/Unix platforms as it's not part of the package, and the user
-# may want to tweak and learn without having to become root first.
-#
-# For now I am going to start distributing the demo as a separate tarball,
-# but if I ever want to go back to the old way, this is how to do it the
-# distutils way:
-
-
-## from my_install_data import *
-
-## Add this to the setup() call
-## # Overridden command classes
-## cmdclass = {'install_data': my_install_data},
-## # non python files of examples
-## data_files = [
-## Data_Files(
-## base_dir='install_lib',
-## copy_to = 'wxPython',
-## #strip_dirs = 2,
-## template=[ 'graft demo',
-## 'global-exclude CVS/*'
-## ],
-## preserve_path=1
-## )
-## ],
-
-
-
-#----------------------------------------------------------------------
-#----------------------------------------------------------------------
-#----------------------------------------------------------------------
-## if not BUILD_GLCANVAS:
-## wxext.sources = wxext.sources + ['contrib/glcanvas/stub.cpp']
-## else:
-## print 'Preparing GLCANVAS...'
-## location = 'contrib/glcanvas'
-## swig_files = ['glcanvas.i']
-
-## swig_sources = run_swig(swig_files, location, GENDIR, PKGDIR,
-## USE_SWIG, swig_force, swig_args, swig_deps)
-
-## gl_libs = []
-## if os.name == 'posix':
-## if '-D__WXDEBUG__' in cflags:
-## gl_libs = ['wx_gtkd_gl', 'GL', 'GLU']
-## else:
-## gl_libs = ['wx_gtk_gl', 'GL', 'GLU']
-
-## wxext.sources = wxext.sources + swig_sources
-## wxext.libraries = wxext.libraries + gl_libs
-
-
-## if not BUILD_OGL:
-## wxext.sources = wxext.sources + ['contrib/ogl/stub.cpp']
-## else:
-## print 'Preparing OGL...'
-## location = 'contrib/ogl'
-## OGLLOC = location + '/contrib/src/ogl'
-## OGLINC = location + '/contrib/include'
-
-## swig_files = ['ogl.i', 'oglbasic.i', 'oglshapes.i', 'oglshapes2.i',
-## 'oglcanvas.i']
-
-## swig_sources = run_swig(swig_files, location, '', PKGDIR,
-## USE_SWIG, swig_force, swig_args, swig_deps)
-
-## # make sure local copy of contrib files are up to date
-## if IN_CVS_TREE:
-## contrib_copy_tree(WXDIR + '/contrib/include/wx/ogl', OGLINC+'/wx/ogl')
-## contrib_copy_tree(WXDIR + '/contrib/src/ogl', OGLLOC)
-
-## # add items to the core extension module definition
-## wxext.sources = wxext.sources + [location + '/oglhelpers.cpp',
-## '%s/basic.cpp' % OGLLOC,
-## '%s/bmpshape.cpp' % OGLLOC,
-## '%s/composit.cpp' % OGLLOC,
-## '%s/divided.cpp' % OGLLOC,
-## '%s/lines.cpp' % OGLLOC,
-## '%s/misc.cpp' % OGLLOC,
-## '%s/basic2.cpp' % OGLLOC,
-## '%s/canvas.cpp' % OGLLOC,
-## '%s/constrnt.cpp' % OGLLOC,
-## '%s/drawn.cpp' % OGLLOC,
-## '%s/mfutils.cpp' % OGLLOC,
-## '%s/ogldiag.cpp' % OGLLOC,
-## ] + swig_sources
-
-## wxext.include_dirs = wxext.include_dirs + [OGLINC]
-
-
-
-
-## if not BUILD_STC:
-## wxext.sources = wxext.sources + ['contrib/stc/stub.cpp']
-## else:
-## print 'Preparing STC...'
-## location = 'contrib/stc'
-## STCLOC = location + '/contrib/src/stc'
-## STCINC = location + '/contrib/include'
-## STC_H = location + '/contrib/include/wx/stc'
-
-## # make sure local copy of contrib files are up to date
-## if IN_CVS_TREE:
-## contrib_copy_tree(WXDIR + '/contrib/include/wx/stc', STCINC+'/wx/stc')
-## contrib_copy_tree(WXDIR + '/contrib/src/stc', STCLOC)
-
-
-## swig_files = ['stc_.i']
-## swig_sources = run_swig(swig_files, location, '', PKGDIR,
-## USE_SWIG, swig_force,
-## swig_args + ['-I'+STC_H, '-I'+location],
-## swig_deps + [STC_H+'/stc.h'])
-
-## # copy a project specific py module to the main package dir
-## copy_file(location+'/stc.py', PKGDIR, update=1, verbose=1)
-
-## # add some include dirs to the standard set
-## stc_includes = [ '%s/scintilla/include' % STCLOC,
-## '%s/scintilla/src' % STCLOC,
-## STCINC ]
-
-## # and some macro definitions
-## stc_defines = [ ('__WX__', None),
-## ('SCI_LEXER', None) ]
-
-
-## # add items to the core extension module definition
-## wxext.sources = wxext.sources + [
-## '%s/scintilla/src/AutoComplete.cxx' % STCLOC,
-## '%s/scintilla/src/CallTip.cxx' % STCLOC,
-## '%s/scintilla/src/CellBuffer.cxx' % STCLOC,
-## '%s/scintilla/src/ContractionState.cxx' % STCLOC,
-## '%s/scintilla/src/Document.cxx' % STCLOC,
-## '%s/scintilla/src/Editor.cxx' % STCLOC,
-## '%s/scintilla/src/Indicator.cxx' % STCLOC,
-## '%s/scintilla/src/KeyMap.cxx' % STCLOC,
-## '%s/scintilla/src/KeyWords.cxx' % STCLOC,
-## '%s/scintilla/src/LineMarker.cxx' % STCLOC,
-## '%s/scintilla/src/PropSet.cxx' % STCLOC,
-## '%s/scintilla/src/ScintillaBase.cxx' % STCLOC,
-## '%s/scintilla/src/Style.cxx' % STCLOC,
-## '%s/scintilla/src/ViewStyle.cxx' % STCLOC,
-## '%s/scintilla/src/LexCPP.cxx' % STCLOC,
-## '%s/scintilla/src/LexHTML.cxx' % STCLOC,
-## '%s/scintilla/src/LexLua.cxx' % STCLOC,
-## '%s/scintilla/src/LexOthers.cxx' % STCLOC,
-## '%s/scintilla/src/LexPerl.cxx' % STCLOC,
-## '%s/scintilla/src/LexPython.cxx' % STCLOC,
-## '%s/scintilla/src/LexSQL.cxx' % STCLOC,
-## '%s/scintilla/src/LexVB.cxx' % STCLOC,
-## '%s/scintilla/src/DocumentAccessor.cxx' % STCLOC,
-## '%s/scintilla/src/UniConversion.cxx' % STCLOC,
-## '%s/scintilla/src/WindowAccessor.cxx' % STCLOC,
-## '%s/scintilla/src/PosRegExp.cxx' % STCLOC,
-
-## '%s/PlatWX.cpp' % STCLOC,
-## '%s/ScintillaWX.cpp' % STCLOC,
-## '%s/stc.cpp' % STCLOC,
-## ] + swig_sources
-
-## wxext.include_dirs = wxext.include_dirs + stc_includes
-## wxext.define_macros = wxext.define_macros + stc_defines
diff --git a/wxPython/src/__version__.py b/wxPython/src/__version__.py
index d1b8c358b2..fe6f39063f 100644
--- a/wxPython/src/__version__.py
+++ b/wxPython/src/__version__.py
@@ -1 +1 @@
-ver = '2.3b2'
+ver = '2.3b3'
diff --git a/wxPython/src/_defs.i b/wxPython/src/_defs.i
index 45ba348cf1..70a7173ee2 100644
--- a/wxPython/src/_defs.i
+++ b/wxPython/src/_defs.i
@@ -218,6 +218,8 @@ enum {
wxFRAME_TOOL_WINDOW,
wxFRAME_FLOAT_ON_PARENT,
wxFRAME_NO_WINDOW_MENU,
+ wxFRAME_NO_TASKBAR,
+ wxFRAME_EX_CONTEXTHELP,
wxED_CLIENT_MARGIN,
wxED_BUTTONS_BOTTOM,
wxED_BUTTONS_RIGHT,
@@ -246,6 +248,8 @@ enum {
wxALIGN_CENTER,
wxALIGN_CENTRE,
wxSHAPED,
+ wxADJUST_MINSIZE,
+
wxLB_NEEDED_SB,
wxLB_ALWAYS_SB,
wxLB_SORT,
@@ -316,12 +320,17 @@ enum {
wxLC_MASK_TYPE,
wxLC_MASK_ALIGN,
wxLC_MASK_SORT,
+ wxLC_HRULES,
+ wxLC_VRULES,
wxSP_VERTICAL,
wxSP_HORIZONTAL,
wxSP_ARROW_KEYS,
wxSP_WRAP,
wxSP_NOBORDER,
wxSP_3D,
+ wxSP_3DSASH,
+ wxSP_3DBORDER,
+ wxSP_FULLSASH,
wxSP_BORDER,
wxSP_LIVE_UPDATE,
wxSP_PERMIT_UNSPLIT,
@@ -437,6 +446,7 @@ enum {
wxOVERWRITE_PROMPT,
wxFILE_MUST_EXIST,
wxMULTIPLE,
+ wxCHANGE_DIR,
wxACCEL_ALT,
wxACCEL_CTRL,
@@ -910,62 +920,10 @@ enum wxEventType {
wxEVT_COMMAND_KILL_FOCUS,
wxEVT_COMMAND_ENTER,
- /* Tree control event types */
- wxEVT_COMMAND_TREE_BEGIN_DRAG,
- wxEVT_COMMAND_TREE_BEGIN_RDRAG,
- wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT,
- wxEVT_COMMAND_TREE_END_LABEL_EDIT,
- wxEVT_COMMAND_TREE_DELETE_ITEM,
- wxEVT_COMMAND_TREE_GET_INFO,
- wxEVT_COMMAND_TREE_SET_INFO,
- wxEVT_COMMAND_TREE_ITEM_EXPANDED,
- wxEVT_COMMAND_TREE_ITEM_EXPANDING,
- wxEVT_COMMAND_TREE_ITEM_COLLAPSED,
- wxEVT_COMMAND_TREE_ITEM_COLLAPSING,
- wxEVT_COMMAND_TREE_SEL_CHANGED,
- wxEVT_COMMAND_TREE_SEL_CHANGING,
- wxEVT_COMMAND_TREE_KEY_DOWN,
- wxEVT_COMMAND_TREE_ITEM_ACTIVATED,
- wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK,
- wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK,
-
- /* List control event types */
- wxEVT_COMMAND_LIST_BEGIN_DRAG,
- wxEVT_COMMAND_LIST_BEGIN_RDRAG,
- wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT,
- wxEVT_COMMAND_LIST_END_LABEL_EDIT,
- wxEVT_COMMAND_LIST_DELETE_ITEM,
- wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS,
- wxEVT_COMMAND_LIST_GET_INFO,
- wxEVT_COMMAND_LIST_SET_INFO,
- wxEVT_COMMAND_LIST_ITEM_SELECTED,
- wxEVT_COMMAND_LIST_ITEM_DESELECTED,
- wxEVT_COMMAND_LIST_KEY_DOWN,
- wxEVT_COMMAND_LIST_INSERT_ITEM,
- wxEVT_COMMAND_LIST_COL_CLICK,
- wxEVT_COMMAND_LIST_ITEM_ACTIVATED,
- wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK,
- wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK,
-
-
- /* Tab and notebook control event types */
- wxEVT_COMMAND_TAB_SEL_CHANGED,
- wxEVT_COMMAND_TAB_SEL_CHANGING,
- wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED,
- wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING,
-
- /* splitter window */
- wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING,
- wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED,
- wxEVT_COMMAND_SPLITTER_UNSPLIT,
- wxEVT_COMMAND_SPLITTER_DOUBLECLICKED,
-
wxEVT_NAVIGATION_KEY,
wxEVT_TIMER,
- wxEVT_END_PROCESS,
-
};
diff --git a/wxPython/src/controls2.i b/wxPython/src/controls2.i
index 5acae12601..4080597830 100644
--- a/wxPython/src/controls2.i
+++ b/wxPython/src/controls2.i
@@ -91,6 +91,28 @@ enum wxListColumnFormat
};
+enum {
+ /* List control event types */
+ wxEVT_COMMAND_LIST_BEGIN_DRAG,
+ wxEVT_COMMAND_LIST_BEGIN_RDRAG,
+ wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT,
+ wxEVT_COMMAND_LIST_END_LABEL_EDIT,
+ wxEVT_COMMAND_LIST_DELETE_ITEM,
+ wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS,
+ wxEVT_COMMAND_LIST_GET_INFO,
+ wxEVT_COMMAND_LIST_SET_INFO,
+ wxEVT_COMMAND_LIST_ITEM_SELECTED,
+ wxEVT_COMMAND_LIST_ITEM_DESELECTED,
+ wxEVT_COMMAND_LIST_KEY_DOWN,
+ wxEVT_COMMAND_LIST_INSERT_ITEM,
+ wxEVT_COMMAND_LIST_COL_CLICK,
+ wxEVT_COMMAND_LIST_ITEM_ACTIVATED,
+ wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK,
+ wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK,
+};
+
+
+
class wxListItemAttr
{
public:
@@ -218,6 +240,7 @@ public:
%pragma(python) addtomethod = "__init__:#wx._StdWindowCallbacks(self)"
bool Arrange(int flag = wxLIST_ALIGN_DEFAULT);
+ void AssignImageList(wxImageList* imageList, int which);
bool DeleteItem(long item);
bool DeleteAllItems();
bool DeleteColumn(int col);
@@ -367,6 +390,28 @@ enum {
};
+enum {
+ /* Tree control event types */
+ wxEVT_COMMAND_TREE_BEGIN_DRAG,
+ wxEVT_COMMAND_TREE_BEGIN_RDRAG,
+ wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT,
+ wxEVT_COMMAND_TREE_END_LABEL_EDIT,
+ wxEVT_COMMAND_TREE_DELETE_ITEM,
+ wxEVT_COMMAND_TREE_GET_INFO,
+ wxEVT_COMMAND_TREE_SET_INFO,
+ wxEVT_COMMAND_TREE_ITEM_EXPANDED,
+ wxEVT_COMMAND_TREE_ITEM_EXPANDING,
+ wxEVT_COMMAND_TREE_ITEM_COLLAPSED,
+ wxEVT_COMMAND_TREE_ITEM_COLLAPSING,
+ wxEVT_COMMAND_TREE_SEL_CHANGED,
+ wxEVT_COMMAND_TREE_SEL_CHANGING,
+ wxEVT_COMMAND_TREE_KEY_DOWN,
+ wxEVT_COMMAND_TREE_ITEM_ACTIVATED,
+ wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK,
+ wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK,
+};
+
+
class wxTreeItemId {
public:
wxTreeItemId();
@@ -491,12 +536,13 @@ public:
%pragma(python) addtomethod = "__init__:#wx._StdWindowCallbacks(self)"
%pragma(python) addtomethod = "__init__:self._setSelf(self, wxTreeCtrl)"
+ void AssignImageList(wxImageList* imageList);
size_t GetCount();
unsigned int GetIndent();
void SetIndent(unsigned int indent);
wxImageList *GetImageList();
wxImageList *GetStateImageList();
- void SetImageList(wxImageList *imageList/*, int which = wxIMAGE_LIST_NORMAL*/);
+ void SetImageList(wxImageList *imageList);
void SetStateImageList(wxImageList *imageList);
unsigned int GetSpacing();
@@ -700,6 +746,15 @@ public:
#ifdef SKIPTHIS
#ifdef __WXMSW__
+
+
+enum {
+ /* tab control event types */
+ wxEVT_COMMAND_TAB_SEL_CHANGED,
+ wxEVT_COMMAND_TAB_SEL_CHANGING,
+};
+
+
class wxTabEvent : public wxCommandEvent {
public:
};
diff --git a/wxPython/src/export.h b/wxPython/src/export.h
index e674a8a6fc..79412e942e 100644
--- a/wxPython/src/export.h
+++ b/wxPython/src/export.h
@@ -21,9 +21,11 @@
#include "helpers.h"
-#define wxPyCoreAPI_IMPORT() \
- wxPyCoreAPIPtr = (wxPyCoreAPI*)PyCObject_Import("wxPython.wxc", "wxPyCoreAPI")
-
+static void wxPyCoreAPI_IMPORT() {
+ wxPyCoreAPIPtr = (wxPyCoreAPI*)PyCObject_Import("wxPython.wxc", "wxPyCoreAPI");
+ if (! wxPyCoreAPIPtr)
+ wxPyCoreAPIPtr = (wxPyCoreAPI*)PyCObject_Import("wxc", "wxPyCoreAPI");
+}
#define SWIG_MakePtr(a, b, c) (wxPyCoreAPIPtr->p_SWIG_MakePtr(a, b, c))
#define SWIG_GetPtr(a, b, c) (wxPyCoreAPIPtr->p_SWIG_GetPtr(a, b, c))
diff --git a/wxPython/src/gdi.i b/wxPython/src/gdi.i
index 8d6dbfe7a5..e66a31dd73 100644
--- a/wxPython/src/gdi.i
+++ b/wxPython/src/gdi.i
@@ -594,15 +594,6 @@ public:
//---------------------------------------------------------------------------
-#ifdef __WXMSW__
-class wxPrinterDC : public wxDC {
-public:
- wxPrinterDC(const wxString& driver, const wxString& device, const wxString& output,
- bool interactive = TRUE, int orientation = wxPORTRAIT);
-};
-#endif
-
-//---------------------------------------------------------------------------
#ifdef __WXMSW__
class wxMetaFileDC : public wxDC {
diff --git a/wxPython/src/gtk/misc2.cpp b/wxPython/src/gtk/misc2.cpp
index cc1e4cba55..633073aeb3 100644
--- a/wxPython/src/gtk/misc2.cpp
+++ b/wxPython/src/gtk/misc2.cpp
@@ -361,6 +361,111 @@ static PyObject *_wrap_wxGetTextFromUser(PyObject *self, PyObject *args, PyObjec
return _resultobj;
}
+static PyObject *_wrap_wxGetPasswordFromUser(PyObject *self, PyObject *args, PyObject *kwargs) {
+ PyObject * _resultobj;
+ wxString * _result;
+ wxString * _arg0;
+ wxString * _arg1 = (wxString *) &wxPyEmptyStr;
+ wxString * _arg2 = (wxString *) &wxPyEmptyStr;
+ wxWindow * _arg3 = (wxWindow *) NULL;
+ PyObject * _obj0 = 0;
+ PyObject * _obj1 = 0;
+ PyObject * _obj2 = 0;
+ PyObject * _argo3 = 0;
+ char *_kwnames[] = { "message","caption","default_value","parent", NULL };
+
+ self = self;
+ if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|OOO:wxGetPasswordFromUser",_kwnames,&_obj0,&_obj1,&_obj2,&_argo3))
+ return NULL;
+{
+#if PYTHON_API_VERSION >= 1009
+ char* tmpPtr; int tmpSize;
+ if (!PyString_Check(_obj0) && !PyUnicode_Check(_obj0)) {
+ PyErr_SetString(PyExc_TypeError, "String or Unicode type required");
+ return NULL;
+ }
+ if (PyString_AsStringAndSize(_obj0, &tmpPtr, &tmpSize) == -1)
+ return NULL;
+ _arg0 = new wxString(tmpPtr, tmpSize);
+#else
+ if (!PyString_Check(_obj0)) {
+ PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
+ return NULL;
+ }
+ _arg0 = new wxString(PyString_AS_STRING(_obj0), PyString_GET_SIZE(_obj0));
+#endif
+}
+ if (_obj1)
+{
+#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
+}
+ if (_obj2)
+{
+#if PYTHON_API_VERSION >= 1009
+ char* tmpPtr; int tmpSize;
+ if (!PyString_Check(_obj2) && !PyUnicode_Check(_obj2)) {
+ PyErr_SetString(PyExc_TypeError, "String or Unicode type required");
+ return NULL;
+ }
+ if (PyString_AsStringAndSize(_obj2, &tmpPtr, &tmpSize) == -1)
+ return NULL;
+ _arg2 = new wxString(tmpPtr, tmpSize);
+#else
+ if (!PyString_Check(_obj2)) {
+ PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
+ return NULL;
+ }
+ _arg2 = new wxString(PyString_AS_STRING(_obj2), PyString_GET_SIZE(_obj2));
+#endif
+}
+ if (_argo3) {
+ if (_argo3 == Py_None) { _arg3 = NULL; }
+ else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxWindow_p")) {
+ PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of wxGetPasswordFromUser. Expected _wxWindow_p.");
+ return NULL;
+ }
+ }
+{
+ wxPy_BEGIN_ALLOW_THREADS;
+ _result = new wxString (wxGetPasswordFromUser(*_arg0,*_arg1,*_arg2,_arg3));
+
+ wxPy_END_ALLOW_THREADS;
+}{
+ _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
+}
+{
+ if (_obj0)
+ delete _arg0;
+}
+{
+ if (_obj1)
+ delete _arg1;
+}
+{
+ if (_obj2)
+ delete _arg2;
+}
+{
+ delete _result;
+}
+ return _resultobj;
+}
+
static PyObject *_wrap_wxGetSingleChoice(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxString * _result;
@@ -865,62 +970,6 @@ static PyObject *_wrap_wxGetDisplaySize(PyObject *self, PyObject *args, PyObject
return _resultobj;
}
-static PyObject *_wrap_wxDisplaySizeMM(PyObject *self, PyObject *args, PyObject *kwargs) {
- PyObject * _resultobj;
- int * _arg0;
- int temp;
- int * _arg1;
- int temp0;
- char *_kwnames[] = { NULL };
-
- self = self;
-{
- _arg0 = &temp;
-}
-{
- _arg1 = &temp0;
-}
- if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxDisplaySizeMM",_kwnames))
- return NULL;
-{
- wxPy_BEGIN_ALLOW_THREADS;
- wxDisplaySizeMM(_arg0,_arg1);
-
- wxPy_END_ALLOW_THREADS;
-} Py_INCREF(Py_None);
- _resultobj = Py_None;
-{
- PyObject *o;
- o = PyInt_FromLong((long) (*_arg0));
- _resultobj = t_output_helper(_resultobj, o);
-}
-{
- PyObject *o;
- o = PyInt_FromLong((long) (*_arg1));
- _resultobj = t_output_helper(_resultobj, o);
-}
- return _resultobj;
-}
-
-static PyObject *_wrap_wxGetDisplaySizeMM(PyObject *self, PyObject *args, PyObject *kwargs) {
- PyObject * _resultobj;
- wxSize * _result;
- char *_kwnames[] = { NULL };
- char _ptemp[128];
-
- self = self;
- if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxGetDisplaySizeMM",_kwnames))
- return NULL;
-{
- wxPy_BEGIN_ALLOW_THREADS;
- _result = new wxSize (wxGetDisplaySizeMM());
-
- wxPy_END_ALLOW_THREADS;
-} SWIG_MakePtr(_ptemp, (void *) _result,"_wxSize_p");
- _resultobj = Py_BuildValue("s",_ptemp);
- return _resultobj;
-}
-
static PyObject *_wrap_wxSetCursor(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxCursor * _arg0;
@@ -5362,8 +5411,6 @@ static PyMethodDef misc2cMethods[] = {
{ "wxFindWindowByName", (PyCFunction) _wrap_wxFindWindowByName, METH_VARARGS | METH_KEYWORDS },
{ "wxFindWindowByLabel", (PyCFunction) _wrap_wxFindWindowByLabel, METH_VARARGS | METH_KEYWORDS },
{ "wxSetCursor", (PyCFunction) _wrap_wxSetCursor, METH_VARARGS | METH_KEYWORDS },
- { "wxGetDisplaySizeMM", (PyCFunction) _wrap_wxGetDisplaySizeMM, METH_VARARGS | METH_KEYWORDS },
- { "wxDisplaySizeMM", (PyCFunction) _wrap_wxDisplaySizeMM, METH_VARARGS | METH_KEYWORDS },
{ "wxGetDisplaySize", (PyCFunction) _wrap_wxGetDisplaySize, METH_VARARGS | METH_KEYWORDS },
{ "wxDisplaySize", (PyCFunction) _wrap_wxDisplaySize, METH_VARARGS | METH_KEYWORDS },
{ "wxGetDisplayDepth", (PyCFunction) _wrap_wxGetDisplayDepth, METH_VARARGS | METH_KEYWORDS },
@@ -5373,6 +5420,7 @@ static PyMethodDef misc2cMethods[] = {
{ "wxMessageBox", (PyCFunction) _wrap_wxMessageBox, METH_VARARGS | METH_KEYWORDS },
{ "wxGetSingleChoiceIndex", (PyCFunction) _wrap_wxGetSingleChoiceIndex, METH_VARARGS | METH_KEYWORDS },
{ "wxGetSingleChoice", (PyCFunction) _wrap_wxGetSingleChoice, METH_VARARGS | METH_KEYWORDS },
+ { "wxGetPasswordFromUser", (PyCFunction) _wrap_wxGetPasswordFromUser, METH_VARARGS | METH_KEYWORDS },
{ "wxGetTextFromUser", (PyCFunction) _wrap_wxGetTextFromUser, METH_VARARGS | METH_KEYWORDS },
{ "wxFileSelector", (PyCFunction) _wrap_wxFileSelector, METH_VARARGS | METH_KEYWORDS },
{ NULL, NULL }
diff --git a/wxPython/src/gtk/misc2.py b/wxPython/src/gtk/misc2.py
index 9c69cbc476..2d7b08bedf 100644
--- a/wxPython/src/gtk/misc2.py
+++ b/wxPython/src/gtk/misc2.py
@@ -479,6 +479,8 @@ wxFileSelector = misc2c.wxFileSelector
wxGetTextFromUser = misc2c.wxGetTextFromUser
+wxGetPasswordFromUser = misc2c.wxGetPasswordFromUser
+
wxGetSingleChoice = misc2c.wxGetSingleChoice
wxGetSingleChoiceIndex = misc2c.wxGetSingleChoiceIndex
@@ -500,13 +502,6 @@ def wxGetDisplaySize(*_args, **_kwargs):
if val: val = wxSizePtr(val); val.thisown = 1
return val
-wxDisplaySizeMM = misc2c.wxDisplaySizeMM
-
-def wxGetDisplaySizeMM(*_args, **_kwargs):
- val = apply(misc2c.wxGetDisplaySizeMM,_args,_kwargs)
- if val: val = wxSizePtr(val); val.thisown = 1
- return val
-
wxSetCursor = misc2c.wxSetCursor
def wxFindWindowByLabel(*_args, **_kwargs):
diff --git a/wxPython/src/gtk/windows3.cpp b/wxPython/src/gtk/windows3.cpp
index 8abbf324a4..0f6aa9d8e4 100644
--- a/wxPython/src/gtk/windows3.cpp
+++ b/wxPython/src/gtk/windows3.cpp
@@ -2137,6 +2137,9 @@ SWIGEXPORT(void) initwindows3c() {
PyDict_SetItemString(d,"wxSASH_NONE", PyInt_FromLong((long) wxSASH_NONE));
PyDict_SetItemString(d,"wxEVT_SASH_DRAGGED", PyInt_FromLong((long) wxEVT_SASH_DRAGGED));
PyDict_SetItemString(d,"wxSW_3D", PyInt_FromLong((long) wxSW_3D));
+ PyDict_SetItemString(d,"wxSW_3DSASH", PyInt_FromLong((long) wxSW_3DSASH));
+ PyDict_SetItemString(d,"wxSW_3DBORDER", PyInt_FromLong((long) wxSW_3DBORDER));
+ PyDict_SetItemString(d,"wxSW_BORDER", PyInt_FromLong((long) wxSW_BORDER));
PyDict_SetItemString(d,"wxSASH_STATUS_OK", PyInt_FromLong((long) wxSASH_STATUS_OK));
PyDict_SetItemString(d,"wxSASH_STATUS_OUT_OF_RANGE", PyInt_FromLong((long) wxSASH_STATUS_OUT_OF_RANGE));
PyDict_SetItemString(d,"wxLAYOUT_HORIZONTAL", PyInt_FromLong((long) wxLAYOUT_HORIZONTAL));
diff --git a/wxPython/src/gtk/windows3.py b/wxPython/src/gtk/windows3.py
index 33b2785627..7a6fd3ac16 100644
--- a/wxPython/src/gtk/windows3.py
+++ b/wxPython/src/gtk/windows3.py
@@ -262,6 +262,9 @@ wxSASH_LEFT = windows3c.wxSASH_LEFT
wxSASH_NONE = windows3c.wxSASH_NONE
wxEVT_SASH_DRAGGED = windows3c.wxEVT_SASH_DRAGGED
wxSW_3D = windows3c.wxSW_3D
+wxSW_3DSASH = windows3c.wxSW_3DSASH
+wxSW_3DBORDER = windows3c.wxSW_3DBORDER
+wxSW_BORDER = windows3c.wxSW_BORDER
wxSASH_STATUS_OK = windows3c.wxSASH_STATUS_OK
wxSASH_STATUS_OUT_OF_RANGE = windows3c.wxSASH_STATUS_OUT_OF_RANGE
wxLAYOUT_HORIZONTAL = windows3c.wxLAYOUT_HORIZONTAL
diff --git a/wxPython/src/gtk/wx.cpp b/wxPython/src/gtk/wx.cpp
index d1b80b4dcc..afcaa16328 100644
--- a/wxPython/src/gtk/wx.cpp
+++ b/wxPython/src/gtk/wx.cpp
@@ -2393,6 +2393,9 @@ SWIGEXPORT(void) initwxc() {
PyDict_SetItemString(d,"wxSP_WRAP", PyInt_FromLong((long) wxSP_WRAP));
PyDict_SetItemString(d,"wxSP_NOBORDER", PyInt_FromLong((long) wxSP_NOBORDER));
PyDict_SetItemString(d,"wxSP_3D", PyInt_FromLong((long) wxSP_3D));
+ PyDict_SetItemString(d,"wxSP_3DSASH", PyInt_FromLong((long) wxSP_3DSASH));
+ PyDict_SetItemString(d,"wxSP_3DBORDER", PyInt_FromLong((long) wxSP_3DBORDER));
+ PyDict_SetItemString(d,"wxSP_FULLSASH", PyInt_FromLong((long) wxSP_FULLSASH));
PyDict_SetItemString(d,"wxSP_BORDER", PyInt_FromLong((long) wxSP_BORDER));
PyDict_SetItemString(d,"wxSP_LIVE_UPDATE", PyInt_FromLong((long) wxSP_LIVE_UPDATE));
PyDict_SetItemString(d,"wxSP_PERMIT_UNSPLIT", PyInt_FromLong((long) wxSP_PERMIT_UNSPLIT));
diff --git a/wxPython/src/gtk/wx.py b/wxPython/src/gtk/wx.py
index abfdcf2279..63c5c1b3e5 100644
--- a/wxPython/src/gtk/wx.py
+++ b/wxPython/src/gtk/wx.py
@@ -301,6 +301,9 @@ wxSP_ARROW_KEYS = wxc.wxSP_ARROW_KEYS
wxSP_WRAP = wxc.wxSP_WRAP
wxSP_NOBORDER = wxc.wxSP_NOBORDER
wxSP_3D = wxc.wxSP_3D
+wxSP_3DSASH = wxc.wxSP_3DSASH
+wxSP_3DBORDER = wxc.wxSP_3DBORDER
+wxSP_FULLSASH = wxc.wxSP_FULLSASH
wxSP_BORDER = wxc.wxSP_BORDER
wxSP_LIVE_UPDATE = wxc.wxSP_LIVE_UPDATE
wxSP_PERMIT_UNSPLIT = wxc.wxSP_PERMIT_UNSPLIT
diff --git a/wxPython/src/htmlhelp.i b/wxPython/src/htmlhelp.i
index 0715d1ae0b..1947f066ab 100644
--- a/wxPython/src/htmlhelp.i
+++ b/wxPython/src/htmlhelp.i
@@ -37,9 +37,9 @@
%extern controls2.i
%extern utils.i
-
%extern html.i
+
//---------------------------------------------------------------------------
enum {
diff --git a/wxPython/src/libpy.c b/wxPython/src/libpy.c
index 7f05d84e59..d8d22da4f4 100644
--- a/wxPython/src/libpy.c
+++ b/wxPython/src/libpy.c
@@ -405,13 +405,32 @@ SWIG_GetPtrObj(PyObject *obj, void **ptr, char *type) {
if (!PyString_Check(obj)) {
if (!PyInstance_Check(obj) || !(sobj = PyObject_GetAttrString(obj,"this")))
return "";
+ // PyObject_GetAttrString increases sobj refcout !
+ Py_DECREF(sobj);
}
str = PyString_AsString(sobj);
return SWIG_GetPtr(str,ptr,type);
}
+
#ifdef __cplusplus
}
#endif
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/wxPython/src/misc.i b/wxPython/src/misc.i
index 70e22c48ac..74b104185d 100644
--- a/wxPython/src/misc.i
+++ b/wxPython/src/misc.i
@@ -60,8 +60,17 @@ public:
return tup;
}
}
- %pragma(python) addtoclass = "def __str__(self): return str(self.asTuple())"
- %pragma(python) addtoclass = "def __repr__(self): return str(self.asTuple())"
+
+ %pragma(python) addtoclass = "
+ def __str__(self): return str(self.asTuple())
+ def __repr__(self): return str(self.asTuple())
+ def __len__(self): return len(self.asTuple()
+ def __getitem__(self, index): return self.asTuple()[index]
+ def __setitem__(self, index, val):
+ if index == 0: self.width = val
+ elif index == 1: self.height = val
+ else: raise IndexError
+"
};
@@ -101,8 +110,16 @@ public:
return *self == *p;
}
}
- %pragma(python) addtoclass = "def __str__(self): return str(self.asTuple())"
- %pragma(python) addtoclass = "def __repr__(self): return str(self.asTuple())"
+ %pragma(python) addtoclass = "
+ def __str__(self): return str(self.asTuple())
+ def __repr__(self): return str(self.asTuple())
+ def __len__(self): return len(self.asTuple()
+ def __getitem__(self, index): return self.asTuple()[index]
+ def __setitem__(self, index, val):
+ if index == 0: self.width = val
+ elif index == 1: self.height = val
+ else: raise IndexError
+"
};
@@ -140,8 +157,16 @@ public:
return *self == *p;
}
}
- %pragma(python) addtoclass = "def __str__(self): return str(self.asTuple())"
- %pragma(python) addtoclass = "def __repr__(self): return str(self.asTuple())"
+ %pragma(python) addtoclass = "
+ def __str__(self): return str(self.asTuple())
+ def __repr__(self): return str(self.asTuple())
+ def __len__(self): return len(self.asTuple()
+ def __getitem__(self, index): return self.asTuple()[index]
+ def __setitem__(self, index, val):
+ if index == 0: self.x = val
+ elif index == 1: self.y = val
+ else: raise IndexError
+"
};
//---------------------------------------------------------------------------
@@ -201,9 +226,18 @@ public:
}
}
- %pragma(python) addtoclass = "def __str__(self): return str(self.asTuple())"
- %pragma(python) addtoclass = "def __repr__(self): return str(self.asTuple())"
%pragma(python) addtoclass = "
+ def __str__(self): return str(self.asTuple())
+ def __repr__(self): return str(self.asTuple())
+ def __len__(self): return len(self.asTuple()
+ def __getitem__(self, index): return self.asTuple()[index]
+ def __setitem__(self, index, val):
+ if index == 0: self.x = val
+ elif index == 1: self.y = val
+ elif index == 2: self.width = val
+ elif index == 3: self.height = val
+ else: raise IndexError
+
# override the __getattr__ made by SWIG
def __getattr__(self, name):
d = {
diff --git a/wxPython/src/misc2.i b/wxPython/src/misc2.i
index e594ee49c6..e68acb89f9 100644
--- a/wxPython/src/misc2.i
+++ b/wxPython/src/misc2.i
@@ -61,6 +61,11 @@ wxString wxGetTextFromUser(const wxString& message,
int x = -1, int y = -1,
bool centre = TRUE);
+wxString wxGetPasswordFromUser(const wxString& message,
+ const wxString& caption = wxPyEmptyStr,
+ const wxString& default_value = wxPyEmptyStr,
+ wxWindow *parent = NULL);
+
// TODO: Need to custom wrap this one...
// int wxGetMultipleChoice(char* message, char* caption,
@@ -109,6 +114,7 @@ int wxGetDisplayDepth();
void wxDisplaySize(int* OUTPUT, int* OUTPUT);
wxSize wxGetDisplaySize();
+
void wxDisplaySizeMM(int* OUTPUT, int* OUTPUT);
wxSize wxGetDisplaySizeMM();
@@ -625,6 +631,13 @@ void wxLogSysError(const char *szFormat);
//----------------------------------------------------------------------
+
+enum {
+ /* event type */
+ wxEVT_END_PROCESS
+};
+
+
class wxProcessEvent : public wxEvent {
public:
wxProcessEvent(int id = 0, int pid = 0, int exitcode = 0);
diff --git a/wxPython/src/msw/calendar.cpp b/wxPython/src/msw/calendar.cpp
index 242c2ca34b..232a7de8bc 100644
--- a/wxPython/src/msw/calendar.cpp
+++ b/wxPython/src/msw/calendar.cpp
@@ -1729,7 +1729,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_size_t","_uint",0},
{ "_class_wxRealPoint","_wxRealPoint",0},
{ "_wxNavigationKeyEvent","_class_wxNavigationKeyEvent",0},
- { "_wxPrinterDC","_class_wxPrinterDC",0},
{ "_wxWindowCreateEvent","_class_wxWindowCreateEvent",0},
{ "_class_wxMenuItem","_wxMenuItem",0},
{ "_class_wxPaintEvent","_wxPaintEvent",0},
@@ -1948,7 +1947,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxButton","_class_wxButton",0},
{ "_wxSize","_class_wxSize",0},
{ "_wxRegionIterator","_class_wxRegionIterator",0},
- { "_class_wxPrinterDC","_wxPrinterDC",0},
{ "_class_wxPyTextDataObject","_wxPyTextDataObject",0},
{ "_class_wxTimeSpan","_wxTimeSpan",0},
{ "_class_wxPaintDC","_wxPaintDC",0},
diff --git a/wxPython/src/msw/clip_dnd.cpp b/wxPython/src/msw/clip_dnd.cpp
index cfb9bc878b..d4ccd97f49 100644
--- a/wxPython/src/msw/clip_dnd.cpp
+++ b/wxPython/src/msw/clip_dnd.cpp
@@ -3515,7 +3515,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_size_t","_wxWindowID",0},
{ "_size_t","_uint",0},
{ "_class_wxRealPoint","_wxRealPoint",0},
- { "_wxPrinterDC","_class_wxPrinterDC",0},
{ "_class_wxMask","_wxMask",0},
{ "_wxTextDataObject","_class_wxPyTextDataObject",SwigwxPyTextDataObjectTowxTextDataObject},
{ "_wxTextDataObject","_wxPyTextDataObject",SwigwxPyTextDataObjectTowxTextDataObject},
@@ -3680,7 +3679,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_time_t","_size_t",0},
{ "_wxSize","_class_wxSize",0},
{ "_wxRegionIterator","_class_wxRegionIterator",0},
- { "_class_wxPrinterDC","_wxPrinterDC",0},
{ "_class_wxPyTextDataObject","_wxPyTextDataObject",0},
{ "_class_wxPaintDC","_wxPaintDC",0},
{ "_class_wxPyFileDropTarget","_wxPyFileDropTarget",0},
diff --git a/wxPython/src/msw/cmndlgs.cpp b/wxPython/src/msw/cmndlgs.cpp
index c4645576f1..aaed3689ec 100644
--- a/wxPython/src/msw/cmndlgs.cpp
+++ b/wxPython/src/msw/cmndlgs.cpp
@@ -2966,7 +2966,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_size_t","_uint",0},
{ "_class_wxRealPoint","_wxRealPoint",0},
{ "_wxNavigationKeyEvent","_class_wxNavigationKeyEvent",0},
- { "_wxPrinterDC","_class_wxPrinterDC",0},
{ "_wxWindowCreateEvent","_class_wxWindowCreateEvent",0},
{ "_class_wxMenuItem","_wxMenuItem",0},
{ "_class_wxPaintEvent","_wxPaintEvent",0},
@@ -3253,7 +3252,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxButton","_class_wxButton",0},
{ "_wxSize","_class_wxSize",0},
{ "_wxRegionIterator","_class_wxRegionIterator",0},
- { "_class_wxPrinterDC","_wxPrinterDC",0},
{ "_class_wxPyTextDataObject","_wxPyTextDataObject",0},
{ "_class_wxPaintDC","_wxPaintDC",0},
{ "_class_wxSysColourChangedEvent","_wxSysColourChangedEvent",0},
diff --git a/wxPython/src/msw/controls.cpp b/wxPython/src/msw/controls.cpp
index ca3e1931f8..7c63d3c250 100644
--- a/wxPython/src/msw/controls.cpp
+++ b/wxPython/src/msw/controls.cpp
@@ -8098,7 +8098,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_size_t","_uint",0},
{ "_class_wxRealPoint","_wxRealPoint",0},
{ "_wxNavigationKeyEvent","_class_wxNavigationKeyEvent",0},
- { "_wxPrinterDC","_class_wxPrinterDC",0},
{ "_wxWindowCreateEvent","_class_wxWindowCreateEvent",0},
{ "_class_wxMenuItem","_wxMenuItem",0},
{ "_class_wxPaintEvent","_wxPaintEvent",0},
@@ -8384,7 +8383,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxButton","_class_wxButton",0},
{ "_wxSize","_class_wxSize",0},
{ "_wxRegionIterator","_class_wxRegionIterator",0},
- { "_class_wxPrinterDC","_wxPrinterDC",0},
{ "_class_wxPyTextDataObject","_wxPyTextDataObject",0},
{ "_class_wxPaintDC","_wxPaintDC",0},
{ "_class_wxSysColourChangedEvent","_wxSysColourChangedEvent",0},
diff --git a/wxPython/src/msw/controls2.cpp b/wxPython/src/msw/controls2.cpp
index e6084cd765..3375c1d964 100644
--- a/wxPython/src/msw/controls2.cpp
+++ b/wxPython/src/msw/controls2.cpp
@@ -2930,6 +2930,43 @@ static PyObject *_wrap_wxListCtrl_Arrange(PyObject *self, PyObject *args, PyObje
return _resultobj;
}
+#define wxListCtrl_AssignImageList(_swigobj,_swigarg0,_swigarg1) (_swigobj->AssignImageList(_swigarg0,_swigarg1))
+static PyObject *_wrap_wxListCtrl_AssignImageList(PyObject *self, PyObject *args, PyObject *kwargs) {
+ PyObject * _resultobj;
+ wxListCtrl * _arg0;
+ wxImageList * _arg1;
+ int _arg2;
+ PyObject * _argo0 = 0;
+ PyObject * _argo1 = 0;
+ char *_kwnames[] = { "self","imageList","which", NULL };
+
+ self = self;
+ if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOi:wxListCtrl_AssignImageList",_kwnames,&_argo0,&_argo1,&_arg2))
+ return NULL;
+ if (_argo0) {
+ if (_argo0 == Py_None) { _arg0 = NULL; }
+ else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListCtrl_p")) {
+ PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_AssignImageList. Expected _wxListCtrl_p.");
+ return NULL;
+ }
+ }
+ if (_argo1) {
+ if (_argo1 == Py_None) { _arg1 = NULL; }
+ else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxImageList_p")) {
+ PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxListCtrl_AssignImageList. Expected _wxImageList_p.");
+ return NULL;
+ }
+ }
+{
+ wxPy_BEGIN_ALLOW_THREADS;
+ wxListCtrl_AssignImageList(_arg0,_arg1,_arg2);
+
+ wxPy_END_ALLOW_THREADS;
+} Py_INCREF(Py_None);
+ _resultobj = Py_None;
+ return _resultobj;
+}
+
#define wxListCtrl_DeleteItem(_swigobj,_swigarg0) (_swigobj->DeleteItem(_swigarg0))
static PyObject *_wrap_wxListCtrl_DeleteItem(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -5269,6 +5306,42 @@ static PyObject *_wrap_wxTreeCtrl__setSelf(PyObject *self, PyObject *args, PyObj
return _resultobj;
}
+#define wxTreeCtrl_AssignImageList(_swigobj,_swigarg0) (_swigobj->AssignImageList(_swigarg0))
+static PyObject *_wrap_wxTreeCtrl_AssignImageList(PyObject *self, PyObject *args, PyObject *kwargs) {
+ PyObject * _resultobj;
+ wxPyTreeCtrl * _arg0;
+ wxImageList * _arg1;
+ PyObject * _argo0 = 0;
+ PyObject * _argo1 = 0;
+ char *_kwnames[] = { "self","imageList", NULL };
+
+ self = self;
+ if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxTreeCtrl_AssignImageList",_kwnames,&_argo0,&_argo1))
+ return NULL;
+ if (_argo0) {
+ if (_argo0 == Py_None) { _arg0 = NULL; }
+ else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyTreeCtrl_p")) {
+ PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_AssignImageList. Expected _wxPyTreeCtrl_p.");
+ return NULL;
+ }
+ }
+ if (_argo1) {
+ if (_argo1 == Py_None) { _arg1 = NULL; }
+ else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxImageList_p")) {
+ PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_AssignImageList. Expected _wxImageList_p.");
+ return NULL;
+ }
+ }
+{
+ wxPy_BEGIN_ALLOW_THREADS;
+ wxTreeCtrl_AssignImageList(_arg0,_arg1);
+
+ wxPy_END_ALLOW_THREADS;
+} Py_INCREF(Py_None);
+ _resultobj = Py_None;
+ return _resultobj;
+}
+
#define wxTreeCtrl_GetCount(_swigobj) (_swigobj->GetCount())
static PyObject *_wrap_wxTreeCtrl_GetCount(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -7998,6 +8071,7 @@ static PyMethodDef controls2cMethods[] = {
{ "wxTreeCtrl_SetIndent", (PyCFunction) _wrap_wxTreeCtrl_SetIndent, METH_VARARGS | METH_KEYWORDS },
{ "wxTreeCtrl_GetIndent", (PyCFunction) _wrap_wxTreeCtrl_GetIndent, METH_VARARGS | METH_KEYWORDS },
{ "wxTreeCtrl_GetCount", (PyCFunction) _wrap_wxTreeCtrl_GetCount, METH_VARARGS | METH_KEYWORDS },
+ { "wxTreeCtrl_AssignImageList", (PyCFunction) _wrap_wxTreeCtrl_AssignImageList, METH_VARARGS | METH_KEYWORDS },
{ "wxTreeCtrl__setSelf", (PyCFunction) _wrap_wxTreeCtrl__setSelf, METH_VARARGS | METH_KEYWORDS },
{ "new_wxTreeCtrl", (PyCFunction) _wrap_new_wxTreeCtrl, METH_VARARGS | METH_KEYWORDS },
{ "wxTreeEvent_GetLabel", (PyCFunction) _wrap_wxTreeEvent_GetLabel, METH_VARARGS | METH_KEYWORDS },
@@ -8065,6 +8139,7 @@ static PyMethodDef controls2cMethods[] = {
{ "wxListCtrl_DeleteColumn", (PyCFunction) _wrap_wxListCtrl_DeleteColumn, METH_VARARGS | METH_KEYWORDS },
{ "wxListCtrl_DeleteAllItems", (PyCFunction) _wrap_wxListCtrl_DeleteAllItems, METH_VARARGS | METH_KEYWORDS },
{ "wxListCtrl_DeleteItem", (PyCFunction) _wrap_wxListCtrl_DeleteItem, METH_VARARGS | METH_KEYWORDS },
+ { "wxListCtrl_AssignImageList", (PyCFunction) _wrap_wxListCtrl_AssignImageList, METH_VARARGS | METH_KEYWORDS },
{ "wxListCtrl_Arrange", (PyCFunction) _wrap_wxListCtrl_Arrange, METH_VARARGS | METH_KEYWORDS },
{ "new_wxListCtrl", (PyCFunction) _wrap_new_wxListCtrl, METH_VARARGS | METH_KEYWORDS },
{ "wxListEvent_GetItem", (PyCFunction) _wrap_wxListEvent_GetItem, METH_VARARGS | METH_KEYWORDS },
@@ -8237,7 +8312,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_size_t","_uint",0},
{ "_class_wxRealPoint","_wxRealPoint",0},
{ "_wxNavigationKeyEvent","_class_wxNavigationKeyEvent",0},
- { "_wxPrinterDC","_class_wxPrinterDC",0},
{ "_wxWindowCreateEvent","_class_wxWindowCreateEvent",0},
{ "_class_wxMenuItem","_wxMenuItem",0},
{ "_class_wxPaintEvent","_wxPaintEvent",0},
@@ -8459,7 +8533,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxButton","_class_wxButton",0},
{ "_wxSize","_class_wxSize",0},
{ "_wxRegionIterator","_class_wxRegionIterator",0},
- { "_class_wxPrinterDC","_wxPrinterDC",0},
{ "_class_wxPyTextDataObject","_wxPyTextDataObject",0},
{ "_wxPyTreeItemData","_class_wxPyTreeItemData",0},
{ "_class_wxPaintDC","_wxPaintDC",0},
@@ -8592,6 +8665,22 @@ SWIGEXPORT(void) initcontrols2c() {
PyDict_SetItemString(d,"wxLIST_FORMAT_RIGHT", PyInt_FromLong((long) wxLIST_FORMAT_RIGHT));
PyDict_SetItemString(d,"wxLIST_FORMAT_CENTRE", PyInt_FromLong((long) wxLIST_FORMAT_CENTRE));
PyDict_SetItemString(d,"wxLIST_FORMAT_CENTER", PyInt_FromLong((long) wxLIST_FORMAT_CENTER));
+ PyDict_SetItemString(d,"wxEVT_COMMAND_LIST_BEGIN_DRAG", PyInt_FromLong((long) wxEVT_COMMAND_LIST_BEGIN_DRAG));
+ PyDict_SetItemString(d,"wxEVT_COMMAND_LIST_BEGIN_RDRAG", PyInt_FromLong((long) wxEVT_COMMAND_LIST_BEGIN_RDRAG));
+ PyDict_SetItemString(d,"wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT", PyInt_FromLong((long) wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT));
+ PyDict_SetItemString(d,"wxEVT_COMMAND_LIST_END_LABEL_EDIT", PyInt_FromLong((long) wxEVT_COMMAND_LIST_END_LABEL_EDIT));
+ PyDict_SetItemString(d,"wxEVT_COMMAND_LIST_DELETE_ITEM", PyInt_FromLong((long) wxEVT_COMMAND_LIST_DELETE_ITEM));
+ PyDict_SetItemString(d,"wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS", PyInt_FromLong((long) wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS));
+ PyDict_SetItemString(d,"wxEVT_COMMAND_LIST_GET_INFO", PyInt_FromLong((long) wxEVT_COMMAND_LIST_GET_INFO));
+ PyDict_SetItemString(d,"wxEVT_COMMAND_LIST_SET_INFO", PyInt_FromLong((long) wxEVT_COMMAND_LIST_SET_INFO));
+ PyDict_SetItemString(d,"wxEVT_COMMAND_LIST_ITEM_SELECTED", PyInt_FromLong((long) wxEVT_COMMAND_LIST_ITEM_SELECTED));
+ PyDict_SetItemString(d,"wxEVT_COMMAND_LIST_ITEM_DESELECTED", PyInt_FromLong((long) wxEVT_COMMAND_LIST_ITEM_DESELECTED));
+ PyDict_SetItemString(d,"wxEVT_COMMAND_LIST_KEY_DOWN", PyInt_FromLong((long) wxEVT_COMMAND_LIST_KEY_DOWN));
+ PyDict_SetItemString(d,"wxEVT_COMMAND_LIST_INSERT_ITEM", PyInt_FromLong((long) wxEVT_COMMAND_LIST_INSERT_ITEM));
+ PyDict_SetItemString(d,"wxEVT_COMMAND_LIST_COL_CLICK", PyInt_FromLong((long) wxEVT_COMMAND_LIST_COL_CLICK));
+ PyDict_SetItemString(d,"wxEVT_COMMAND_LIST_ITEM_ACTIVATED", PyInt_FromLong((long) wxEVT_COMMAND_LIST_ITEM_ACTIVATED));
+ PyDict_SetItemString(d,"wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK", PyInt_FromLong((long) wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK));
+ PyDict_SetItemString(d,"wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK", PyInt_FromLong((long) wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK));
PyDict_SetItemString(d,"wxTreeItemIcon_Normal", PyInt_FromLong((long) wxTreeItemIcon_Normal));
PyDict_SetItemString(d,"wxTreeItemIcon_Selected", PyInt_FromLong((long) wxTreeItemIcon_Selected));
PyDict_SetItemString(d,"wxTreeItemIcon_Expanded", PyInt_FromLong((long) wxTreeItemIcon_Expanded));
@@ -8611,6 +8700,23 @@ SWIGEXPORT(void) initcontrols2c() {
PyDict_SetItemString(d,"wxTREE_HITTEST_ONITEMUPPERPART", PyInt_FromLong((long) wxTREE_HITTEST_ONITEMUPPERPART));
PyDict_SetItemString(d,"wxTREE_HITTEST_ONITEMLOWERPART", PyInt_FromLong((long) wxTREE_HITTEST_ONITEMLOWERPART));
PyDict_SetItemString(d,"wxTREE_HITTEST_ONITEM", PyInt_FromLong((long) wxTREE_HITTEST_ONITEM));
+ PyDict_SetItemString(d,"wxEVT_COMMAND_TREE_BEGIN_DRAG", PyInt_FromLong((long) wxEVT_COMMAND_TREE_BEGIN_DRAG));
+ PyDict_SetItemString(d,"wxEVT_COMMAND_TREE_BEGIN_RDRAG", PyInt_FromLong((long) wxEVT_COMMAND_TREE_BEGIN_RDRAG));
+ PyDict_SetItemString(d,"wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT", PyInt_FromLong((long) wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT));
+ PyDict_SetItemString(d,"wxEVT_COMMAND_TREE_END_LABEL_EDIT", PyInt_FromLong((long) wxEVT_COMMAND_TREE_END_LABEL_EDIT));
+ PyDict_SetItemString(d,"wxEVT_COMMAND_TREE_DELETE_ITEM", PyInt_FromLong((long) wxEVT_COMMAND_TREE_DELETE_ITEM));
+ PyDict_SetItemString(d,"wxEVT_COMMAND_TREE_GET_INFO", PyInt_FromLong((long) wxEVT_COMMAND_TREE_GET_INFO));
+ PyDict_SetItemString(d,"wxEVT_COMMAND_TREE_SET_INFO", PyInt_FromLong((long) wxEVT_COMMAND_TREE_SET_INFO));
+ PyDict_SetItemString(d,"wxEVT_COMMAND_TREE_ITEM_EXPANDED", PyInt_FromLong((long) wxEVT_COMMAND_TREE_ITEM_EXPANDED));
+ PyDict_SetItemString(d,"wxEVT_COMMAND_TREE_ITEM_EXPANDING", PyInt_FromLong((long) wxEVT_COMMAND_TREE_ITEM_EXPANDING));
+ PyDict_SetItemString(d,"wxEVT_COMMAND_TREE_ITEM_COLLAPSED", PyInt_FromLong((long) wxEVT_COMMAND_TREE_ITEM_COLLAPSED));
+ PyDict_SetItemString(d,"wxEVT_COMMAND_TREE_ITEM_COLLAPSING", PyInt_FromLong((long) wxEVT_COMMAND_TREE_ITEM_COLLAPSING));
+ PyDict_SetItemString(d,"wxEVT_COMMAND_TREE_SEL_CHANGED", PyInt_FromLong((long) wxEVT_COMMAND_TREE_SEL_CHANGED));
+ PyDict_SetItemString(d,"wxEVT_COMMAND_TREE_SEL_CHANGING", PyInt_FromLong((long) wxEVT_COMMAND_TREE_SEL_CHANGING));
+ PyDict_SetItemString(d,"wxEVT_COMMAND_TREE_KEY_DOWN", PyInt_FromLong((long) wxEVT_COMMAND_TREE_KEY_DOWN));
+ PyDict_SetItemString(d,"wxEVT_COMMAND_TREE_ITEM_ACTIVATED", PyInt_FromLong((long) wxEVT_COMMAND_TREE_ITEM_ACTIVATED));
+ PyDict_SetItemString(d,"wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK", PyInt_FromLong((long) wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK));
+ PyDict_SetItemString(d,"wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK", PyInt_FromLong((long) wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK));
{
int i;
for (i = 0; _swig_mapping[i].n1; i++)
diff --git a/wxPython/src/msw/controls2.py b/wxPython/src/msw/controls2.py
index 6acc423c61..ed3bb0c9b7 100644
--- a/wxPython/src/msw/controls2.py
+++ b/wxPython/src/msw/controls2.py
@@ -319,6 +319,9 @@ class wxListCtrlPtr(wxControlPtr):
def Arrange(self, *_args, **_kwargs):
val = apply(controls2c.wxListCtrl_Arrange,(self,) + _args, _kwargs)
return val
+ def AssignImageList(self, *_args, **_kwargs):
+ val = apply(controls2c.wxListCtrl_AssignImageList,(self,) + _args, _kwargs)
+ return val
def DeleteItem(self, *_args, **_kwargs):
val = apply(controls2c.wxListCtrl_DeleteItem,(self,) + _args, _kwargs)
return val
@@ -578,6 +581,9 @@ class wxTreeCtrlPtr(wxControlPtr):
def _setSelf(self, *_args, **_kwargs):
val = apply(controls2c.wxTreeCtrl__setSelf,(self,) + _args, _kwargs)
return val
+ def AssignImageList(self, *_args, **_kwargs):
+ val = apply(controls2c.wxTreeCtrl_AssignImageList,(self,) + _args, _kwargs)
+ return val
def GetCount(self, *_args, **_kwargs):
val = apply(controls2c.wxTreeCtrl_GetCount,(self,) + _args, _kwargs)
return val
@@ -876,6 +882,22 @@ wxLIST_FORMAT_LEFT = controls2c.wxLIST_FORMAT_LEFT
wxLIST_FORMAT_RIGHT = controls2c.wxLIST_FORMAT_RIGHT
wxLIST_FORMAT_CENTRE = controls2c.wxLIST_FORMAT_CENTRE
wxLIST_FORMAT_CENTER = controls2c.wxLIST_FORMAT_CENTER
+wxEVT_COMMAND_LIST_BEGIN_DRAG = controls2c.wxEVT_COMMAND_LIST_BEGIN_DRAG
+wxEVT_COMMAND_LIST_BEGIN_RDRAG = controls2c.wxEVT_COMMAND_LIST_BEGIN_RDRAG
+wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT = controls2c.wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT
+wxEVT_COMMAND_LIST_END_LABEL_EDIT = controls2c.wxEVT_COMMAND_LIST_END_LABEL_EDIT
+wxEVT_COMMAND_LIST_DELETE_ITEM = controls2c.wxEVT_COMMAND_LIST_DELETE_ITEM
+wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS = controls2c.wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS
+wxEVT_COMMAND_LIST_GET_INFO = controls2c.wxEVT_COMMAND_LIST_GET_INFO
+wxEVT_COMMAND_LIST_SET_INFO = controls2c.wxEVT_COMMAND_LIST_SET_INFO
+wxEVT_COMMAND_LIST_ITEM_SELECTED = controls2c.wxEVT_COMMAND_LIST_ITEM_SELECTED
+wxEVT_COMMAND_LIST_ITEM_DESELECTED = controls2c.wxEVT_COMMAND_LIST_ITEM_DESELECTED
+wxEVT_COMMAND_LIST_KEY_DOWN = controls2c.wxEVT_COMMAND_LIST_KEY_DOWN
+wxEVT_COMMAND_LIST_INSERT_ITEM = controls2c.wxEVT_COMMAND_LIST_INSERT_ITEM
+wxEVT_COMMAND_LIST_COL_CLICK = controls2c.wxEVT_COMMAND_LIST_COL_CLICK
+wxEVT_COMMAND_LIST_ITEM_ACTIVATED = controls2c.wxEVT_COMMAND_LIST_ITEM_ACTIVATED
+wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK = controls2c.wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK
+wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK = controls2c.wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK
wxTreeItemIcon_Normal = controls2c.wxTreeItemIcon_Normal
wxTreeItemIcon_Selected = controls2c.wxTreeItemIcon_Selected
wxTreeItemIcon_Expanded = controls2c.wxTreeItemIcon_Expanded
@@ -895,3 +917,20 @@ wxTREE_HITTEST_TORIGHT = controls2c.wxTREE_HITTEST_TORIGHT
wxTREE_HITTEST_ONITEMUPPERPART = controls2c.wxTREE_HITTEST_ONITEMUPPERPART
wxTREE_HITTEST_ONITEMLOWERPART = controls2c.wxTREE_HITTEST_ONITEMLOWERPART
wxTREE_HITTEST_ONITEM = controls2c.wxTREE_HITTEST_ONITEM
+wxEVT_COMMAND_TREE_BEGIN_DRAG = controls2c.wxEVT_COMMAND_TREE_BEGIN_DRAG
+wxEVT_COMMAND_TREE_BEGIN_RDRAG = controls2c.wxEVT_COMMAND_TREE_BEGIN_RDRAG
+wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT = controls2c.wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT
+wxEVT_COMMAND_TREE_END_LABEL_EDIT = controls2c.wxEVT_COMMAND_TREE_END_LABEL_EDIT
+wxEVT_COMMAND_TREE_DELETE_ITEM = controls2c.wxEVT_COMMAND_TREE_DELETE_ITEM
+wxEVT_COMMAND_TREE_GET_INFO = controls2c.wxEVT_COMMAND_TREE_GET_INFO
+wxEVT_COMMAND_TREE_SET_INFO = controls2c.wxEVT_COMMAND_TREE_SET_INFO
+wxEVT_COMMAND_TREE_ITEM_EXPANDED = controls2c.wxEVT_COMMAND_TREE_ITEM_EXPANDED
+wxEVT_COMMAND_TREE_ITEM_EXPANDING = controls2c.wxEVT_COMMAND_TREE_ITEM_EXPANDING
+wxEVT_COMMAND_TREE_ITEM_COLLAPSED = controls2c.wxEVT_COMMAND_TREE_ITEM_COLLAPSED
+wxEVT_COMMAND_TREE_ITEM_COLLAPSING = controls2c.wxEVT_COMMAND_TREE_ITEM_COLLAPSING
+wxEVT_COMMAND_TREE_SEL_CHANGED = controls2c.wxEVT_COMMAND_TREE_SEL_CHANGED
+wxEVT_COMMAND_TREE_SEL_CHANGING = controls2c.wxEVT_COMMAND_TREE_SEL_CHANGING
+wxEVT_COMMAND_TREE_KEY_DOWN = controls2c.wxEVT_COMMAND_TREE_KEY_DOWN
+wxEVT_COMMAND_TREE_ITEM_ACTIVATED = controls2c.wxEVT_COMMAND_TREE_ITEM_ACTIVATED
+wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK = controls2c.wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK
+wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK = controls2c.wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK
diff --git a/wxPython/src/msw/events.cpp b/wxPython/src/msw/events.cpp
index 06c0f87017..7cb96dd196 100644
--- a/wxPython/src/msw/events.cpp
+++ b/wxPython/src/msw/events.cpp
@@ -6395,7 +6395,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_size_t","_uint",0},
{ "_class_wxRealPoint","_wxRealPoint",0},
{ "_wxNavigationKeyEvent","_class_wxNavigationKeyEvent",0},
- { "_wxPrinterDC","_class_wxPrinterDC",0},
{ "_wxWindowCreateEvent","_class_wxWindowCreateEvent",0},
{ "_class_wxPaintEvent","_wxPaintEvent",0},
{ "_wxSysColourChangedEvent","_class_wxSysColourChangedEvent",0},
@@ -6614,7 +6613,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_class_wxNavigationKeyEvent","_wxNavigationKeyEvent",0},
{ "_wxSize","_class_wxSize",0},
{ "_wxRegionIterator","_class_wxRegionIterator",0},
- { "_class_wxPrinterDC","_wxPrinterDC",0},
{ "_class_wxPaintDC","_wxPaintDC",0},
{ "_class_wxSysColourChangedEvent","_wxSysColourChangedEvent",0},
{ "_class_wxInitDialogEvent","_wxInitDialogEvent",0},
diff --git a/wxPython/src/msw/filesys.cpp b/wxPython/src/msw/filesys.cpp
index 7bec489951..f40624059d 100644
--- a/wxPython/src/msw/filesys.cpp
+++ b/wxPython/src/msw/filesys.cpp
@@ -2243,7 +2243,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_size_t","_uint",0},
{ "_class_wxRealPoint","_wxRealPoint",0},
{ "_wxPNMHandler","_class_wxPNMHandler",0},
- { "_wxPrinterDC","_class_wxPrinterDC",0},
{ "_class_wxGIFHandler","_wxGIFHandler",0},
{ "_wxFileConfig","_class_wxFileConfig",0},
{ "_class_wxMask","_wxMask",0},
@@ -2379,7 +2378,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_class_wxTimeSpan","_wxTimeSpan",0},
{ "_wxSize","_class_wxSize",0},
{ "_wxRegionIterator","_class_wxRegionIterator",0},
- { "_class_wxPrinterDC","_wxPrinterDC",0},
{ "_class_wxPyFileSystemHandler","_wxPyFileSystemHandler",0},
{ "_class_wxPaintDC","_wxPaintDC",0},
{ "_class_wxLayoutConstraints","_wxLayoutConstraints",0},
diff --git a/wxPython/src/msw/frames.cpp b/wxPython/src/msw/frames.cpp
index 2dc5a21929..8489f08de4 100644
--- a/wxPython/src/msw/frames.cpp
+++ b/wxPython/src/msw/frames.cpp
@@ -1297,7 +1297,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_size_t","_uint",0},
{ "_class_wxRealPoint","_wxRealPoint",0},
{ "_wxNavigationKeyEvent","_class_wxNavigationKeyEvent",0},
- { "_wxPrinterDC","_class_wxPrinterDC",0},
{ "_wxWindowCreateEvent","_class_wxWindowCreateEvent",0},
{ "_class_wxMenuItem","_wxMenuItem",0},
{ "_class_wxPaintEvent","_wxPaintEvent",0},
@@ -1506,7 +1505,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxButton","_class_wxButton",0},
{ "_wxSize","_class_wxSize",0},
{ "_wxRegionIterator","_class_wxRegionIterator",0},
- { "_class_wxPrinterDC","_wxPrinterDC",0},
{ "_class_wxPyTextDataObject","_wxPyTextDataObject",0},
{ "_class_wxPaintDC","_wxPaintDC",0},
{ "_class_wxSysColourChangedEvent","_wxSysColourChangedEvent",0},
diff --git a/wxPython/src/msw/gdi.cpp b/wxPython/src/msw/gdi.cpp
index a11115c704..6f87090c25 100644
--- a/wxPython/src/msw/gdi.cpp
+++ b/wxPython/src/msw/gdi.cpp
@@ -7520,115 +7520,6 @@ static PyObject *_wrap_new_wxWindowDC(PyObject *self, PyObject *args, PyObject *
return _resultobj;
}
-static void *SwigwxPrinterDCTowxDC(void *ptr) {
- wxPrinterDC *src;
- wxDC *dest;
- src = (wxPrinterDC *) ptr;
- dest = (wxDC *) src;
- return (void *) dest;
-}
-
-#define new_wxPrinterDC(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4) (new wxPrinterDC(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4))
-static PyObject *_wrap_new_wxPrinterDC(PyObject *self, PyObject *args, PyObject *kwargs) {
- PyObject * _resultobj;
- wxPrinterDC * _result;
- wxString * _arg0;
- wxString * _arg1;
- wxString * _arg2;
- bool _arg3 = (bool ) TRUE;
- int _arg4 = (int ) wxPORTRAIT;
- PyObject * _obj0 = 0;
- PyObject * _obj1 = 0;
- PyObject * _obj2 = 0;
- int tempbool3 = (int) TRUE;
- char *_kwnames[] = { "driver","device","output","interactive","orientation", NULL };
- char _ptemp[128];
-
- self = self;
- if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO|ii:new_wxPrinterDC",_kwnames,&_obj0,&_obj1,&_obj2,&tempbool3,&_arg4))
- return NULL;
-{
-#if PYTHON_API_VERSION >= 1009
- char* tmpPtr; int tmpSize;
- if (!PyString_Check(_obj0) && !PyUnicode_Check(_obj0)) {
- PyErr_SetString(PyExc_TypeError, "String or Unicode type required");
- return NULL;
- }
- if (PyString_AsStringAndSize(_obj0, &tmpPtr, &tmpSize) == -1)
- return NULL;
- _arg0 = new wxString(tmpPtr, tmpSize);
-#else
- if (!PyString_Check(_obj0)) {
- PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
- return NULL;
- }
- _arg0 = new wxString(PyString_AS_STRING(_obj0), PyString_GET_SIZE(_obj0));
-#endif
-}
-{
-#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
-}
-{
-#if PYTHON_API_VERSION >= 1009
- char* tmpPtr; int tmpSize;
- if (!PyString_Check(_obj2) && !PyUnicode_Check(_obj2)) {
- PyErr_SetString(PyExc_TypeError, "String or Unicode type required");
- return NULL;
- }
- if (PyString_AsStringAndSize(_obj2, &tmpPtr, &tmpSize) == -1)
- return NULL;
- _arg2 = new wxString(tmpPtr, tmpSize);
-#else
- if (!PyString_Check(_obj2)) {
- PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
- return NULL;
- }
- _arg2 = new wxString(PyString_AS_STRING(_obj2), PyString_GET_SIZE(_obj2));
-#endif
-}
- _arg3 = (bool ) tempbool3;
-{
- wxPy_BEGIN_ALLOW_THREADS;
- _result = (wxPrinterDC *)new_wxPrinterDC(*_arg0,*_arg1,*_arg2,_arg3,_arg4);
-
- wxPy_END_ALLOW_THREADS;
-} if (_result) {
- SWIG_MakePtr(_ptemp, (char *) _result,"_wxPrinterDC_p");
- _resultobj = Py_BuildValue("s",_ptemp);
- } else {
- Py_INCREF(Py_None);
- _resultobj = Py_None;
- }
-{
- if (_obj0)
- delete _arg0;
-}
-{
- if (_obj1)
- delete _arg1;
-}
-{
- if (_obj2)
- delete _arg2;
-}
- return _resultobj;
-}
-
static void *SwigwxMetaFileDCTowxDC(void *ptr) {
wxMetaFileDC *src;
wxDC *dest;
@@ -8347,7 +8238,6 @@ static PyMethodDef gdicMethods[] = {
{ "new_wxPalette", (PyCFunction) _wrap_new_wxPalette, METH_VARARGS | METH_KEYWORDS },
{ "wxMetaFileDC_Close", (PyCFunction) _wrap_wxMetaFileDC_Close, METH_VARARGS | METH_KEYWORDS },
{ "new_wxMetaFileDC", (PyCFunction) _wrap_new_wxMetaFileDC, METH_VARARGS | METH_KEYWORDS },
- { "new_wxPrinterDC", (PyCFunction) _wrap_new_wxPrinterDC, METH_VARARGS | METH_KEYWORDS },
{ "new_wxWindowDC", (PyCFunction) _wrap_new_wxWindowDC, METH_VARARGS | METH_KEYWORDS },
{ "new_wxPaintDC", (PyCFunction) _wrap_new_wxPaintDC, METH_VARARGS | METH_KEYWORDS },
{ "new_wxClientDC", (PyCFunction) _wrap_new_wxClientDC, METH_VARARGS | METH_KEYWORDS },
@@ -8583,8 +8473,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_class_wxAcceleratorTable","_wxAcceleratorTable",0},
{ "_wxDC","_class_wxMetaFileDC",SwigwxMetaFileDCTowxDC},
{ "_wxDC","_wxMetaFileDC",SwigwxMetaFileDCTowxDC},
- { "_wxDC","_class_wxPrinterDC",SwigwxPrinterDCTowxDC},
- { "_wxDC","_wxPrinterDC",SwigwxPrinterDCTowxDC},
{ "_wxDC","_class_wxWindowDC",SwigwxWindowDCTowxDC},
{ "_wxDC","_wxWindowDC",SwigwxWindowDCTowxDC},
{ "_wxDC","_class_wxPaintDC",SwigwxPaintDCTowxDC},
@@ -8604,7 +8492,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_size_t","_wxWindowID",0},
{ "_size_t","_uint",0},
{ "_class_wxRealPoint","_wxRealPoint",0},
- { "_wxPrinterDC","_class_wxPrinterDC",0},
{ "_class_wxMask","_wxMask",0},
{ "_wxColour","_class_wxColour",0},
{ "_wxBrush","_class_wxBrush",0},
@@ -8633,8 +8520,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_class_wxRect","_wxRect",0},
{ "_class_wxDC","_class_wxMetaFileDC",SwigwxMetaFileDCTowxDC},
{ "_class_wxDC","_wxMetaFileDC",SwigwxMetaFileDCTowxDC},
- { "_class_wxDC","_class_wxPrinterDC",SwigwxPrinterDCTowxDC},
- { "_class_wxDC","_wxPrinterDC",SwigwxPrinterDCTowxDC},
{ "_class_wxDC","_class_wxWindowDC",SwigwxWindowDCTowxDC},
{ "_class_wxDC","_wxWindowDC",SwigwxWindowDCTowxDC},
{ "_class_wxDC","_class_wxPaintDC",SwigwxPaintDCTowxDC},
@@ -8715,7 +8600,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_time_t","_size_t",0},
{ "_wxSize","_class_wxSize",0},
{ "_wxRegionIterator","_class_wxRegionIterator",0},
- { "_class_wxPrinterDC","_wxPrinterDC",0},
{ "_class_wxPaintDC","_wxPaintDC",0},
{ "_class_wxLayoutConstraints","_wxLayoutConstraints",0},
{ "_class_wxIcon","_wxIcon",0},
diff --git a/wxPython/src/msw/gdi.py b/wxPython/src/msw/gdi.py
index 5f8cf2c835..aec000e86d 100644
--- a/wxPython/src/msw/gdi.py
+++ b/wxPython/src/msw/gdi.py
@@ -779,20 +779,6 @@ class wxWindowDC(wxWindowDCPtr):
-class wxPrinterDCPtr(wxDCPtr):
- def __init__(self,this):
- self.this = this
- self.thisown = 0
- def __repr__(self):
- return "