Robin Dunn ca1863c2cc fixed merge conflict ...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40175 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

2006-07-17 21:45:30 +00:00

..

contrib

Updated Scintilla to version 1.70

2006-07-14 01:20:18 +00:00

demo

Adjust control size after Play

2006-07-10 17:02:25 +00:00

distrib

enable building just the unicode version, or both unicode and ansi

2006-07-13 02:40:46 +00:00

docs

fixed merge conflict

2006-07-17 21:45:30 +00:00

include/wx/wxPython

remove WXDLLEXPORT modifiers since this isn't in the wx DLL

2006-07-10 16:58:21 +00:00

misc

Add test for a stock button

2006-05-04 02:08:09 +00:00

samples

DocView and ActiveGrid IDE updates from Morgan Hua:

2006-04-20 06:34:04 +00:00

scripts

pywrap should be treated as a gui script

2006-07-10 16:04:31 +00:00

src

Wrap new AddPane method as AddPaneAtPos

2006-07-17 21:34:32 +00:00

SWIG

oops

2006-07-05 00:53:20 +00:00

wx

if Acrobat is >= 7.0 then use acrobat by embedding it in a IE window

2006-07-17 20:58:10 +00:00

wxaddons

Build and distrib tweaks ported over from the 2.6 branch

2006-07-05 05:23:28 +00:00

wxPython

fix for import error

2006-07-17 21:36:25 +00:00

wxversion

Patch for Bug 1409256, wxversion.py does not understand lib and lib64

2006-01-20 17:32:43 +00:00

.cvsignore

reSWIGged

2005-02-18 19:33:00 +00:00

b

Changes needed for building with Python 2.5

2006-07-05 00:37:11 +00:00

b.bat

Use -c

2004-07-06 21:12:52 +00:00

b.win32

Changes needed for building with Python 2.5

2006-07-05 00:37:11 +00:00

config.py

Build and distrib tweaks ported over from the 2.6 branch

2006-07-05 05:23:28 +00:00

setup.py

Added the PseudoDC class from Paul Lanier. It provides a way to

2006-07-10 15:06:31 +00:00