wxPython Merge #2 of 2.4 branch --> HEAD (branch tag: wxPy_2_4_merge_2)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21593 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-02 23:13:10 +00:00
parent e234d4c9b7
commit 1fded56b37
535 changed files with 48899 additions and 20067 deletions
--- a/wxPython/src/_defs.i
+++ b/wxPython/src/_defs.i
@@ -222,6 +222,7 @@ enum {
    wxFRAME_FLOAT_ON_PARENT,
    wxFRAME_NO_WINDOW_MENU,
    wxFRAME_NO_TASKBAR,
+    wxFRAME_SHAPED,

    wxED_CLIENT_MARGIN,
    wxED_BUTTONS_BOTTOM,
@@ -492,6 +493,7 @@ enum {
    wxEXPAND,

    wxNB_FIXEDWIDTH,
+    wxNB_TOP,
    wxNB_LEFT,
    wxNB_RIGHT,
    wxNB_BOTTOM,