reSWIGged

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

diff --git a/wxPython/src/gtk/_controls.py b/wxPython/src/gtk/_controls.py
index 870ee5405778d105c2f65df5447da2d5be6fe33d..cb930520e7f43705dfb0849b10e7b66bf4ad09be 100644 (file)
--- a/wxPython/src/gtk/_controls.py
+++ b/wxPython/src/gtk/_controls.py
@@ -3071,6 +3071,8 @@ class Notebook(BookCtrlBase):
         return _controls_.Notebook_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)
         return _controls_.Notebook_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)

+    RowCount = property(GetRowCount,doc="See `GetRowCount`") 
+    ThemeBackgroundColour = property(GetThemeBackgroundColour,doc="See `GetThemeBackgroundColour`") 

 _controls_.Notebook_swigregister(Notebook)
 
 def PreNotebook(*args, **kwargs):
 _controls_.Notebook_swigregister(Notebook)
 
 def PreNotebook(*args, **kwargs):

diff --git a/wxPython/src/gtk/_core.py b/wxPython/src/gtk/_core.py
index 0f58511d3041883cf56f62f0836a276d12902388..ff15cd415fd25ff3a4896ca12c8070db701bbacc 100644 (file)
--- a/wxPython/src/gtk/_core.py
+++ b/wxPython/src/gtk/_core.py
@@ -4691,6 +4691,14 @@ class MouseEvent(Event):
     m_wheelRotation = property(_core_.MouseEvent_m_wheelRotation_get, _core_.MouseEvent_m_wheelRotation_set)
     m_wheelDelta = property(_core_.MouseEvent_m_wheelDelta_get, _core_.MouseEvent_m_wheelDelta_set)
     m_linesPerAction = property(_core_.MouseEvent_m_linesPerAction_get, _core_.MouseEvent_m_linesPerAction_set)
     m_wheelRotation = property(_core_.MouseEvent_m_wheelRotation_get, _core_.MouseEvent_m_wheelRotation_set)
     m_wheelDelta = property(_core_.MouseEvent_m_wheelDelta_get, _core_.MouseEvent_m_wheelDelta_set)
     m_linesPerAction = property(_core_.MouseEvent_m_linesPerAction_get, _core_.MouseEvent_m_linesPerAction_set)

+    Button = property(GetButton,doc="See `GetButton`") 
+    LinesPerAction = property(GetLinesPerAction,doc="See `GetLinesPerAction`") 
+    LogicalPosition = property(GetLogicalPosition,doc="See `GetLogicalPosition`") 
+    Position = property(GetPosition,doc="See `GetPosition`") 
+    WheelDelta = property(GetWheelDelta,doc="See `GetWheelDelta`") 
+    WheelRotation = property(GetWheelRotation,doc="See `GetWheelRotation`") 
+    X = property(GetX,doc="See `GetX`") 
+    Y = property(GetY,doc="See `GetY`") 

 _core_.MouseEvent_swigregister(MouseEvent)
 
 #---------------------------------------------------------------------------
 _core_.MouseEvent_swigregister(MouseEvent)
 
 #---------------------------------------------------------------------------


@@ -5106,6 +5114,8 @@ class MoveEvent(Event):
     m_pos =  property(GetPosition, SetPosition)
     m_rect = property(GetRect, SetRect)
 
     m_pos =  property(GetPosition, SetPosition)
     m_rect = property(GetRect, SetRect)
 

+    Position = property(GetPosition,SetPosition,doc="See `GetPosition` and `SetPosition`") 
+    Rect = property(GetRect,SetRect,doc="See `GetRect` and `SetRect`") 

 _core_.MoveEvent_swigregister(MoveEvent)
 
 #---------------------------------------------------------------------------
 _core_.MoveEvent_swigregister(MoveEvent)
 
 #---------------------------------------------------------------------------


@@ -5356,6 +5366,8 @@ class MenuEvent(Event):
         """
         return _core_.MenuEvent_GetMenu(*args, **kwargs)
 
         """
         return _core_.MenuEvent_GetMenu(*args, **kwargs)
 

+    Menu = property(GetMenu,doc="See `GetMenu`") 
+    MenuId = property(GetMenuId,doc="See `GetMenuId`") 

 _core_.MenuEvent_swigregister(MenuEvent)
 
 #---------------------------------------------------------------------------
 _core_.MenuEvent_swigregister(MenuEvent)
 
 #---------------------------------------------------------------------------


@@ -5964,6 +5976,7 @@ class MouseCaptureChangedEvent(Event):
         """
         return _core_.MouseCaptureChangedEvent_GetCapturedWindow(*args, **kwargs)
 
         """
         return _core_.MouseCaptureChangedEvent_GetCapturedWindow(*args, **kwargs)
 

+    CapturedWindow = property(GetCapturedWindow,doc="See `GetCapturedWindow`") 

 _core_.MouseCaptureChangedEvent_swigregister(MouseCaptureChangedEvent)
 
 #---------------------------------------------------------------------------
 _core_.MouseCaptureChangedEvent_swigregister(MouseCaptureChangedEvent)
 
 #---------------------------------------------------------------------------


@@ -6193,6 +6206,8 @@ class NavigationKeyEvent(Event):
     IsForward = _core_.NavigationKeyEvent_IsForward
     WinChange = _core_.NavigationKeyEvent_WinChange
     FromTab = _core_.NavigationKeyEvent_FromTab
     IsForward = _core_.NavigationKeyEvent_IsForward
     WinChange = _core_.NavigationKeyEvent_WinChange
     FromTab = _core_.NavigationKeyEvent_FromTab

+    CurrentFocus = property(GetCurrentFocus,SetCurrentFocus,doc="See `GetCurrentFocus` and `SetCurrentFocus`") 
+    Direction = property(GetDirection,SetDirection,doc="See `GetDirection` and `SetDirection`") 

 _core_.NavigationKeyEvent_swigregister(NavigationKeyEvent)
 
 #---------------------------------------------------------------------------
 _core_.NavigationKeyEvent_swigregister(NavigationKeyEvent)
 
 #---------------------------------------------------------------------------


@@ -10401,6 +10416,15 @@ class Menu(EvtHandler):
         """GetParent(self) -> Menu"""
         return _core_.Menu_GetParent(*args, **kwargs)
 
         """GetParent(self) -> Menu"""
         return _core_.Menu_GetParent(*args, **kwargs)
 

+    EventHandler = property(GetEventHandler,SetEventHandler,doc="See `GetEventHandler` and `SetEventHandler`") 
+    HelpString = property(GetHelpString,SetHelpString,doc="See `GetHelpString` and `SetHelpString`") 
+    InvokingWindow = property(GetInvokingWindow,SetInvokingWindow,doc="See `GetInvokingWindow` and `SetInvokingWindow`") 
+    MenuBar = property(GetMenuBar,doc="See `GetMenuBar`") 
+    MenuItemCount = property(GetMenuItemCount,doc="See `GetMenuItemCount`") 
+    MenuItems = property(GetMenuItems,doc="See `GetMenuItems`") 
+    Parent = property(GetParent,SetParent,doc="See `GetParent` and `SetParent`") 
+    Style = property(GetStyle,doc="See `GetStyle`") 
+    Title = property(GetTitle,SetTitle,doc="See `GetTitle` and `SetTitle`") 

 _core_.Menu_swigregister(Menu)
 DefaultValidator = cvar.DefaultValidator
 
 _core_.Menu_swigregister(Menu)
 DefaultValidator = cvar.DefaultValidator
 


@@ -10541,7 +10565,10 @@ class MenuBar(Window):
         for m, l in items:
             self.Append(m, l)
 
         for m, l in items:
             self.Append(m, l)
 

-    Menus = property(GetMenus,SetMenus) 
+    Frame = property(GetFrame,doc="See `GetFrame`") 
+    Menu = property(GetMenu,doc="See `GetMenu`") 
+    MenuCount = property(GetMenuCount,doc="See `GetMenuCount`") 
+    Menus = property(GetMenus,SetMenus,doc="See `GetMenus` and `SetMenus`") 

 _core_.MenuBar_swigregister(MenuBar)
 
 def MenuBar_SetAutoWindowMenu(*args, **kwargs):
 _core_.MenuBar_swigregister(MenuBar)
 
 def MenuBar_SetAutoWindowMenu(*args, **kwargs):


@@ -10737,6 +10764,20 @@ class MenuItem(Object):
         """ResetOwnerDrawn(self)"""
         return _core_.MenuItem_ResetOwnerDrawn(*args, **kwargs)
 
         """ResetOwnerDrawn(self)"""
         return _core_.MenuItem_ResetOwnerDrawn(*args, **kwargs)
 

+    Accel = property(GetAccel,SetAccel,doc="See `GetAccel` and `SetAccel`") 
+    BackgroundColour = property(GetBackgroundColour,SetBackgroundColour,doc="See `GetBackgroundColour` and `SetBackgroundColour`") 
+    Bitmap = property(GetBitmap,SetBitmap,doc="See `GetBitmap` and `SetBitmap`") 
+    DisabledBitmap = property(GetDisabledBitmap,SetDisabledBitmap,doc="See `GetDisabledBitmap` and `SetDisabledBitmap`") 
+    Font = property(GetFont,SetFont,doc="See `GetFont` and `SetFont`") 
+    Help = property(GetHelp,SetHelp,doc="See `GetHelp` and `SetHelp`") 
+    Id = property(GetId,SetId,doc="See `GetId` and `SetId`") 
+    Kind = property(GetKind,SetKind,doc="See `GetKind` and `SetKind`") 
+    Label = property(GetLabel,doc="See `GetLabel`") 
+    MarginWidth = property(GetMarginWidth,SetMarginWidth,doc="See `GetMarginWidth` and `SetMarginWidth`") 
+    Menu = property(GetMenu,SetMenu,doc="See `GetMenu` and `SetMenu`") 
+    SubMenu = property(GetSubMenu,SetSubMenu,doc="See `GetSubMenu` and `SetSubMenu`") 
+    Text = property(GetText,SetText,doc="See `GetText` and `SetText`") 
+    TextColour = property(GetTextColour,SetTextColour,doc="See `GetTextColour` and `SetTextColour`") 

 _core_.MenuItem_swigregister(MenuItem)
 
 def MenuItem_GetLabelFromText(*args, **kwargs):
 _core_.MenuItem_swigregister(MenuItem)
 
 def MenuItem_GetLabelFromText(*args, **kwargs):

diff --git a/wxPython/src/gtk/_gdi.py b/wxPython/src/gtk/_gdi.py
index ffb3ff1a3adface0c2a344d87815428dddc122ed..7be2b88f3a55071b19c7321e235115a02fe42c03 100644 (file)
--- a/wxPython/src/gtk/_gdi.py
+++ b/wxPython/src/gtk/_gdi.py
@@ -1667,6 +1667,13 @@ class NativeFontInfo(object):
         """ToUserString(self) -> String"""
         return _gdi_.NativeFontInfo_ToUserString(*args, **kwargs)
 
         """ToUserString(self) -> String"""
         return _gdi_.NativeFontInfo_ToUserString(*args, **kwargs)
 

+    Encoding = property(GetEncoding,SetEncoding,doc="See `GetEncoding` and `SetEncoding`") 
+    FaceName = property(GetFaceName,SetFaceName,doc="See `GetFaceName` and `SetFaceName`") 
+    Family = property(GetFamily,SetFamily,doc="See `GetFamily` and `SetFamily`") 
+    PointSize = property(GetPointSize,SetPointSize,doc="See `GetPointSize` and `SetPointSize`") 
+    Style = property(GetStyle,SetStyle,doc="See `GetStyle` and `SetStyle`") 
+    Underlined = property(GetUnderlined,SetUnderlined,doc="See `GetUnderlined` and `SetUnderlined`") 
+    Weight = property(GetWeight,SetWeight,doc="See `GetWeight` and `SetWeight`") 

 _gdi_.NativeFontInfo_swigregister(NativeFontInfo)
 
 class NativeEncodingInfo(object):
 _gdi_.NativeFontInfo_swigregister(NativeFontInfo)
 
 class NativeEncodingInfo(object):

diff --git a/wxPython/src/gtk/_windows.py b/wxPython/src/gtk/_windows.py
index 3ca2280352034aad026b815dedb8a4494b68700e..018e16ac5a44f28f142163d550d6e890d11dd06a 100644 (file)
--- a/wxPython/src/gtk/_windows.py
+++ b/wxPython/src/gtk/_windows.py
@@ -2477,6 +2477,7 @@ class MultiChoiceDialog(Dialog):
         """
         return _windows_.MultiChoiceDialog_GetSelections(*args, **kwargs)
 
         """
         return _windows_.MultiChoiceDialog_GetSelections(*args, **kwargs)
 

+    Selections = property(GetSelections,SetSelections,doc="See `GetSelections` and `SetSelections`") 

 _windows_.MultiChoiceDialog_swigregister(MultiChoiceDialog)
 
 class SingleChoiceDialog(Dialog):
 _windows_.MultiChoiceDialog_swigregister(MultiChoiceDialog)
 
 class SingleChoiceDialog(Dialog):


@@ -2587,6 +2588,7 @@ class NumberEntryDialog(Dialog):
         """GetValue(self) -> long"""
         return _windows_.NumberEntryDialog_GetValue(*args, **kwargs)
 
         """GetValue(self) -> long"""
         return _windows_.NumberEntryDialog_GetValue(*args, **kwargs)
 

+    Value = property(GetValue,doc="See `GetValue`") 

 _windows_.NumberEntryDialog_swigregister(NumberEntryDialog)
 
 class FontData(_core.Object):
 _windows_.NumberEntryDialog_swigregister(NumberEntryDialog)
 
 class FontData(_core.Object):


@@ -3135,14 +3137,12 @@ class MDIParentFrame(Frame):
         """GetClientWindow(self) -> MDIClientWindow"""
         return _windows_.MDIParentFrame_GetClientWindow(*args, **kwargs)
 
         """GetClientWindow(self) -> MDIClientWindow"""
         return _windows_.MDIParentFrame_GetClientWindow(*args, **kwargs)
 

-    def GetToolBar(*args, **kwargs):
-        """GetToolBar(self) -> Window"""
-        return _windows_.MDIParentFrame_GetToolBar(*args, **kwargs)
-

     def Tile(*args, **kwargs):
         """Tile(self, int orient=HORIZONTAL)"""
         return _windows_.MDIParentFrame_Tile(*args, **kwargs)
 
     def Tile(*args, **kwargs):
         """Tile(self, int orient=HORIZONTAL)"""
         return _windows_.MDIParentFrame_Tile(*args, **kwargs)
 

+    ActiveChild = property(GetActiveChild,doc="See `GetActiveChild`") 
+    ClientWindow = property(GetClientWindow,doc="See `GetClientWindow`") 

 _windows_.MDIParentFrame_swigregister(MDIParentFrame)
 
 def PreMDIParentFrame(*args, **kwargs):
 _windows_.MDIParentFrame_swigregister(MDIParentFrame)
 
 def PreMDIParentFrame(*args, **kwargs):

diff --git a/wxPython/src/gtk/_windows_wrap.cpp b/wxPython/src/gtk/_windows_wrap.cpp
index f1cf81ba3a2bb5f3de60e8f707539e7b671b3822..88c8e7a09ca144bac08a2145f14767f1c74d75bc 100644 (file)
--- a/wxPython/src/gtk/_windows_wrap.cpp
+++ b/wxPython/src/gtk/_windows_wrap.cpp
@@ -20942,36 +20942,6 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_MDIParentFrame_GetToolBar(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  wxMDIParentFrame *arg1 = (wxMDIParentFrame *) 0 ;
-  wxWindow *result = 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject *swig_obj[1] ;
-  
-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxMDIParentFrame, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MDIParentFrame_GetToolBar" "', expected argument " "1"" of type '" "wxMDIParentFrame *""'"); 
-  }
-  arg1 = reinterpret_cast< wxMDIParentFrame * >(argp1);
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (wxWindow *)(arg1)->GetToolBar();
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
-  }
-  {
-    resultobj = wxPyMake_wxObject(result, 0); 
-  }
-  return resultobj;
-fail:
-  return NULL;
-}
-
-

 SWIGINTERN PyObject *_wrap_MDIParentFrame_Tile(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxMDIParentFrame *arg1 = (wxMDIParentFrame *) 0 ;
 SWIGINTERN PyObject *_wrap_MDIParentFrame_Tile(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxMDIParentFrame *arg1 = (wxMDIParentFrame *) 0 ;


@@ -31411,7 +31381,6 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"MDIParentFrame_Cascade", (PyCFunction)_wrap_MDIParentFrame_Cascade, METH_O, NULL},
         { (char *)"MDIParentFrame_GetActiveChild", (PyCFunction)_wrap_MDIParentFrame_GetActiveChild, METH_O, NULL},
         { (char *)"MDIParentFrame_GetClientWindow", (PyCFunction)_wrap_MDIParentFrame_GetClientWindow, METH_O, NULL},
         { (char *)"MDIParentFrame_Cascade", (PyCFunction)_wrap_MDIParentFrame_Cascade, METH_O, NULL},
         { (char *)"MDIParentFrame_GetActiveChild", (PyCFunction)_wrap_MDIParentFrame_GetActiveChild, METH_O, NULL},
         { (char *)"MDIParentFrame_GetClientWindow", (PyCFunction)_wrap_MDIParentFrame_GetClientWindow, METH_O, NULL},

-        { (char *)"MDIParentFrame_GetToolBar", (PyCFunction)_wrap_MDIParentFrame_GetToolBar, METH_O, NULL},

         { (char *)"MDIParentFrame_Tile", (PyCFunction) _wrap_MDIParentFrame_Tile, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"MDIParentFrame_swigregister", MDIParentFrame_swigregister, METH_VARARGS, NULL},
         { (char *)"MDIParentFrame_swiginit", MDIParentFrame_swiginit, METH_VARARGS, NULL},
         { (char *)"MDIParentFrame_Tile", (PyCFunction) _wrap_MDIParentFrame_Tile, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"MDIParentFrame_swigregister", MDIParentFrame_swigregister, METH_VARARGS, NULL},
         { (char *)"MDIParentFrame_swiginit", MDIParentFrame_swiginit, METH_VARARGS, NULL},

diff --git a/wxPython/src/gtk/xrc_wrap.cpp b/wxPython/src/gtk/xrc_wrap.cpp
index a45d2e8cefae63c714ee4aada2a1bf3dcdde91bf..b16bbb0b07be3b27d0c08ebc3cee5f49e947b423 100644 (file)
--- a/wxPython/src/gtk/xrc_wrap.cpp
+++ b/wxPython/src/gtk/xrc_wrap.cpp
@@ -5339,6 +5339,7 @@ SWIGINTERN PyObject *_wrap_XmlNode_InsertChild(PyObject *SWIGUNUSEDPARM(self), P
   wxXmlNode *arg1 = (wxXmlNode *) 0 ;
   wxXmlNode *arg2 = (wxXmlNode *) 0 ;
   wxXmlNode *arg3 = (wxXmlNode *) 0 ;
   wxXmlNode *arg1 = (wxXmlNode *) 0 ;
   wxXmlNode *arg2 = (wxXmlNode *) 0 ;
   wxXmlNode *arg3 = (wxXmlNode *) 0 ;

+  bool result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;


@@ -5370,11 +5371,13 @@ SWIGINTERN PyObject *_wrap_XmlNode_InsertChild(PyObject *SWIGUNUSEDPARM(self), P
   arg3 = reinterpret_cast< wxXmlNode * >(argp3);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   arg3 = reinterpret_cast< wxXmlNode * >(argp3);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    (arg1)->InsertChild(arg2,arg3);
+    result = (bool)(arg1)->InsertChild(arg2,arg3);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_Py_Void();
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }

   return resultobj;
 fail:
   return NULL;
   return resultobj;
 fail:
   return NULL;


@@ -6710,6 +6713,34 @@ fail:
 }
 
 
 }
 
 

+SWIGINTERN PyObject *_wrap_XmlDocument_DetachRoot(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxXmlDocument *arg1 = (wxXmlDocument *) 0 ;
+  wxXmlNode *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxXmlDocument, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "XmlDocument_DetachRoot" "', expected argument " "1"" of type '" "wxXmlDocument *""'"); 
+  }
+  arg1 = reinterpret_cast< wxXmlDocument * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (wxXmlNode *)(arg1)->DetachRoot();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxXmlNode, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *_wrap_XmlDocument_SetRoot(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxXmlDocument *arg1 = (wxXmlDocument *) 0 ;
 SWIGINTERN PyObject *_wrap_XmlDocument_SetRoot(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxXmlDocument *arg1 = (wxXmlDocument *) 0 ;


@@ -8554,6 +8585,7 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"XmlDocument_GetRoot", (PyCFunction)_wrap_XmlDocument_GetRoot, METH_O, NULL},
         { (char *)"XmlDocument_GetVersion", (PyCFunction)_wrap_XmlDocument_GetVersion, METH_O, NULL},
         { (char *)"XmlDocument_GetFileEncoding", (PyCFunction)_wrap_XmlDocument_GetFileEncoding, METH_O, NULL},
         { (char *)"XmlDocument_GetRoot", (PyCFunction)_wrap_XmlDocument_GetRoot, METH_O, NULL},
         { (char *)"XmlDocument_GetVersion", (PyCFunction)_wrap_XmlDocument_GetVersion, METH_O, NULL},
         { (char *)"XmlDocument_GetFileEncoding", (PyCFunction)_wrap_XmlDocument_GetFileEncoding, METH_O, NULL},

+        { (char *)"XmlDocument_DetachRoot", (PyCFunction)_wrap_XmlDocument_DetachRoot, METH_O, NULL},

         { (char *)"XmlDocument_SetRoot", (PyCFunction) _wrap_XmlDocument_SetRoot, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"XmlDocument_SetVersion", (PyCFunction) _wrap_XmlDocument_SetVersion, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"XmlDocument_SetFileEncoding", (PyCFunction) _wrap_XmlDocument_SetFileEncoding, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"XmlDocument_SetRoot", (PyCFunction) _wrap_XmlDocument_SetRoot, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"XmlDocument_SetVersion", (PyCFunction) _wrap_XmlDocument_SetVersion, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"XmlDocument_SetFileEncoding", (PyCFunction) _wrap_XmlDocument_SetFileEncoding, METH_VARARGS | METH_KEYWORDS, NULL},

diff --git a/wxPython/src/mac/_controls.py b/wxPython/src/mac/_controls.py
index b25b2ece19747e6eb24c6cc70450e89f10579ada..10bf1310b19fa35f5f632d4ac39d481b68aa45ea 100644 (file)
--- a/wxPython/src/mac/_controls.py
+++ b/wxPython/src/mac/_controls.py
@@ -3064,6 +3064,8 @@ class Notebook(BookCtrlBase):
         return _controls_.Notebook_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)
         return _controls_.Notebook_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)

+    RowCount = property(GetRowCount,doc="See `GetRowCount`") 
+    ThemeBackgroundColour = property(GetThemeBackgroundColour,doc="See `GetThemeBackgroundColour`") 

 _controls_.Notebook_swigregister(Notebook)
 
 def PreNotebook(*args, **kwargs):
 _controls_.Notebook_swigregister(Notebook)
 
 def PreNotebook(*args, **kwargs):

diff --git a/wxPython/src/mac/_core.py b/wxPython/src/mac/_core.py
index 0f58511d3041883cf56f62f0836a276d12902388..ff15cd415fd25ff3a4896ca12c8070db701bbacc 100644 (file)
--- a/wxPython/src/mac/_core.py
+++ b/wxPython/src/mac/_core.py
@@ -4691,6 +4691,14 @@ class MouseEvent(Event):
     m_wheelRotation = property(_core_.MouseEvent_m_wheelRotation_get, _core_.MouseEvent_m_wheelRotation_set)
     m_wheelDelta = property(_core_.MouseEvent_m_wheelDelta_get, _core_.MouseEvent_m_wheelDelta_set)
     m_linesPerAction = property(_core_.MouseEvent_m_linesPerAction_get, _core_.MouseEvent_m_linesPerAction_set)
     m_wheelRotation = property(_core_.MouseEvent_m_wheelRotation_get, _core_.MouseEvent_m_wheelRotation_set)
     m_wheelDelta = property(_core_.MouseEvent_m_wheelDelta_get, _core_.MouseEvent_m_wheelDelta_set)
     m_linesPerAction = property(_core_.MouseEvent_m_linesPerAction_get, _core_.MouseEvent_m_linesPerAction_set)

+    Button = property(GetButton,doc="See `GetButton`") 
+    LinesPerAction = property(GetLinesPerAction,doc="See `GetLinesPerAction`") 
+    LogicalPosition = property(GetLogicalPosition,doc="See `GetLogicalPosition`") 
+    Position = property(GetPosition,doc="See `GetPosition`") 
+    WheelDelta = property(GetWheelDelta,doc="See `GetWheelDelta`") 
+    WheelRotation = property(GetWheelRotation,doc="See `GetWheelRotation`") 
+    X = property(GetX,doc="See `GetX`") 
+    Y = property(GetY,doc="See `GetY`") 

 _core_.MouseEvent_swigregister(MouseEvent)
 
 #---------------------------------------------------------------------------
 _core_.MouseEvent_swigregister(MouseEvent)
 
 #---------------------------------------------------------------------------


@@ -5106,6 +5114,8 @@ class MoveEvent(Event):
     m_pos =  property(GetPosition, SetPosition)
     m_rect = property(GetRect, SetRect)
 
     m_pos =  property(GetPosition, SetPosition)
     m_rect = property(GetRect, SetRect)
 

+    Position = property(GetPosition,SetPosition,doc="See `GetPosition` and `SetPosition`") 
+    Rect = property(GetRect,SetRect,doc="See `GetRect` and `SetRect`") 

 _core_.MoveEvent_swigregister(MoveEvent)
 
 #---------------------------------------------------------------------------
 _core_.MoveEvent_swigregister(MoveEvent)
 
 #---------------------------------------------------------------------------


@@ -5356,6 +5366,8 @@ class MenuEvent(Event):
         """
         return _core_.MenuEvent_GetMenu(*args, **kwargs)
 
         """
         return _core_.MenuEvent_GetMenu(*args, **kwargs)
 

+    Menu = property(GetMenu,doc="See `GetMenu`") 
+    MenuId = property(GetMenuId,doc="See `GetMenuId`") 

 _core_.MenuEvent_swigregister(MenuEvent)
 
 #---------------------------------------------------------------------------
 _core_.MenuEvent_swigregister(MenuEvent)
 
 #---------------------------------------------------------------------------


@@ -5964,6 +5976,7 @@ class MouseCaptureChangedEvent(Event):
         """
         return _core_.MouseCaptureChangedEvent_GetCapturedWindow(*args, **kwargs)
 
         """
         return _core_.MouseCaptureChangedEvent_GetCapturedWindow(*args, **kwargs)
 

+    CapturedWindow = property(GetCapturedWindow,doc="See `GetCapturedWindow`") 

 _core_.MouseCaptureChangedEvent_swigregister(MouseCaptureChangedEvent)
 
 #---------------------------------------------------------------------------
 _core_.MouseCaptureChangedEvent_swigregister(MouseCaptureChangedEvent)
 
 #---------------------------------------------------------------------------


@@ -6193,6 +6206,8 @@ class NavigationKeyEvent(Event):
     IsForward = _core_.NavigationKeyEvent_IsForward
     WinChange = _core_.NavigationKeyEvent_WinChange
     FromTab = _core_.NavigationKeyEvent_FromTab
     IsForward = _core_.NavigationKeyEvent_IsForward
     WinChange = _core_.NavigationKeyEvent_WinChange
     FromTab = _core_.NavigationKeyEvent_FromTab

+    CurrentFocus = property(GetCurrentFocus,SetCurrentFocus,doc="See `GetCurrentFocus` and `SetCurrentFocus`") 
+    Direction = property(GetDirection,SetDirection,doc="See `GetDirection` and `SetDirection`") 

 _core_.NavigationKeyEvent_swigregister(NavigationKeyEvent)
 
 #---------------------------------------------------------------------------
 _core_.NavigationKeyEvent_swigregister(NavigationKeyEvent)
 
 #---------------------------------------------------------------------------


@@ -10401,6 +10416,15 @@ class Menu(EvtHandler):
         """GetParent(self) -> Menu"""
         return _core_.Menu_GetParent(*args, **kwargs)
 
         """GetParent(self) -> Menu"""
         return _core_.Menu_GetParent(*args, **kwargs)
 

+    EventHandler = property(GetEventHandler,SetEventHandler,doc="See `GetEventHandler` and `SetEventHandler`") 
+    HelpString = property(GetHelpString,SetHelpString,doc="See `GetHelpString` and `SetHelpString`") 
+    InvokingWindow = property(GetInvokingWindow,SetInvokingWindow,doc="See `GetInvokingWindow` and `SetInvokingWindow`") 
+    MenuBar = property(GetMenuBar,doc="See `GetMenuBar`") 
+    MenuItemCount = property(GetMenuItemCount,doc="See `GetMenuItemCount`") 
+    MenuItems = property(GetMenuItems,doc="See `GetMenuItems`") 
+    Parent = property(GetParent,SetParent,doc="See `GetParent` and `SetParent`") 
+    Style = property(GetStyle,doc="See `GetStyle`") 
+    Title = property(GetTitle,SetTitle,doc="See `GetTitle` and `SetTitle`") 

 _core_.Menu_swigregister(Menu)
 DefaultValidator = cvar.DefaultValidator
 
 _core_.Menu_swigregister(Menu)
 DefaultValidator = cvar.DefaultValidator
 


@@ -10541,7 +10565,10 @@ class MenuBar(Window):
         for m, l in items:
             self.Append(m, l)
 
         for m, l in items:
             self.Append(m, l)
 

-    Menus = property(GetMenus,SetMenus) 
+    Frame = property(GetFrame,doc="See `GetFrame`") 
+    Menu = property(GetMenu,doc="See `GetMenu`") 
+    MenuCount = property(GetMenuCount,doc="See `GetMenuCount`") 
+    Menus = property(GetMenus,SetMenus,doc="See `GetMenus` and `SetMenus`") 

 _core_.MenuBar_swigregister(MenuBar)
 
 def MenuBar_SetAutoWindowMenu(*args, **kwargs):
 _core_.MenuBar_swigregister(MenuBar)
 
 def MenuBar_SetAutoWindowMenu(*args, **kwargs):


@@ -10737,6 +10764,20 @@ class MenuItem(Object):
         """ResetOwnerDrawn(self)"""
         return _core_.MenuItem_ResetOwnerDrawn(*args, **kwargs)
 
         """ResetOwnerDrawn(self)"""
         return _core_.MenuItem_ResetOwnerDrawn(*args, **kwargs)
 

+    Accel = property(GetAccel,SetAccel,doc="See `GetAccel` and `SetAccel`") 
+    BackgroundColour = property(GetBackgroundColour,SetBackgroundColour,doc="See `GetBackgroundColour` and `SetBackgroundColour`") 
+    Bitmap = property(GetBitmap,SetBitmap,doc="See `GetBitmap` and `SetBitmap`") 
+    DisabledBitmap = property(GetDisabledBitmap,SetDisabledBitmap,doc="See `GetDisabledBitmap` and `SetDisabledBitmap`") 
+    Font = property(GetFont,SetFont,doc="See `GetFont` and `SetFont`") 
+    Help = property(GetHelp,SetHelp,doc="See `GetHelp` and `SetHelp`") 
+    Id = property(GetId,SetId,doc="See `GetId` and `SetId`") 
+    Kind = property(GetKind,SetKind,doc="See `GetKind` and `SetKind`") 
+    Label = property(GetLabel,doc="See `GetLabel`") 
+    MarginWidth = property(GetMarginWidth,SetMarginWidth,doc="See `GetMarginWidth` and `SetMarginWidth`") 
+    Menu = property(GetMenu,SetMenu,doc="See `GetMenu` and `SetMenu`") 
+    SubMenu = property(GetSubMenu,SetSubMenu,doc="See `GetSubMenu` and `SetSubMenu`") 
+    Text = property(GetText,SetText,doc="See `GetText` and `SetText`") 
+    TextColour = property(GetTextColour,SetTextColour,doc="See `GetTextColour` and `SetTextColour`") 

 _core_.MenuItem_swigregister(MenuItem)
 
 def MenuItem_GetLabelFromText(*args, **kwargs):
 _core_.MenuItem_swigregister(MenuItem)
 
 def MenuItem_GetLabelFromText(*args, **kwargs):

diff --git a/wxPython/src/mac/_gdi.py b/wxPython/src/mac/_gdi.py
index 5f1f534746bb7a1093a8a045ab6297fbfeb9e429..70eb01d0a2fb0a14891765c928906ecaf2d95356 100644 (file)
--- a/wxPython/src/mac/_gdi.py
+++ b/wxPython/src/mac/_gdi.py
@@ -1667,6 +1667,13 @@ class NativeFontInfo(object):
         """ToUserString(self) -> String"""
         return _gdi_.NativeFontInfo_ToUserString(*args, **kwargs)
 
         """ToUserString(self) -> String"""
         return _gdi_.NativeFontInfo_ToUserString(*args, **kwargs)
 

+    Encoding = property(GetEncoding,SetEncoding,doc="See `GetEncoding` and `SetEncoding`") 
+    FaceName = property(GetFaceName,SetFaceName,doc="See `GetFaceName` and `SetFaceName`") 
+    Family = property(GetFamily,SetFamily,doc="See `GetFamily` and `SetFamily`") 
+    PointSize = property(GetPointSize,SetPointSize,doc="See `GetPointSize` and `SetPointSize`") 
+    Style = property(GetStyle,SetStyle,doc="See `GetStyle` and `SetStyle`") 
+    Underlined = property(GetUnderlined,SetUnderlined,doc="See `GetUnderlined` and `SetUnderlined`") 
+    Weight = property(GetWeight,SetWeight,doc="See `GetWeight` and `SetWeight`") 

 _gdi_.NativeFontInfo_swigregister(NativeFontInfo)
 
 class NativeEncodingInfo(object):
 _gdi_.NativeFontInfo_swigregister(NativeFontInfo)
 
 class NativeEncodingInfo(object):

diff --git a/wxPython/src/mac/_windows.py b/wxPython/src/mac/_windows.py
index 76c3fc9fccc9dc0df894592049dec345843f35e7..7bc3793f472d8c32a8de26aff56d196fc91c2793 100644 (file)
--- a/wxPython/src/mac/_windows.py
+++ b/wxPython/src/mac/_windows.py
@@ -2457,6 +2457,7 @@ class MultiChoiceDialog(Dialog):
         """
         return _windows_.MultiChoiceDialog_GetSelections(*args, **kwargs)
 
         """
         return _windows_.MultiChoiceDialog_GetSelections(*args, **kwargs)
 

+    Selections = property(GetSelections,SetSelections,doc="See `GetSelections` and `SetSelections`") 

 _windows_.MultiChoiceDialog_swigregister(MultiChoiceDialog)
 
 class SingleChoiceDialog(Dialog):
 _windows_.MultiChoiceDialog_swigregister(MultiChoiceDialog)
 
 class SingleChoiceDialog(Dialog):


@@ -2567,6 +2568,7 @@ class NumberEntryDialog(Dialog):
         """GetValue(self) -> long"""
         return _windows_.NumberEntryDialog_GetValue(*args, **kwargs)
 
         """GetValue(self) -> long"""
         return _windows_.NumberEntryDialog_GetValue(*args, **kwargs)
 

+    Value = property(GetValue,doc="See `GetValue`") 

 _windows_.NumberEntryDialog_swigregister(NumberEntryDialog)
 
 class FontData(_core.Object):
 _windows_.NumberEntryDialog_swigregister(NumberEntryDialog)
 
 class FontData(_core.Object):


@@ -3115,14 +3117,12 @@ class MDIParentFrame(Frame):
         """GetClientWindow(self) -> MDIClientWindow"""
         return _windows_.MDIParentFrame_GetClientWindow(*args, **kwargs)
 
         """GetClientWindow(self) -> MDIClientWindow"""
         return _windows_.MDIParentFrame_GetClientWindow(*args, **kwargs)
 

-    def GetToolBar(*args, **kwargs):
-        """GetToolBar(self) -> Window"""
-        return _windows_.MDIParentFrame_GetToolBar(*args, **kwargs)
-

     def Tile(*args, **kwargs):
         """Tile(self, int orient=HORIZONTAL)"""
         return _windows_.MDIParentFrame_Tile(*args, **kwargs)
 
     def Tile(*args, **kwargs):
         """Tile(self, int orient=HORIZONTAL)"""
         return _windows_.MDIParentFrame_Tile(*args, **kwargs)
 

+    ActiveChild = property(GetActiveChild,doc="See `GetActiveChild`") 
+    ClientWindow = property(GetClientWindow,doc="See `GetClientWindow`") 

 _windows_.MDIParentFrame_swigregister(MDIParentFrame)
 
 def PreMDIParentFrame(*args, **kwargs):
 _windows_.MDIParentFrame_swigregister(MDIParentFrame)
 
 def PreMDIParentFrame(*args, **kwargs):

diff --git a/wxPython/src/mac/_windows_wrap.cpp b/wxPython/src/mac/_windows_wrap.cpp
index 9d54e2d372495d3b12a2981838dbe9c416c51356..c84740bd933a3b1fe46b05509a7812de89259c4b 100644 (file)
--- a/wxPython/src/mac/_windows_wrap.cpp
+++ b/wxPython/src/mac/_windows_wrap.cpp
@@ -20806,36 +20806,6 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_MDIParentFrame_GetToolBar(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  wxMDIParentFrame *arg1 = (wxMDIParentFrame *) 0 ;
-  wxWindow *result = 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject *swig_obj[1] ;
-  
-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxMDIParentFrame, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MDIParentFrame_GetToolBar" "', expected argument " "1"" of type '" "wxMDIParentFrame *""'"); 
-  }
-  arg1 = reinterpret_cast< wxMDIParentFrame * >(argp1);
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (wxWindow *)(arg1)->GetToolBar();
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
-  }
-  {
-    resultobj = wxPyMake_wxObject(result, 0); 
-  }
-  return resultobj;
-fail:
-  return NULL;
-}
-
-

 SWIGINTERN PyObject *_wrap_MDIParentFrame_Tile(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxMDIParentFrame *arg1 = (wxMDIParentFrame *) 0 ;
 SWIGINTERN PyObject *_wrap_MDIParentFrame_Tile(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxMDIParentFrame *arg1 = (wxMDIParentFrame *) 0 ;


@@ -31272,7 +31242,6 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"MDIParentFrame_Cascade", (PyCFunction)_wrap_MDIParentFrame_Cascade, METH_O, NULL},
         { (char *)"MDIParentFrame_GetActiveChild", (PyCFunction)_wrap_MDIParentFrame_GetActiveChild, METH_O, NULL},
         { (char *)"MDIParentFrame_GetClientWindow", (PyCFunction)_wrap_MDIParentFrame_GetClientWindow, METH_O, NULL},
         { (char *)"MDIParentFrame_Cascade", (PyCFunction)_wrap_MDIParentFrame_Cascade, METH_O, NULL},
         { (char *)"MDIParentFrame_GetActiveChild", (PyCFunction)_wrap_MDIParentFrame_GetActiveChild, METH_O, NULL},
         { (char *)"MDIParentFrame_GetClientWindow", (PyCFunction)_wrap_MDIParentFrame_GetClientWindow, METH_O, NULL},

-        { (char *)"MDIParentFrame_GetToolBar", (PyCFunction)_wrap_MDIParentFrame_GetToolBar, METH_O, NULL},

         { (char *)"MDIParentFrame_Tile", (PyCFunction) _wrap_MDIParentFrame_Tile, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"MDIParentFrame_swigregister", MDIParentFrame_swigregister, METH_VARARGS, NULL},
         { (char *)"MDIParentFrame_swiginit", MDIParentFrame_swiginit, METH_VARARGS, NULL},
         { (char *)"MDIParentFrame_Tile", (PyCFunction) _wrap_MDIParentFrame_Tile, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"MDIParentFrame_swigregister", MDIParentFrame_swigregister, METH_VARARGS, NULL},
         { (char *)"MDIParentFrame_swiginit", MDIParentFrame_swiginit, METH_VARARGS, NULL},

diff --git a/wxPython/src/msw/_controls.py b/wxPython/src/msw/_controls.py
index f3db67ccf1967f21f3a5447398ce79afd9554683..cfd85af1e4b4afb05d54589ea324120bd4c0c64c 100644 (file)
--- a/wxPython/src/msw/_controls.py
+++ b/wxPython/src/msw/_controls.py
@@ -3079,6 +3079,8 @@ class Notebook(BookCtrlBase):
         return _controls_.Notebook_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)
         return _controls_.Notebook_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)

+    RowCount = property(GetRowCount,doc="See `GetRowCount`") 
+    ThemeBackgroundColour = property(GetThemeBackgroundColour,doc="See `GetThemeBackgroundColour`") 

 _controls_.Notebook_swigregister(Notebook)
 
 def PreNotebook(*args, **kwargs):
 _controls_.Notebook_swigregister(Notebook)
 
 def PreNotebook(*args, **kwargs):

diff --git a/wxPython/src/msw/_core.py b/wxPython/src/msw/_core.py
index 5ada107ae22c936e01d8d43a9e1e7b7674675408..db0c8723be6f3e86b0ebab34b54712625f58d1ec 100644 (file)
--- a/wxPython/src/msw/_core.py
+++ b/wxPython/src/msw/_core.py
@@ -4691,6 +4691,14 @@ class MouseEvent(Event):
     m_wheelRotation = property(_core_.MouseEvent_m_wheelRotation_get, _core_.MouseEvent_m_wheelRotation_set)
     m_wheelDelta = property(_core_.MouseEvent_m_wheelDelta_get, _core_.MouseEvent_m_wheelDelta_set)
     m_linesPerAction = property(_core_.MouseEvent_m_linesPerAction_get, _core_.MouseEvent_m_linesPerAction_set)
     m_wheelRotation = property(_core_.MouseEvent_m_wheelRotation_get, _core_.MouseEvent_m_wheelRotation_set)
     m_wheelDelta = property(_core_.MouseEvent_m_wheelDelta_get, _core_.MouseEvent_m_wheelDelta_set)
     m_linesPerAction = property(_core_.MouseEvent_m_linesPerAction_get, _core_.MouseEvent_m_linesPerAction_set)

+    Button = property(GetButton,doc="See `GetButton`") 
+    LinesPerAction = property(GetLinesPerAction,doc="See `GetLinesPerAction`") 
+    LogicalPosition = property(GetLogicalPosition,doc="See `GetLogicalPosition`") 
+    Position = property(GetPosition,doc="See `GetPosition`") 
+    WheelDelta = property(GetWheelDelta,doc="See `GetWheelDelta`") 
+    WheelRotation = property(GetWheelRotation,doc="See `GetWheelRotation`") 
+    X = property(GetX,doc="See `GetX`") 
+    Y = property(GetY,doc="See `GetY`") 

 _core_.MouseEvent_swigregister(MouseEvent)
 
 #---------------------------------------------------------------------------
 _core_.MouseEvent_swigregister(MouseEvent)
 
 #---------------------------------------------------------------------------


@@ -5106,6 +5114,8 @@ class MoveEvent(Event):
     m_pos =  property(GetPosition, SetPosition)
     m_rect = property(GetRect, SetRect)
 
     m_pos =  property(GetPosition, SetPosition)
     m_rect = property(GetRect, SetRect)
 

+    Position = property(GetPosition,SetPosition,doc="See `GetPosition` and `SetPosition`") 
+    Rect = property(GetRect,SetRect,doc="See `GetRect` and `SetRect`") 

 _core_.MoveEvent_swigregister(MoveEvent)
 
 #---------------------------------------------------------------------------
 _core_.MoveEvent_swigregister(MoveEvent)
 
 #---------------------------------------------------------------------------


@@ -5356,6 +5366,8 @@ class MenuEvent(Event):
         """
         return _core_.MenuEvent_GetMenu(*args, **kwargs)
 
         """
         return _core_.MenuEvent_GetMenu(*args, **kwargs)
 

+    Menu = property(GetMenu,doc="See `GetMenu`") 
+    MenuId = property(GetMenuId,doc="See `GetMenuId`") 

 _core_.MenuEvent_swigregister(MenuEvent)
 
 #---------------------------------------------------------------------------
 _core_.MenuEvent_swigregister(MenuEvent)
 
 #---------------------------------------------------------------------------


@@ -5964,6 +5976,7 @@ class MouseCaptureChangedEvent(Event):
         """
         return _core_.MouseCaptureChangedEvent_GetCapturedWindow(*args, **kwargs)
 
         """
         return _core_.MouseCaptureChangedEvent_GetCapturedWindow(*args, **kwargs)
 

+    CapturedWindow = property(GetCapturedWindow,doc="See `GetCapturedWindow`") 

 _core_.MouseCaptureChangedEvent_swigregister(MouseCaptureChangedEvent)
 
 #---------------------------------------------------------------------------
 _core_.MouseCaptureChangedEvent_swigregister(MouseCaptureChangedEvent)
 
 #---------------------------------------------------------------------------


@@ -6193,6 +6206,8 @@ class NavigationKeyEvent(Event):
     IsForward = _core_.NavigationKeyEvent_IsForward
     WinChange = _core_.NavigationKeyEvent_WinChange
     FromTab = _core_.NavigationKeyEvent_FromTab
     IsForward = _core_.NavigationKeyEvent_IsForward
     WinChange = _core_.NavigationKeyEvent_WinChange
     FromTab = _core_.NavigationKeyEvent_FromTab

+    CurrentFocus = property(GetCurrentFocus,SetCurrentFocus,doc="See `GetCurrentFocus` and `SetCurrentFocus`") 
+    Direction = property(GetDirection,SetDirection,doc="See `GetDirection` and `SetDirection`") 

 _core_.NavigationKeyEvent_swigregister(NavigationKeyEvent)
 
 #---------------------------------------------------------------------------
 _core_.NavigationKeyEvent_swigregister(NavigationKeyEvent)
 
 #---------------------------------------------------------------------------


@@ -10405,6 +10420,15 @@ class Menu(EvtHandler):
         """GetParent(self) -> Menu"""
         return _core_.Menu_GetParent(*args, **kwargs)
 
         """GetParent(self) -> Menu"""
         return _core_.Menu_GetParent(*args, **kwargs)
 

+    EventHandler = property(GetEventHandler,SetEventHandler,doc="See `GetEventHandler` and `SetEventHandler`") 
+    HelpString = property(GetHelpString,SetHelpString,doc="See `GetHelpString` and `SetHelpString`") 
+    InvokingWindow = property(GetInvokingWindow,SetInvokingWindow,doc="See `GetInvokingWindow` and `SetInvokingWindow`") 
+    MenuBar = property(GetMenuBar,doc="See `GetMenuBar`") 
+    MenuItemCount = property(GetMenuItemCount,doc="See `GetMenuItemCount`") 
+    MenuItems = property(GetMenuItems,doc="See `GetMenuItems`") 
+    Parent = property(GetParent,SetParent,doc="See `GetParent` and `SetParent`") 
+    Style = property(GetStyle,doc="See `GetStyle`") 
+    Title = property(GetTitle,SetTitle,doc="See `GetTitle` and `SetTitle`") 

 _core_.Menu_swigregister(Menu)
 DefaultValidator = cvar.DefaultValidator
 
 _core_.Menu_swigregister(Menu)
 DefaultValidator = cvar.DefaultValidator
 


@@ -10545,7 +10569,10 @@ class MenuBar(Window):
         for m, l in items:
             self.Append(m, l)
 
         for m, l in items:
             self.Append(m, l)
 

-    Menus = property(GetMenus,SetMenus) 
+    Frame = property(GetFrame,doc="See `GetFrame`") 
+    Menu = property(GetMenu,doc="See `GetMenu`") 
+    MenuCount = property(GetMenuCount,doc="See `GetMenuCount`") 
+    Menus = property(GetMenus,SetMenus,doc="See `GetMenus` and `SetMenus`") 

 _core_.MenuBar_swigregister(MenuBar)
 
 def MenuBar_SetAutoWindowMenu(*args, **kwargs):
 _core_.MenuBar_swigregister(MenuBar)
 
 def MenuBar_SetAutoWindowMenu(*args, **kwargs):


@@ -10741,6 +10768,20 @@ class MenuItem(Object):
         """ResetOwnerDrawn(self)"""
         return _core_.MenuItem_ResetOwnerDrawn(*args, **kwargs)
 
         """ResetOwnerDrawn(self)"""
         return _core_.MenuItem_ResetOwnerDrawn(*args, **kwargs)
 

+    Accel = property(GetAccel,SetAccel,doc="See `GetAccel` and `SetAccel`") 
+    BackgroundColour = property(GetBackgroundColour,SetBackgroundColour,doc="See `GetBackgroundColour` and `SetBackgroundColour`") 
+    Bitmap = property(GetBitmap,SetBitmap,doc="See `GetBitmap` and `SetBitmap`") 
+    DisabledBitmap = property(GetDisabledBitmap,SetDisabledBitmap,doc="See `GetDisabledBitmap` and `SetDisabledBitmap`") 
+    Font = property(GetFont,SetFont,doc="See `GetFont` and `SetFont`") 
+    Help = property(GetHelp,SetHelp,doc="See `GetHelp` and `SetHelp`") 
+    Id = property(GetId,SetId,doc="See `GetId` and `SetId`") 
+    Kind = property(GetKind,SetKind,doc="See `GetKind` and `SetKind`") 
+    Label = property(GetLabel,doc="See `GetLabel`") 
+    MarginWidth = property(GetMarginWidth,SetMarginWidth,doc="See `GetMarginWidth` and `SetMarginWidth`") 
+    Menu = property(GetMenu,SetMenu,doc="See `GetMenu` and `SetMenu`") 
+    SubMenu = property(GetSubMenu,SetSubMenu,doc="See `GetSubMenu` and `SetSubMenu`") 
+    Text = property(GetText,SetText,doc="See `GetText` and `SetText`") 
+    TextColour = property(GetTextColour,SetTextColour,doc="See `GetTextColour` and `SetTextColour`") 

 _core_.MenuItem_swigregister(MenuItem)
 
 def MenuItem_GetLabelFromText(*args, **kwargs):
 _core_.MenuItem_swigregister(MenuItem)
 
 def MenuItem_GetLabelFromText(*args, **kwargs):

diff --git a/wxPython/src/msw/_gdi.py b/wxPython/src/msw/_gdi.py
index 75e8a687d8d5dcec661e57e9ff18c361aa5bb1a0..70139b4fde3d8b7f56dced9bd24c54bce3a4808e 100644 (file)
--- a/wxPython/src/msw/_gdi.py
+++ b/wxPython/src/msw/_gdi.py
@@ -1755,6 +1755,13 @@ class NativeFontInfo(object):
         """ToUserString(self) -> String"""
         return _gdi_.NativeFontInfo_ToUserString(*args, **kwargs)
 
         """ToUserString(self) -> String"""
         return _gdi_.NativeFontInfo_ToUserString(*args, **kwargs)
 

+    Encoding = property(GetEncoding,SetEncoding,doc="See `GetEncoding` and `SetEncoding`") 
+    FaceName = property(GetFaceName,SetFaceName,doc="See `GetFaceName` and `SetFaceName`") 
+    Family = property(GetFamily,SetFamily,doc="See `GetFamily` and `SetFamily`") 
+    PointSize = property(GetPointSize,SetPointSize,doc="See `GetPointSize` and `SetPointSize`") 
+    Style = property(GetStyle,SetStyle,doc="See `GetStyle` and `SetStyle`") 
+    Underlined = property(GetUnderlined,SetUnderlined,doc="See `GetUnderlined` and `SetUnderlined`") 
+    Weight = property(GetWeight,SetWeight,doc="See `GetWeight` and `SetWeight`") 

 _gdi_.NativeFontInfo_swigregister(NativeFontInfo)
 
 class NativeEncodingInfo(object):
 _gdi_.NativeFontInfo_swigregister(NativeFontInfo)
 
 class NativeEncodingInfo(object):

diff --git a/wxPython/src/msw/_windows.py b/wxPython/src/msw/_windows.py
index 483b40a0f9f3462c8ea11041818d246855704232..96633a43a2a279f895854ff1213d2353a62f7553 100644 (file)
--- a/wxPython/src/msw/_windows.py
+++ b/wxPython/src/msw/_windows.py
@@ -2485,6 +2485,7 @@ class MultiChoiceDialog(Dialog):
         """
         return _windows_.MultiChoiceDialog_GetSelections(*args, **kwargs)
 
         """
         return _windows_.MultiChoiceDialog_GetSelections(*args, **kwargs)
 

+    Selections = property(GetSelections,SetSelections,doc="See `GetSelections` and `SetSelections`") 

 _windows_.MultiChoiceDialog_swigregister(MultiChoiceDialog)
 
 class SingleChoiceDialog(Dialog):
 _windows_.MultiChoiceDialog_swigregister(MultiChoiceDialog)
 
 class SingleChoiceDialog(Dialog):


@@ -2595,6 +2596,7 @@ class NumberEntryDialog(Dialog):
         """GetValue(self) -> long"""
         return _windows_.NumberEntryDialog_GetValue(*args, **kwargs)
 
         """GetValue(self) -> long"""
         return _windows_.NumberEntryDialog_GetValue(*args, **kwargs)
 

+    Value = property(GetValue,doc="See `GetValue`") 

 _windows_.NumberEntryDialog_swigregister(NumberEntryDialog)
 
 class FontData(_core.Object):
 _windows_.NumberEntryDialog_swigregister(NumberEntryDialog)
 
 class FontData(_core.Object):


@@ -3143,10 +3145,6 @@ class MDIParentFrame(Frame):
         """GetClientWindow(self) -> MDIClientWindow"""
         return _windows_.MDIParentFrame_GetClientWindow(*args, **kwargs)
 
         """GetClientWindow(self) -> MDIClientWindow"""
         return _windows_.MDIParentFrame_GetClientWindow(*args, **kwargs)
 

-    def GetToolBar(*args, **kwargs):
-        """GetToolBar(self) -> Window"""
-        return _windows_.MDIParentFrame_GetToolBar(*args, **kwargs)
-

     def GetWindowMenu(*args, **kwargs):
         """GetWindowMenu(self) -> Menu"""
         return _windows_.MDIParentFrame_GetWindowMenu(*args, **kwargs)
     def GetWindowMenu(*args, **kwargs):
         """GetWindowMenu(self) -> Menu"""
         return _windows_.MDIParentFrame_GetWindowMenu(*args, **kwargs)


@@ -3159,6 +3157,8 @@ class MDIParentFrame(Frame):
         """Tile(self, int orient=HORIZONTAL)"""
         return _windows_.MDIParentFrame_Tile(*args, **kwargs)
 
         """Tile(self, int orient=HORIZONTAL)"""
         return _windows_.MDIParentFrame_Tile(*args, **kwargs)
 

+    ActiveChild = property(GetActiveChild,doc="See `GetActiveChild`") 
+    ClientWindow = property(GetClientWindow,doc="See `GetClientWindow`") 

 _windows_.MDIParentFrame_swigregister(MDIParentFrame)
 
 def PreMDIParentFrame(*args, **kwargs):
 _windows_.MDIParentFrame_swigregister(MDIParentFrame)
 
 def PreMDIParentFrame(*args, **kwargs):

diff --git a/wxPython/src/msw/_windows_wrap.cpp b/wxPython/src/msw/_windows_wrap.cpp
index 9fcfff09fa27745a2c2d1cfdb12ad869efe698f8..9c0ef482b96a842b34aee0a129d91601b7a234ea 100644 (file)
--- a/wxPython/src/msw/_windows_wrap.cpp
+++ b/wxPython/src/msw/_windows_wrap.cpp
@@ -21005,36 +21005,6 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_MDIParentFrame_GetToolBar(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  wxMDIParentFrame *arg1 = (wxMDIParentFrame *) 0 ;
-  wxWindow *result = 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject *swig_obj[1] ;
-  
-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxMDIParentFrame, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MDIParentFrame_GetToolBar" "', expected argument " "1"" of type '" "wxMDIParentFrame *""'"); 
-  }
-  arg1 = reinterpret_cast< wxMDIParentFrame * >(argp1);
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (wxWindow *)(arg1)->GetToolBar();
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
-  }
-  {
-    resultobj = wxPyMake_wxObject(result, 0); 
-  }
-  return resultobj;
-fail:
-  return NULL;
-}
-
-

 SWIGINTERN PyObject *_wrap_MDIParentFrame_GetWindowMenu(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxMDIParentFrame *arg1 = (wxMDIParentFrame *) 0 ;
 SWIGINTERN PyObject *_wrap_MDIParentFrame_GetWindowMenu(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxMDIParentFrame *arg1 = (wxMDIParentFrame *) 0 ;


@@ -31544,7 +31514,6 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"MDIParentFrame_Cascade", (PyCFunction)_wrap_MDIParentFrame_Cascade, METH_O, NULL},
         { (char *)"MDIParentFrame_GetActiveChild", (PyCFunction)_wrap_MDIParentFrame_GetActiveChild, METH_O, NULL},
         { (char *)"MDIParentFrame_GetClientWindow", (PyCFunction)_wrap_MDIParentFrame_GetClientWindow, METH_O, NULL},
         { (char *)"MDIParentFrame_Cascade", (PyCFunction)_wrap_MDIParentFrame_Cascade, METH_O, NULL},
         { (char *)"MDIParentFrame_GetActiveChild", (PyCFunction)_wrap_MDIParentFrame_GetActiveChild, METH_O, NULL},
         { (char *)"MDIParentFrame_GetClientWindow", (PyCFunction)_wrap_MDIParentFrame_GetClientWindow, METH_O, NULL},

-        { (char *)"MDIParentFrame_GetToolBar", (PyCFunction)_wrap_MDIParentFrame_GetToolBar, METH_O, NULL},

         { (char *)"MDIParentFrame_GetWindowMenu", (PyCFunction)_wrap_MDIParentFrame_GetWindowMenu, METH_O, NULL},
         { (char *)"MDIParentFrame_SetWindowMenu", (PyCFunction) _wrap_MDIParentFrame_SetWindowMenu, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"MDIParentFrame_Tile", (PyCFunction) _wrap_MDIParentFrame_Tile, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"MDIParentFrame_GetWindowMenu", (PyCFunction)_wrap_MDIParentFrame_GetWindowMenu, METH_O, NULL},
         { (char *)"MDIParentFrame_SetWindowMenu", (PyCFunction) _wrap_MDIParentFrame_SetWindowMenu, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"MDIParentFrame_Tile", (PyCFunction) _wrap_MDIParentFrame_Tile, METH_VARARGS | METH_KEYWORDS, NULL},