reSWIGged

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

diff --git a/wxPython/contrib/stc/msw/stc.py b/wxPython/contrib/stc/msw/stc.py
index 6782100c2bddb65799434252404b2e11a943b121..347248d82edd87b6faa82a5e1f8a43a722861d58 100644 (file)
--- a/wxPython/contrib/stc/msw/stc.py
+++ b/wxPython/contrib/stc/msw/stc.py
@@ -2215,21 +2215,21 @@ class StyledTextCtrl(_core.Control):
         """
         return _stc.StyledTextCtrl_SetCaretLineVisible(*args, **kwargs)
 
-    def GetCaretLineBack(*args, **kwargs):
+    def GetCaretLineBackground(*args, **kwargs):
         """
-        GetCaretLineBack(self) -> Colour
+        GetCaretLineBackground(self) -> Colour
 
         Get the colour of the background of the line containing the caret.
         """
-        return _stc.StyledTextCtrl_GetCaretLineBack(*args, **kwargs)
+        return _stc.StyledTextCtrl_GetCaretLineBackground(*args, **kwargs)
 
-    def SetCaretLineBack(*args, **kwargs):
+    def SetCaretLineBackground(*args, **kwargs):
         """
-        SetCaretLineBack(self, Colour back)
+        SetCaretLineBackground(self, Colour back)
 
         Set the colour of the background of the line containing the caret.
         """
-        return _stc.StyledTextCtrl_SetCaretLineBack(*args, **kwargs)
+        return _stc.StyledTextCtrl_SetCaretLineBackground(*args, **kwargs)
 
     def StyleSetChangeable(*args, **kwargs):
         """
@@ -5273,6 +5273,9 @@ class StyledTextCtrl(_core.Control):
         self.AppendTextRaw(text)
 
 
+    GetCaretLineBack = GetCaretLineBackground
+    SetCaretLineBack = SetCaretLineBackground
+
 _stc.StyledTextCtrl_swigregister(StyledTextCtrl)
 cvar = _stc.cvar
 STCNameStr = cvar.STCNameStr

diff --git a/wxPython/contrib/stc/msw/stc_wrap.cpp b/wxPython/contrib/stc/msw/stc_wrap.cpp
index a6fb9ceb1fcc25f6de63991212c6b15c52a337f8..3b8d26ef2b1d919c6bbcfb6983260bb47f0c9df9 100644 (file)
--- a/wxPython/contrib/stc/msw/stc_wrap.cpp
+++ b/wxPython/contrib/stc/msw/stc_wrap.cpp
@@ -6970,7 +6970,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_StyledTextCtrl_GetCaretLineBack(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_StyledTextCtrl_GetCaretLineBackground(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
   wxColour result;
@@ -6982,12 +6982,12 @@ SWIGINTERN PyObject *_wrap_StyledTextCtrl_GetCaretLineBack(PyObject *SWIGUNUSEDP
   swig_obj[0] = args;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxStyledTextCtrl, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StyledTextCtrl_GetCaretLineBack" "', expected argument " "1"" of type '" "wxStyledTextCtrl *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StyledTextCtrl_GetCaretLineBackground" "', expected argument " "1"" of type '" "wxStyledTextCtrl *""'"); 
   }
   arg1 = reinterpret_cast< wxStyledTextCtrl * >(argp1);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (arg1)->GetCaretLineBack();
+    result = (arg1)->GetCaretLineBackground();
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
@@ -6998,7 +6998,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_StyledTextCtrl_SetCaretLineBack(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+SWIGINTERN PyObject *_wrap_StyledTextCtrl_SetCaretLineBackground(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
   wxColour *arg2 = 0 ;
@@ -7011,10 +7011,10 @@ SWIGINTERN PyObject *_wrap_StyledTextCtrl_SetCaretLineBack(PyObject *SWIGUNUSEDP
     (char *) "self",(char *) "back", NULL 
   };
   
-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_SetCaretLineBack",kwnames,&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_SetCaretLineBackground",kwnames,&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxStyledTextCtrl, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StyledTextCtrl_SetCaretLineBack" "', expected argument " "1"" of type '" "wxStyledTextCtrl *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StyledTextCtrl_SetCaretLineBackground" "', expected argument " "1"" of type '" "wxStyledTextCtrl *""'"); 
   }
   arg1 = reinterpret_cast< wxStyledTextCtrl * >(argp1);
   {
@@ -7023,7 +7023,7 @@ SWIGINTERN PyObject *_wrap_StyledTextCtrl_SetCaretLineBack(PyObject *SWIGUNUSEDP
   }
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
-    (arg1)->SetCaretLineBack((wxColour const &)*arg2);
+    (arg1)->SetCaretLineBackground((wxColour const &)*arg2);
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
@@ -21298,8 +21298,8 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"StyledTextCtrl_GetMaxLineState", (PyCFunction)_wrap_StyledTextCtrl_GetMaxLineState, METH_O, NULL},
         { (char *)"StyledTextCtrl_GetCaretLineVisible", (PyCFunction)_wrap_StyledTextCtrl_GetCaretLineVisible, METH_O, NULL},
         { (char *)"StyledTextCtrl_SetCaretLineVisible", (PyCFunction) _wrap_StyledTextCtrl_SetCaretLineVisible, METH_VARARGS | METH_KEYWORDS, NULL},
-        { (char *)"StyledTextCtrl_GetCaretLineBack", (PyCFunction)_wrap_StyledTextCtrl_GetCaretLineBack, METH_O, NULL},
-        { (char *)"StyledTextCtrl_SetCaretLineBack", (PyCFunction) _wrap_StyledTextCtrl_SetCaretLineBack, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"StyledTextCtrl_GetCaretLineBackground", (PyCFunction)_wrap_StyledTextCtrl_GetCaretLineBackground, METH_O, NULL},
+        { (char *)"StyledTextCtrl_SetCaretLineBackground", (PyCFunction) _wrap_StyledTextCtrl_SetCaretLineBackground, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"StyledTextCtrl_StyleSetChangeable", (PyCFunction) _wrap_StyledTextCtrl_StyleSetChangeable, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"StyledTextCtrl_AutoCompShow", (PyCFunction) _wrap_StyledTextCtrl_AutoCompShow, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"StyledTextCtrl_AutoCompCancel", (PyCFunction)_wrap_StyledTextCtrl_AutoCompCancel, METH_O, NULL},

diff --git a/wxPython/src/msw/_controls.py b/wxPython/src/msw/_controls.py
index df1e8e58c346d09d5324a62f8137e98e8db4cea7..a262d452113f3a55ae485d5dffffa0f3e7b5e908 100644 (file)
--- a/wxPython/src/msw/_controls.py
+++ b/wxPython/src/msw/_controls.py
@@ -297,6 +297,13 @@ class BitmapButton(Button):
         """GetMarginY(self) -> int"""
         return _controls_.BitmapButton_GetMarginY(*args, **kwargs)
 
+    BitmapDisabled = property(GetBitmapDisabled,SetBitmapDisabled,doc="See `GetBitmapDisabled` and `SetBitmapDisabled`") 
+    BitmapFocus = property(GetBitmapFocus,SetBitmapFocus,doc="See `GetBitmapFocus` and `SetBitmapFocus`") 
+    BitmapHover = property(GetBitmapHover,SetBitmapHover,doc="See `GetBitmapHover` and `SetBitmapHover`") 
+    BitmapLabel = property(GetBitmapLabel,SetBitmapLabel,doc="See `GetBitmapLabel` and `SetBitmapLabel`") 
+    BitmapSelected = property(GetBitmapSelected,SetBitmapSelected,doc="See `GetBitmapSelected` and `SetBitmapSelected`") 
+    MarginX = property(GetMarginX,doc="See `GetMarginX`") 
+    MarginY = property(GetMarginY,doc="See `GetMarginY`") 
 _controls_.BitmapButton_swigregister(BitmapButton)
 
 def PreBitmapButton(*args, **kwargs):
@@ -434,6 +441,8 @@ class CheckBox(_core.Control):
         return _controls_.CheckBox_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)
+    ThreeStateValue = property(Get3StateValue,Set3StateValue,doc="See `Get3StateValue` and `Set3StateValue`") 
+    Value = property(GetValue,SetValue,doc="See `GetValue` and `SetValue`") 
 _controls_.CheckBox_swigregister(CheckBox)
 CheckBoxNameStr = cvar.CheckBoxNameStr
 
@@ -525,6 +534,7 @@ class Choice(_core.ControlWithItems):
         return _controls_.Choice_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)
+    CurrentSelection = property(GetCurrentSelection,doc="See `GetCurrentSelection`") 
 _controls_.Choice_swigregister(Choice)
 ChoiceNameStr = cvar.ChoiceNameStr
 
@@ -821,6 +831,11 @@ class ComboBox(Choice):
         return _controls_.ComboBox_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)
+    CurrentSelection = property(GetCurrentSelection,doc="See `GetCurrentSelection`") 
+    InsertionPoint = property(GetInsertionPoint,SetInsertionPoint,doc="See `GetInsertionPoint` and `SetInsertionPoint`") 
+    LastPosition = property(GetLastPosition,doc="See `GetLastPosition`") 
+    Mark = property(GetMark,SetMark,doc="See `GetMark` and `SetMark`") 
+    Value = property(GetValue,SetValue,doc="See `GetValue` and `SetValue`") 
 _controls_.ComboBox_swigregister(ComboBox)
 ComboBoxNameStr = cvar.ComboBoxNameStr
 
@@ -1452,6 +1467,7 @@ class CheckListBox(ListBox):
         """GetItemHeight(self) -> int"""
         return _controls_.CheckListBox_GetItemHeight(*args, **kwargs)
 
+    ItemHeight = property(GetItemHeight,doc="See `GetItemHeight`") 
 _controls_.CheckListBox_swigregister(CheckListBox)
 
 def PreCheckListBox(*args, **kwargs):
@@ -2921,6 +2937,17 @@ class BookCtrlBase(_core.Control):
         return _controls_.BookCtrlBase_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)
+    ControlMargin = property(GetControlMargin,SetControlMargin,doc="See `GetControlMargin` and `SetControlMargin`") 
+    ControlSizer = property(GetControlSizer,doc="See `GetControlSizer`") 
+    CurrentPage = property(GetCurrentPage,doc="See `GetCurrentPage`") 
+    FitToCurrentPage = property(GetFitToCurrentPage,SetFitToCurrentPage,doc="See `GetFitToCurrentPage` and `SetFitToCurrentPage`") 
+    ImageList = property(GetImageList,SetImageList,doc="See `GetImageList` and `SetImageList`") 
+    InternalBorder = property(GetInternalBorder,SetInternalBorder,doc="See `GetInternalBorder` and `SetInternalBorder`") 
+    Page = property(GetPage,doc="See `GetPage`") 
+    PageCount = property(GetPageCount,doc="See `GetPageCount`") 
+    PageImage = property(GetPageImage,SetPageImage,doc="See `GetPageImage` and `SetPageImage`") 
+    PageText = property(GetPageText,SetPageText,doc="See `GetPageText` and `SetPageText`") 
+    Selection = property(GetSelection,SetSelection,doc="See `GetSelection` and `SetSelection`") 
 _controls_.BookCtrlBase_swigregister(BookCtrlBase)
 NotebookNameStr = cvar.NotebookNameStr
 
@@ -2972,6 +2999,8 @@ class BookCtrlBaseEvent(_core.NotifyEvent):
         """SetOldSelection(self, int nOldSel)"""
         return _controls_.BookCtrlBaseEvent_SetOldSelection(*args, **kwargs)
 
+    OldSelection = property(GetOldSelection,SetOldSelection,doc="See `GetOldSelection` and `SetOldSelection`") 
+    Selection = property(GetSelection,SetSelection,doc="See `GetSelection` and `SetSelection`") 
 _controls_.BookCtrlBaseEvent_swigregister(BookCtrlBaseEvent)
 
 #---------------------------------------------------------------------------
@@ -3197,6 +3226,7 @@ class Choicebook(BookCtrlBase):
         """GetChoiceCtrl(self) -> Choice"""
         return _controls_.Choicebook_GetChoiceCtrl(*args, **kwargs)
 
+    ChoiceCtrl = property(GetChoiceCtrl,doc="See `GetChoiceCtrl`") 
 _controls_.Choicebook_swigregister(Choicebook)
 
 def PreChoicebook(*args, **kwargs):
@@ -6112,6 +6142,7 @@ class DragImage(_core.Object):
         """RedrawImage(self, Point oldPos, Point newPos, bool eraseOld, bool drawNew) -> bool"""
         return _controls_.DragImage_RedrawImage(*args, **kwargs)
 
+    ImageRect = property(GetImageRect,doc="See `GetImageRect`") 
 _controls_.DragImage_swigregister(DragImage)
 
 def DragIcon(*args, **kwargs):
@@ -6232,6 +6263,9 @@ class DatePickerCtrl(_core.Control):
         """
         return _controls_.DatePickerCtrl_GetUpperLimit(*args, **kwargs)
 
+    LowerLimit = property(GetLowerLimit,doc="See `GetLowerLimit`") 
+    UpperLimit = property(GetUpperLimit,doc="See `GetUpperLimit`") 
+    Value = property(GetValue,SetValue,doc="See `GetValue` and `SetValue`") 
 _controls_.DatePickerCtrl_swigregister(DatePickerCtrl)
 DatePickerCtrlNameStr = cvar.DatePickerCtrlNameStr
 
@@ -6546,6 +6580,7 @@ class ColourPickerCtrl(PickerBase):
         """
         return _controls_.ColourPickerCtrl_SetColour(*args, **kwargs)
 
+    Colour = property(GetColour,SetColour,doc="See `GetColour` and `SetColour`") 
 _controls_.ColourPickerCtrl_swigregister(ColourPickerCtrl)
 ColourPickerCtrlNameStr = cvar.ColourPickerCtrlNameStr
 
@@ -6579,6 +6614,7 @@ class ColourPickerEvent(_core.CommandEvent):
         """SetColour(self, Colour c)"""
         return _controls_.ColourPickerEvent_SetColour(*args, **kwargs)
 
+    Colour = property(GetColour,SetColour,doc="See `GetColour` and `SetColour`") 
 _controls_.ColourPickerEvent_swigregister(ColourPickerEvent)
 
 #---------------------------------------------------------------------------
@@ -6690,6 +6726,8 @@ class DirPickerCtrl(PickerBase):
         """GetTextCtrlValue(self) -> String"""
         return _controls_.DirPickerCtrl_GetTextCtrlValue(*args, **kwargs)
 
+    Path = property(GetPath,SetPath,doc="See `GetPath` and `SetPath`") 
+    TextCtrlValue = property(GetTextCtrlValue,doc="See `GetTextCtrlValue`") 
 _controls_.DirPickerCtrl_swigregister(DirPickerCtrl)
 
 def PreDirPickerCtrl(*args, **kwargs):

diff --git a/wxPython/src/msw/_core.py b/wxPython/src/msw/_core.py
index 5daca2919fb31c0222fafed4aff1bbf50579524e..357622a4faa3c9f66bd6e26120f719d0c32de0be 100644 (file)
--- a/wxPython/src/msw/_core.py
+++ b/wxPython/src/msw/_core.py
@@ -4085,6 +4085,12 @@ class CommandEvent(Event):
         """Clone(self) -> Event"""
         return _core_.CommandEvent_Clone(*args, **kwargs)
 
+    ClientData = property(GetClientData,SetClientData,doc="See `GetClientData` and `SetClientData`") 
+    ClientObject = property(GetClientObject,SetClientObject,doc="See `GetClientObject` and `SetClientObject`") 
+    ExtraLong = property(GetExtraLong,SetExtraLong,doc="See `GetExtraLong` and `SetExtraLong`") 
+    Int = property(GetInt,SetInt,doc="See `GetInt` and `SetInt`") 
+    Selection = property(GetSelection,doc="See `GetSelection`") 
+    String = property(GetString,SetString,doc="See `GetString` and `SetString`") 
 _core_.CommandEvent_swigregister(CommandEvent)
 
 #---------------------------------------------------------------------------
@@ -5189,6 +5195,7 @@ class ChildFocusEvent(CommandEvent):
         """
         return _core_.ChildFocusEvent_GetWindow(*args, **kwargs)
 
+    Window = property(GetWindow,doc="See `GetWindow`") 
 _core_.ChildFocusEvent_swigregister(ChildFocusEvent)
 
 #---------------------------------------------------------------------------
@@ -5228,6 +5235,7 @@ class ActivateEvent(Event):
         """
         return _core_.ActivateEvent_GetActive(*args, **kwargs)
 
+    Active = property(GetActive,doc="See `GetActive`") 
 _core_.ActivateEvent_swigregister(ActivateEvent)
 
 #---------------------------------------------------------------------------
@@ -5388,6 +5396,8 @@ class CloseEvent(Event):
         """
         return _core_.CloseEvent_CanVeto(*args, **kwargs)
 
+    LoggingOff = property(GetLoggingOff,SetLoggingOff,doc="See `GetLoggingOff` and `SetLoggingOff`") 
+    Veto = property(GetVeto,doc="See `GetVeto`") 
 _core_.CloseEvent_swigregister(CloseEvent)
 
 #---------------------------------------------------------------------------
@@ -5501,6 +5511,9 @@ class DropFilesEvent(Event):
         """
         return _core_.DropFilesEvent_GetFiles(*args, **kwargs)
 
+    Files = property(GetFiles,doc="See `GetFiles`") 
+    NumberOfFiles = property(GetNumberOfFiles,doc="See `GetNumberOfFiles`") 
+    Position = property(GetPosition,doc="See `GetPosition`") 
 _core_.DropFilesEvent_swigregister(DropFilesEvent)
 
 #---------------------------------------------------------------------------
@@ -6233,6 +6246,7 @@ class ContextMenuEvent(CommandEvent):
         """
         return _core_.ContextMenuEvent_SetPosition(*args, **kwargs)
 
+    Position = property(GetPosition,SetPosition,doc="See `GetPosition` and `SetPosition`") 
 _core_.ContextMenuEvent_swigregister(ContextMenuEvent)
 
 #---------------------------------------------------------------------------
@@ -6501,6 +6515,7 @@ class DateEvent(CommandEvent):
         """
         return _core_.DateEvent_SetDate(*args, **kwargs)
 
+    Date = property(GetDate,SetDate,doc="See `GetDate` and `SetDate`") 
 _core_.DateEvent_swigregister(DateEvent)
 
 wxEVT_DATE_CHANGED = _core_.wxEVT_DATE_CHANGED
@@ -7510,6 +7525,9 @@ class AcceleratorEntry(object):
         """
         return _core_.AcceleratorEntry_GetCommand(*args, **kwargs)
 
+    Command = property(GetCommand,doc="See `GetCommand`") 
+    Flags = property(GetFlags,doc="See `GetFlags`") 
+    KeyCode = property(GetKeyCode,doc="See `GetKeyCode`") 
 _core_.AcceleratorEntry_swigregister(AcceleratorEntry)
 
 class AcceleratorTable(Object):
@@ -9737,6 +9755,65 @@ class Window(EvtHandler):
     def SendSizeEvent(self):
         self.GetEventHandler().ProcessEvent(wx.SizeEvent((-1,-1)))
 
+    AcceleratorTable = property(GetAcceleratorTable,SetAcceleratorTable,doc="See `GetAcceleratorTable` and `SetAcceleratorTable`") 
+    AdjustedBestSize = property(GetAdjustedBestSize,doc="See `GetAdjustedBestSize`") 
+    AutoLayout = property(GetAutoLayout,SetAutoLayout,doc="See `GetAutoLayout` and `SetAutoLayout`") 
+    BackgroundColour = property(GetBackgroundColour,SetBackgroundColour,doc="See `GetBackgroundColour` and `SetBackgroundColour`") 
+    BackgroundStyle = property(GetBackgroundStyle,SetBackgroundStyle,doc="See `GetBackgroundStyle` and `SetBackgroundStyle`") 
+    BestFittingSize = property(GetBestFittingSize,SetBestFittingSize,doc="See `GetBestFittingSize` and `SetBestFittingSize`") 
+    BestSize = property(GetBestSize,doc="See `GetBestSize`") 
+    BestVirtualSize = property(GetBestVirtualSize,doc="See `GetBestVirtualSize`") 
+    Border = property(GetBorder,doc="See `GetBorder`") 
+    Caret = property(GetCaret,SetCaret,doc="See `GetCaret` and `SetCaret`") 
+    CharHeight = property(GetCharHeight,doc="See `GetCharHeight`") 
+    CharWidth = property(GetCharWidth,doc="See `GetCharWidth`") 
+    Children = property(GetChildren,doc="See `GetChildren`") 
+    ClientAreaOrigin = property(GetClientAreaOrigin,doc="See `GetClientAreaOrigin`") 
+    ClientRect = property(GetClientRect,SetClientRect,doc="See `GetClientRect` and `SetClientRect`") 
+    ClientSize = property(GetClientSize,SetClientSize,doc="See `GetClientSize` and `SetClientSize`") 
+    Constraints = property(GetConstraints,SetConstraints,doc="See `GetConstraints` and `SetConstraints`") 
+    ContainingSizer = property(GetContainingSizer,SetContainingSizer,doc="See `GetContainingSizer` and `SetContainingSizer`") 
+    Cursor = property(GetCursor,SetCursor,doc="See `GetCursor` and `SetCursor`") 
+    DefaultAttributes = property(GetDefaultAttributes,doc="See `GetDefaultAttributes`") 
+    DropTarget = property(GetDropTarget,SetDropTarget,doc="See `GetDropTarget` and `SetDropTarget`") 
+    EventHandler = property(GetEventHandler,SetEventHandler,doc="See `GetEventHandler` and `SetEventHandler`") 
+    ExtraStyle = property(GetExtraStyle,SetExtraStyle,doc="See `GetExtraStyle` and `SetExtraStyle`") 
+    Font = property(GetFont,SetFont,doc="See `GetFont` and `SetFont`") 
+    ForegroundColour = property(GetForegroundColour,SetForegroundColour,doc="See `GetForegroundColour` and `SetForegroundColour`") 
+    FullTextExtent = property(GetFullTextExtent,doc="See `GetFullTextExtent`") 
+    GrandParent = property(GetGrandParent,doc="See `GetGrandParent`") 
+    Handle = property(GetHandle,doc="See `GetHandle`") 
+    HelpText = property(GetHelpText,SetHelpText,doc="See `GetHelpText` and `SetHelpText`") 
+    HelpTextAtPoint = property(GetHelpTextAtPoint,doc="See `GetHelpTextAtPoint`") 
+    Id = property(GetId,SetId,doc="See `GetId` and `SetId`") 
+    Label = property(GetLabel,SetLabel,doc="See `GetLabel` and `SetLabel`") 
+    MaxHeight = property(GetMaxHeight,doc="See `GetMaxHeight`") 
+    MaxSize = property(GetMaxSize,SetMaxSize,doc="See `GetMaxSize` and `SetMaxSize`") 
+    MaxWidth = property(GetMaxWidth,doc="See `GetMaxWidth`") 
+    MinHeight = property(GetMinHeight,doc="See `GetMinHeight`") 
+    MinSize = property(GetMinSize,SetMinSize,doc="See `GetMinSize` and `SetMinSize`") 
+    MinWidth = property(GetMinWidth,doc="See `GetMinWidth`") 
+    Name = property(GetName,SetName,doc="See `GetName` and `SetName`") 
+    Parent = property(GetParent,doc="See `GetParent`") 
+    Position = property(GetPosition,SetPosition,doc="See `GetPosition` and `SetPosition`") 
+    Rect = property(GetRect,SetRect,doc="See `GetRect` and `SetRect`") 
+    ScreenPosition = property(GetScreenPosition,doc="See `GetScreenPosition`") 
+    ScreenRect = property(GetScreenRect,doc="See `GetScreenRect`") 
+    ScrollPos = property(GetScrollPos,SetScrollPos,doc="See `GetScrollPos` and `SetScrollPos`") 
+    ScrollRange = property(GetScrollRange,doc="See `GetScrollRange`") 
+    ScrollThumb = property(GetScrollThumb,doc="See `GetScrollThumb`") 
+    Size = property(GetSize,SetSize,doc="See `GetSize` and `SetSize`") 
+    Sizer = property(GetSizer,SetSizer,doc="See `GetSizer` and `SetSizer`") 
+    TextExtent = property(GetTextExtent,doc="See `GetTextExtent`") 
+    ThemeEnabled = property(GetThemeEnabled,SetThemeEnabled,doc="See `GetThemeEnabled` and `SetThemeEnabled`") 
+    ToolTip = property(GetToolTip,SetToolTip,doc="See `GetToolTip` and `SetToolTip`") 
+    UpdateClientRect = property(GetUpdateClientRect,doc="See `GetUpdateClientRect`") 
+    UpdateRegion = property(GetUpdateRegion,doc="See `GetUpdateRegion`") 
+    Validator = property(GetValidator,SetValidator,doc="See `GetValidator` and `SetValidator`") 
+    VirtualSize = property(GetVirtualSize,SetVirtualSize,doc="See `GetVirtualSize` and `SetVirtualSize`") 
+    WindowStyle = property(GetWindowStyle,SetWindowStyle,doc="See `GetWindowStyle` and `SetWindowStyle`") 
+    WindowStyleFlag = property(GetWindowStyleFlag,SetWindowStyleFlag,doc="See `GetWindowStyleFlag` and `SetWindowStyleFlag`") 
+    WindowVariant = property(GetWindowVariant,SetWindowVariant,doc="See `GetWindowVariant` and `SetWindowVariant`") 
 _core_.Window_swigregister(Window)
 
 def PreWindow(*args, **kwargs):
@@ -10620,6 +10697,9 @@ class Control(Window):
         return _core_.Control_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)
+    Alignment = property(GetAlignment,doc="See `GetAlignment`") 
+    Label = property(GetLabel,doc="See `GetLabel`") 
+    LabelText = property(GetLabelText,doc="See `GetLabelText`") 
 _core_.Control_swigregister(Control)
 ControlNameStr = cvar.ControlNameStr
 
@@ -11676,6 +11756,7 @@ class BoxSizer(Sizer):
         """
         return _core_.BoxSizer_SetOrientation(*args, **kwargs)
 
+    Orientation = property(GetOrientation,SetOrientation,doc="See `GetOrientation` and `SetOrientation`") 
 _core_.BoxSizer_swigregister(BoxSizer)
 
 #---------------------------------------------------------------------------

diff --git a/wxPython/src/msw/_gdi.py b/wxPython/src/msw/_gdi.py
index b782a0cfa0fb27c5cec31606140a6b9e5f438a42..4f4ce9f46718e653f43813f8bdcaae72410d4bc0 100644 (file)
--- a/wxPython/src/msw/_gdi.py
+++ b/wxPython/src/msw/_gdi.py
@@ -243,6 +243,8 @@ class Colour(_core.Object):
     __safe_for_unpickling__ = True
     def __reduce__(self):               return (Colour, self.Get(True))
 
+    Pixel = property(GetPixel,doc="See `GetPixel`") 
+    RGB = property(GetRGB,SetRGB,doc="See `GetRGB` and `SetRGB`") 
 _gdi_.Colour_swigregister(Colour)
 
 def NamedColour(*args, **kwargs):
@@ -479,6 +481,9 @@ class Brush(GDIObject):
         return _gdi_.Brush_Ok(*args, **kwargs)
 
     def __nonzero__(self): return self.Ok() 
+    Colour = property(GetColour,SetColour,doc="See `GetColour` and `SetColour`") 
+    Stipple = property(GetStipple,SetStipple,doc="See `GetStipple` and `SetStipple`") 
+    Style = property(GetStyle,SetStyle,doc="See `GetStyle` and `SetStyle`") 
 _gdi_.Brush_swigregister(Brush)
 
 def BrushFromBitmap(*args, **kwargs):
@@ -681,6 +686,13 @@ class Bitmap(GDIObject):
         """__ne__(self, Bitmap other) -> bool"""
         return _gdi_.Bitmap___ne__(*args, **kwargs)
 
+    Depth = property(GetDepth,SetDepth,doc="See `GetDepth` and `SetDepth`") 
+    Height = property(GetHeight,SetHeight,doc="See `GetHeight` and `SetHeight`") 
+    Mask = property(GetMask,SetMask,doc="See `GetMask` and `SetMask`") 
+    Palette = property(GetPalette,doc="See `GetPalette`") 
+    Size = property(GetSize,SetSize,doc="See `GetSize` and `SetSize`") 
+    SubBitmap = property(GetSubBitmap,doc="See `GetSubBitmap`") 
+    Width = property(GetWidth,SetWidth,doc="See `GetWidth` and `SetWidth`") 
 _gdi_.Bitmap_swigregister(Bitmap)
 
 def EmptyBitmap(*args, **kwargs):
@@ -887,6 +899,7 @@ class NativePixelData(PixelDataBase):
                 pixels.nextPixel()
             pixels.MoveTo(self, 0, y)
 
+    Pixels = property(GetPixels,doc="See `GetPixels`") 
 _gdi_.NativePixelData_swigregister(NativePixelData)
 
 class NativePixelData_Accessor(object):
@@ -1002,6 +1015,7 @@ class AlphaPixelData(PixelDataBase):
                 pixels.nextPixel()
             pixels.MoveTo(self, 0, y)
 
+    Pixels = property(GetPixels,doc="See `GetPixels`") 
 _gdi_.AlphaPixelData_swigregister(AlphaPixelData)
 
 class AlphaPixelData_Accessor(object):
@@ -2856,7 +2870,7 @@ def EncodingConverter_CanConvert(*args, **kwargs):
 # to the default catalog path.
 if wx.Platform == "__WXMSW__":
     import os
-    _localedir = os.path.join(os.path.split(__file__)[0], "locale")
+    _localedir = os.path.join(os.path.split(__file__)[0], "i18n")
     Locale.AddCatalogLookupPathPrefix(_localedir)
     del os
 
@@ -4327,6 +4341,35 @@ class DC(_core.Object):
            raise ValueError('backgrounds and coords must have same length')
         return  self._DrawTextList(textList, coords, foregrounds, backgrounds)
 
+    Background = property(GetBackground,SetBackground,doc="See `GetBackground` and `SetBackground`") 
+    BackgroundMode = property(GetBackgroundMode,SetBackgroundMode,doc="See `GetBackgroundMode` and `SetBackgroundMode`") 
+    BoundingBox = property(GetBoundingBox,doc="See `GetBoundingBox`") 
+    Brush = property(GetBrush,SetBrush,doc="See `GetBrush` and `SetBrush`") 
+    CharHeight = property(GetCharHeight,doc="See `GetCharHeight`") 
+    CharWidth = property(GetCharWidth,doc="See `GetCharWidth`") 
+    ClippingBox = property(GetClippingBox,doc="See `GetClippingBox`") 
+    ClippingRect = property(GetClippingRect,SetClippingRect,doc="See `GetClippingRect` and `SetClippingRect`") 
+    Depth = property(GetDepth,doc="See `GetDepth`") 
+    DeviceOrigin = property(GetDeviceOrigin,SetDeviceOrigin,doc="See `GetDeviceOrigin` and `SetDeviceOrigin`") 
+    Font = property(GetFont,SetFont,doc="See `GetFont` and `SetFont`") 
+    FullTextExtent = property(GetFullTextExtent,doc="See `GetFullTextExtent`") 
+    LogicalFunction = property(GetLogicalFunction,SetLogicalFunction,doc="See `GetLogicalFunction` and `SetLogicalFunction`") 
+    LogicalOrigin = property(GetLogicalOrigin,SetLogicalOrigin,doc="See `GetLogicalOrigin` and `SetLogicalOrigin`") 
+    LogicalScale = property(GetLogicalScale,SetLogicalScale,doc="See `GetLogicalScale` and `SetLogicalScale`") 
+    MapMode = property(GetMapMode,SetMapMode,doc="See `GetMapMode` and `SetMapMode`") 
+    MultiLineTextExtent = property(GetMultiLineTextExtent,doc="See `GetMultiLineTextExtent`") 
+    Optimization = property(GetOptimization,SetOptimization,doc="See `GetOptimization` and `SetOptimization`") 
+    PPI = property(GetPPI,doc="See `GetPPI`") 
+    PartialTextExtents = property(GetPartialTextExtents,doc="See `GetPartialTextExtents`") 
+    Pen = property(GetPen,SetPen,doc="See `GetPen` and `SetPen`") 
+    Pixel = property(GetPixel,doc="See `GetPixel`") 
+    PixelPoint = property(GetPixelPoint,doc="See `GetPixelPoint`") 
+    Size = property(GetSize,doc="See `GetSize`") 
+    SizeMM = property(GetSizeMM,doc="See `GetSizeMM`") 
+    TextBackground = property(GetTextBackground,SetTextBackground,doc="See `GetTextBackground` and `SetTextBackground`") 
+    TextExtent = property(GetTextExtent,doc="See `GetTextExtent`") 
+    TextForeground = property(GetTextForeground,SetTextForeground,doc="See `GetTextForeground` and `SetTextForeground`") 
+    UserScale = property(GetUserScale,SetUserScale,doc="See `GetUserScale` and `SetUserScale`") 
 _gdi_.DC_swigregister(DC)
 
 #---------------------------------------------------------------------------

diff --git a/wxPython/src/msw/_misc.py b/wxPython/src/msw/_misc.py
index 032a972b0cdc9b5cc291cad1ffe85bacf6755430..d31c0554911d9a186d6acc3fd6e6df7bac3feba4 100644 (file)
--- a/wxPython/src/msw/_misc.py
+++ b/wxPython/src/msw/_misc.py
@@ -875,6 +875,9 @@ class Caret(object):
         return _misc_.Caret_SetBlinkTime(*args, **kwargs)
 
     SetBlinkTime = staticmethod(SetBlinkTime)
+    Position = property(GetPosition,doc="See `GetPosition`") 
+    Size = property(GetSize,SetSize,doc="See `GetSize` and `SetSize`") 
+    Window = property(GetWindow,doc="See `GetWindow`") 
 _misc_.Caret_swigregister(Caret)
 
 def Caret_GetBlinkTime(*args):
@@ -2546,6 +2549,15 @@ class ArtProvider(object):
         return _misc_.ArtProvider_PushProvider(*args, **kwargs)
 
     PushProvider = staticmethod(PushProvider)
+    def InsertProvider(*args, **kwargs):
+        """
+        InsertProvider(ArtProvider provider)
+
+        Add new provider to the bottom of providers stack.
+        """
+        return _misc_.ArtProvider_InsertProvider(*args, **kwargs)
+
+    InsertProvider = staticmethod(InsertProvider)
     def PopProvider(*args, **kwargs):
         """
         PopProvider() -> bool
@@ -2669,6 +2681,14 @@ def ArtProvider_PushProvider(*args, **kwargs):
     """
   return _misc_.ArtProvider_PushProvider(*args, **kwargs)
 
+def ArtProvider_InsertProvider(*args, **kwargs):
+  """
+    ArtProvider_InsertProvider(ArtProvider provider)
+
+    Add new provider to the bottom of providers stack.
+    """
+  return _misc_.ArtProvider_InsertProvider(*args, **kwargs)
+
 def ArtProvider_PopProvider(*args):
   """
     ArtProvider_PopProvider() -> bool
@@ -3086,6 +3106,17 @@ class ConfigBase(object):
         """GetStyle(self) -> long"""
         return _misc_.ConfigBase_GetStyle(*args, **kwargs)
 
+    AppName = property(GetAppName,SetAppName,doc="See `GetAppName` and `SetAppName`") 
+    EntryType = property(GetEntryType,doc="See `GetEntryType`") 
+    FirstEntry = property(GetFirstEntry,doc="See `GetFirstEntry`") 
+    FirstGroup = property(GetFirstGroup,doc="See `GetFirstGroup`") 
+    NextEntry = property(GetNextEntry,doc="See `GetNextEntry`") 
+    NextGroup = property(GetNextGroup,doc="See `GetNextGroup`") 
+    NumberOfEntries = property(GetNumberOfEntries,doc="See `GetNumberOfEntries`") 
+    NumberOfGroups = property(GetNumberOfGroups,doc="See `GetNumberOfGroups`") 
+    Path = property(GetPath,SetPath,doc="See `GetPath` and `SetPath`") 
+    Style = property(GetStyle,SetStyle,doc="See `GetStyle` and `SetStyle`") 
+    VendorName = property(GetVendorName,SetVendorName,doc="See `GetVendorName` and `SetVendorName`") 
 _misc_.ConfigBase_swigregister(ConfigBase)
 
 def ConfigBase_Set(*args, **kwargs):
@@ -3859,6 +3890,30 @@ class DateTime(object):
         else:
             return "INVALID DateTime"
 
+    Day = property(GetDay,SetDay,doc="See `GetDay` and `SetDay`") 
+    DayOfYear = property(GetDayOfYear,doc="See `GetDayOfYear`") 
+    Hour = property(GetHour,SetHour,doc="See `GetHour` and `SetHour`") 
+    JDN = property(GetJDN,SetJDN,doc="See `GetJDN` and `SetJDN`") 
+    JulianDayNumber = property(GetJulianDayNumber,doc="See `GetJulianDayNumber`") 
+    LastMonthDay = property(GetLastMonthDay,doc="See `GetLastMonthDay`") 
+    LastWeekDay = property(GetLastWeekDay,doc="See `GetLastWeekDay`") 
+    MJD = property(GetMJD,doc="See `GetMJD`") 
+    Millisecond = property(GetMillisecond,SetMillisecond,doc="See `GetMillisecond` and `SetMillisecond`") 
+    Minute = property(GetMinute,SetMinute,doc="See `GetMinute` and `SetMinute`") 
+    ModifiedJulianDayNumber = property(GetModifiedJulianDayNumber,doc="See `GetModifiedJulianDayNumber`") 
+    Month = property(GetMonth,SetMonth,doc="See `GetMonth` and `SetMonth`") 
+    NextWeekDay = property(GetNextWeekDay,doc="See `GetNextWeekDay`") 
+    PrevWeekDay = property(GetPrevWeekDay,doc="See `GetPrevWeekDay`") 
+    RataDie = property(GetRataDie,doc="See `GetRataDie`") 
+    Second = property(GetSecond,SetSecond,doc="See `GetSecond` and `SetSecond`") 
+    Ticks = property(GetTicks,doc="See `GetTicks`") 
+    Week = property(GetWeek,doc="See `GetWeek`") 
+    WeekDay = property(GetWeekDay,doc="See `GetWeekDay`") 
+    WeekDayInSameWeek = property(GetWeekDayInSameWeek,doc="See `GetWeekDayInSameWeek`") 
+    WeekOfMonth = property(GetWeekOfMonth,doc="See `GetWeekOfMonth`") 
+    WeekOfYear = property(GetWeekOfYear,doc="See `GetWeekOfYear`") 
+    Year = property(GetYear,SetYear,doc="See `GetYear` and `SetYear`") 
+    YearDay = property(GetYearDay,doc="See `GetYearDay`") 
 _misc_.DateTime_swigregister(DateTime)
 DefaultDateTimeFormat = cvar.DefaultDateTimeFormat
 DefaultTimeSpanFormat = cvar.DefaultTimeSpanFormat
@@ -4369,6 +4424,11 @@ class DateSpan(object):
         """__ne__(self, DateSpan other) -> bool"""
         return _misc_.DateSpan___ne__(*args, **kwargs)
 
+    Days = property(GetDays,SetDays,doc="See `GetDays` and `SetDays`") 
+    Months = property(GetMonths,SetMonths,doc="See `GetMonths` and `SetMonths`") 
+    TotalDays = property(GetTotalDays,doc="See `GetTotalDays`") 
+    Weeks = property(GetWeeks,SetWeeks,doc="See `GetWeeks` and `SetWeeks`") 
+    Years = property(GetYears,SetYears,doc="See `GetYears` and `SetYears`") 
 _misc_.DateSpan_swigregister(DateSpan)
 
 def DateSpan_Days(*args, **kwargs):
@@ -4510,6 +4570,8 @@ class DataFormat(object):
         """
         return _misc_.DataFormat_SetId(*args, **kwargs)
 
+    Id = property(GetId,SetId,doc="See `GetId` and `SetId`") 
+    Type = property(GetType,SetType,doc="See `GetType` and `SetType`") 
 _misc_.DataFormat_swigregister(DataFormat)
 DefaultDateTime = cvar.DefaultDateTime
 
@@ -4607,6 +4669,11 @@ class DataObject(object):
         """
         return _misc_.DataObject_SetData(*args, **kwargs)
 
+    AllFormats = property(GetAllFormats,doc="See `GetAllFormats`") 
+    DataHere = property(GetDataHere,doc="See `GetDataHere`") 
+    DataSize = property(GetDataSize,doc="See `GetDataSize`") 
+    FormatCount = property(GetFormatCount,doc="See `GetFormatCount`") 
+    PreferredFormat = property(GetPreferredFormat,doc="See `GetPreferredFormat`") 
 _misc_.DataObject_swigregister(DataObject)
 FormatInvalid = cvar.FormatInvalid
 
@@ -4675,6 +4742,7 @@ class DataObjectSimple(DataObject):
         """
         return _misc_.DataObjectSimple_SetData(*args, **kwargs)
 
+    Format = property(GetFormat,SetFormat,doc="See `GetFormat` and `SetFormat`") 
 _misc_.DataObjectSimple_swigregister(DataObjectSimple)
 
 class PyDataObjectSimple(DataObjectSimple):
@@ -4763,6 +4831,7 @@ class DataObjectComposite(DataObject):
         """
         return _misc_.DataObjectComposite_GetReceivedFormat(*args, **kwargs)
 
+    ReceivedFormat = property(GetReceivedFormat,doc="See `GetReceivedFormat`") 
 _misc_.DataObjectComposite_swigregister(DataObjectComposite)
 
 class TextDataObject(DataObjectSimple):
@@ -4893,6 +4962,7 @@ class BitmapDataObject(DataObjectSimple):
         """
         return _misc_.BitmapDataObject_SetBitmap(*args, **kwargs)
 
+    Bitmap = property(GetBitmap,SetBitmap,doc="See `GetBitmap` and `SetBitmap`") 
 _misc_.BitmapDataObject_swigregister(BitmapDataObject)
 
 class PyBitmapDataObject(BitmapDataObject):
@@ -5002,6 +5072,8 @@ class CustomDataObject(DataObjectSimple):
         """
         return _misc_.CustomDataObject_GetData(*args, **kwargs)
 
+    Data = property(GetData,SetData,doc="See `GetData` and `SetData`") 
+    Size = property(GetSize,doc="See `GetSize`") 
 _misc_.CustomDataObject_swigregister(CustomDataObject)
 
 class URLDataObject(DataObject):
@@ -5112,6 +5184,7 @@ class DropSource(object):
     base_GiveFeedback = wx._deprecated(base_GiveFeedback,
                                    "Please use DropSource.GiveFeedback instead.")
 
+    DataObject = property(GetDataObject,SetData,doc="See `GetDataObject` and `SetData`") 
 _misc_.DropSource_swigregister(DropSource)
 
 def DROP_ICON(filename):
@@ -5197,6 +5270,9 @@ class DropTarget(object):
         """GetDefaultAction(self) -> int"""
         return _misc_.DropTarget_GetDefaultAction(*args, **kwargs)
 
+    Data = property(GetData,doc="See `GetData`") 
+    DataObject = property(GetDataObject,SetDataObject,doc="See `GetDataObject` and `SetDataObject`") 
+    DefaultAction = property(GetDefaultAction,SetDefaultAction,doc="See `GetDefaultAction` and `SetDefaultAction`") 
 _misc_.DropTarget_swigregister(DropTarget)
 
 PyDropTarget = DropTarget 
@@ -5472,6 +5548,7 @@ class Clipboard(_core.Object):
         return _misc_.Clipboard_Get(*args, **kwargs)
 
     Get = staticmethod(Get)
+    Data = property(GetData,SetData,doc="See `GetData` and `SetData`") 
 _misc_.Clipboard_swigregister(Clipboard)
 
 def Clipboard_Get(*args):
@@ -5742,6 +5819,11 @@ class Display(object):
         """
         return _misc_.Display_ResetMode(*args, **kwargs)
 
+    ClientArea = property(GetClientArea,doc="See `GetClientArea`") 
+    CurrentMode = property(GetCurrentMode,doc="See `GetCurrentMode`") 
+    Geometry = property(GetGeometry,doc="See `GetGeometry`") 
+    Modes = property(GetModes,doc="See `GetModes`") 
+    Name = property(GetName,doc="See `GetName`") 
 _misc_.Display_swigregister(Display)
 DefaultVideoMode = cvar.DefaultVideoMode
 

diff --git a/wxPython/src/msw/_misc_wrap.cpp b/wxPython/src/msw/_misc_wrap.cpp
index 03577a6e045942fac1284cb4ae539d931f50bfb0..47173d2d8f0cefff4cf0d55f6109c75bdb23fb55 100644 (file)
--- a/wxPython/src/msw/_misc_wrap.cpp
+++ b/wxPython/src/msw/_misc_wrap.cpp
@@ -20318,6 +20318,33 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_ArtProvider_InsertProvider(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxPyArtProvider *arg1 = (wxPyArtProvider *) 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  char *  kwnames[] = {
+    (char *) "provider", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ArtProvider_InsertProvider",kwnames,&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, SWIG_as_voidptrptr(&arg1), SWIGTYPE_p_wxPyArtProvider, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ArtProvider_InsertProvider" "', expected argument " "1"" of type '" "wxPyArtProvider *""'");
+  }
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    wxPyArtProvider::InsertProvider(arg1);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_ArtProvider_PopProvider(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   bool result;
@@ -37721,6 +37748,7 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"delete_ArtProvider", (PyCFunction)_wrap_delete_ArtProvider, METH_O, NULL},
         { (char *)"ArtProvider__setCallbackInfo", (PyCFunction) _wrap_ArtProvider__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"ArtProvider_PushProvider", (PyCFunction) _wrap_ArtProvider_PushProvider, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"ArtProvider_InsertProvider", (PyCFunction) _wrap_ArtProvider_InsertProvider, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"ArtProvider_PopProvider", (PyCFunction)_wrap_ArtProvider_PopProvider, METH_NOARGS, NULL},
         { (char *)"ArtProvider_RemoveProvider", (PyCFunction) _wrap_ArtProvider_RemoveProvider, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"ArtProvider_GetBitmap", (PyCFunction) _wrap_ArtProvider_GetBitmap, METH_VARARGS | METH_KEYWORDS, NULL},

diff --git a/wxPython/src/msw/_windows.py b/wxPython/src/msw/_windows.py
index 7739ae28177ae91b856fee021c5c295009689016..b716f1219b22cedc27019a6a0ca3fd17f2cbc9bc 100644 (file)
--- a/wxPython/src/msw/_windows.py
+++ b/wxPython/src/msw/_windows.py
@@ -705,6 +705,9 @@ class Dialog(TopLevelWindow):
         return _windows_.Dialog_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)
+    AffirmativeId = property(GetAffirmativeId,SetAffirmativeId,doc="See `GetAffirmativeId` and `SetAffirmativeId`") 
+    EscapeId = property(GetEscapeId,SetEscapeId,doc="See `GetEscapeId` and `SetEscapeId`") 
+    ReturnCode = property(GetReturnCode,SetReturnCode,doc="See `GetReturnCode` and `SetReturnCode`") 
 _windows_.Dialog_swigregister(Dialog)
 
 def PreDialog(*args, **kwargs):
@@ -1573,6 +1576,8 @@ class CalculateLayoutEvent(_core.Event):
         """GetRect(self) -> Rect"""
         return _windows_.CalculateLayoutEvent_GetRect(*args, **kwargs)
 
+    Flags = property(GetFlags,SetFlags,doc="See `GetFlags` and `SetFlags`") 
+    Rect = property(GetRect,SetRect,doc="See `GetRect` and `SetRect`") 
 _windows_.CalculateLayoutEvent_swigregister(CalculateLayoutEvent)
 
 EVT_QUERY_LAYOUT_INFO = wx.PyEventBinder( wxEVT_QUERY_LAYOUT_INFO )
@@ -2139,6 +2144,9 @@ class ColourData(_core.Object):
         """
         return _windows_.ColourData_SetCustomColour(*args, **kwargs)
 
+    ChooseFull = property(GetChooseFull,SetChooseFull,doc="See `GetChooseFull` and `SetChooseFull`") 
+    Colour = property(GetColour,SetColour,doc="See `GetColour` and `SetColour`") 
+    CustomColour = property(GetCustomColour,SetCustomColour,doc="See `GetCustomColour` and `SetCustomColour`") 
 _windows_.ColourData_swigregister(ColourData)
 FileSelectorPromptStr = cvar.FileSelectorPromptStr
 DirSelectorPromptStr = cvar.DirSelectorPromptStr
@@ -2170,6 +2178,7 @@ class ColourDialog(Dialog):
         """
         return _windows_.ColourDialog_GetColourData(*args, **kwargs)
 
+    ColourData = property(GetColourData,doc="See `GetColourData`") 
 _windows_.ColourDialog_swigregister(ColourDialog)
 
 
@@ -2233,6 +2242,8 @@ class DirDialog(Dialog):
         """
         return _windows_.DirDialog_SetPath(*args, **kwargs)
 
+    Message = property(GetMessage,SetMessage,doc="See `GetMessage` and `SetMessage`") 
+    Path = property(GetPath,SetPath,doc="See `GetPath` and `SetPath`") 
 _windows_.DirDialog_swigregister(DirDialog)
 
 OPEN = _windows_.OPEN

diff --git a/wxPython/wx/.cvsignore b/wxPython/wx/.cvsignore
index e35d1ebe8dbe48305ab4a4e6ad539f6fc142d557..1a0b742a61497ddd59a8d808a1b3a820d1a1e049 100644 (file)
--- a/wxPython/wx/.cvsignore
+++ b/wxPython/wx/.cvsignore
@@ -1,2 +1,3 @@
 *.py
+i18n
 locale