Merged modifications from the 2.6 branch

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36607 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-30 23:02:03 +00:00
parent a780a8dc19
commit 02b800ce7c
104 changed files with 14102 additions and 46560 deletions
--- a/wxPython/src/_defs.i
+++ b/wxPython/src/_defs.i
@@ -497,6 +497,7 @@ enum {
    wxSIZE_AUTO,
    wxSIZE_USE_EXISTING,
    wxSIZE_ALLOW_MINUS_ONE,
+    wxSIZE_FORCE,
    wxPORTRAIT,
    wxLANDSCAPE,
    wxPRINT_QUALITY_HIGH,
@@ -506,6 +507,7 @@ enum {

    wxID_ANY,
    wxID_SEPARATOR,
+    wxID_NONE,

    wxID_LOWEST,
    wxID_OPEN,