Revert reentrancy patch (#1573619)

[wxWidgets.git] / wxPython / src / calendar.i

diff --git a/wxPython/src/calendar.i b/wxPython/src/calendar.i
index 7225d98553b9628a63b9c49a396357b8b5123b1b..1ebf884e2b211948d8d8414abc9c6d22dd94e85c 100644 (file)
--- a/wxPython/src/calendar.i
+++ b/wxPython/src/calendar.i
@@ -30,8 +30,6 @@
 %pythoncode { wx = _core }
 %pythoncode { __docfilter__ = wx.__DocFilter(globals()) }
 
-%include _calendar_rename.i
-
 //---------------------------------------------------------------------------
 
 enum {
@@ -80,6 +78,8 @@ public:
                        const wxFont& font = wxNullFont,
                        wxCalendarDateBorder border = wxCAL_BORDER_NONE);
 
+    ~wxCalendarDateAttr();
+    
     
     // setters
     void SetTextColour(const wxColour& colText);
@@ -103,6 +103,12 @@ public:
     wxColour GetBorderColour() const;
     wxFont GetFont() const;
     wxCalendarDateBorder GetBorder() const;
+
+    %property(BackgroundColour, GetBackgroundColour, SetBackgroundColour, doc="See `GetBackgroundColour` and `SetBackgroundColour`");
+    %property(Border, GetBorder, SetBorder, doc="See `GetBorder` and `SetBorder`");
+    %property(BorderColour, GetBorderColour, SetBorderColour, doc="See `GetBorderColour` and `SetBorderColour`");
+    %property(Font, GetFont, SetFont, doc="See `GetFont` and `SetFont`");
+    %property(TextColour, GetTextColour, SetTextColour, doc="See `GetTextColour` and `SetTextColour`");
 };
 
 //---------------------------------------------------------------------------
@@ -126,6 +132,8 @@ public:
         """returns datetime.date object"""
         return _wxdate2pydate(self.GetDate())
     }
+
+    %property(WeekDay, GetWeekDay, SetWeekDay, doc="See `GetWeekDay` and `SetWeekDay`");
 };
 
 
@@ -169,7 +177,7 @@ month can be set independently using CalendarDateAttr class.
 
 An item without custom attributes is drawn with the default colours
 and font and without border, but setting custom attributes with
-SetAttr allows to modify its appearance. Just create a custom
+`SetAttr` allows to modify its appearance. Just create a custom
 attribute object and set it for the day you want to be displayed
 specially A day may be marked as being a holiday, (even if it is not
 recognized as one by `wx.DateTime`) by using the SetHoliday method.
@@ -260,7 +268,7 @@ creation.", "");
         "Sets the current date.", "");
 
     DocDeclStr(
-        const wxDateTime&, GetDate() const,
+        const wxDateTime, GetDate() const,
         "Gets the currently selected date.", "");
     
 
@@ -274,11 +282,11 @@ creation.", "");
         "set the range in which selection can occur", "");
     
     DocDeclStr(
-        const wxDateTime&, GetLowerDateLimit() const,
+        const wxDateTime, GetLowerDateLimit() const,
         "get the range in which selection can occur", "");
     
     DocDeclStr(
-        const wxDateTime&, GetUpperDateLimit() const,
+        const wxDateTime, GetUpperDateLimit() const,
         "get the range in which selection can occur", "");
 
     DocDeclStr(
@@ -359,12 +367,14 @@ used).", "");
         wxCalendarDateAttr*, GetAttr(size_t day) const,
         "Returns the attribute for the given date (should be in the range
 1...31).  The returned value may be None", "");
-    
+
+    %disownarg(wxCalendarDateAttr *attr);
     DocDeclStr(
         void, SetAttr(size_t day, wxCalendarDateAttr *attr),
         "Associates the attribute with the specified date (in the range
 1...31).  If the attribute passed is None, the items attribute is
 cleared.", "");
+    %cleardisown(wxCalendarDateAttr *attr);
 
     DocDeclStr(
         void, SetHoliday(size_t day),
@@ -396,7 +406,7 @@ The result codes are:
             wxDateTime* date = new wxDateTime;
             wxDateTime::WeekDay wd;
             wxCalendarHitTestResult result = self->HitTest(pos, date, &wd);
-            bool blocked = wxPyBeginBlockThreads();
+            wxPyBlock_t blocked = wxPyBeginBlockThreads();
             PyObject* tup = PyTuple_New(3);
             PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(result));
             PyTuple_SET_ITEM(tup, 1, wxPyConstructObject(date, wxT("wxDateTime"), 1));
@@ -447,6 +457,18 @@ The result codes are:
         """returns datetime.date object"""
         return _wxdate2pydate(self.GetUpperDateLimit())
     }
+
+    %property(Date, GetDate, SetDate, doc="See `GetDate` and `SetDate`");
+    %property(HeaderColourBg, GetHeaderColourBg, doc="See `GetHeaderColourBg`");
+    %property(HeaderColourFg, GetHeaderColourFg, doc="See `GetHeaderColourFg`");
+    %property(HighlightColourBg, GetHighlightColourBg, doc="See `GetHighlightColourBg`");
+    %property(HighlightColourFg, GetHighlightColourFg, doc="See `GetHighlightColourFg`");
+    %property(HolidayColourBg, GetHolidayColourBg, doc="See `GetHolidayColourBg`");
+    %property(HolidayColourFg, GetHolidayColourFg, doc="See `GetHolidayColourFg`");
+    %property(LowerDateLimit, GetLowerDateLimit, SetLowerDateLimit, doc="See `GetLowerDateLimit` and `SetLowerDateLimit`");
+    %property(MonthControl, GetMonthControl, doc="See `GetMonthControl`");
+    %property(UpperDateLimit, GetUpperDateLimit, SetUpperDateLimit, doc="See `GetUpperDateLimit` and `SetUpperDateLimit`");
+    %property(YearControl, GetYearControl, doc="See `GetYearControl`");
 };
 
 %pythoncode {