Little changes to match recent changes in wxWindows

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

diff --git a/wxPython/src/_colour.i b/wxPython/src/_colour.i
index c6ad86aa897494a522a9c71caefb1ed6ecc86182..97d24530a82bd6843df3f9e5a493f1c7a5f62192 100644 (file)
--- a/wxPython/src/_colour.i
+++ b/wxPython/src/_colour.i
@@ -30,11 +30,13 @@ public:
     unsigned char Blue();
     bool Ok();
     void Set(unsigned char red, unsigned char green, unsigned char blue);
-    %name(SetRBG) void Set(unsigned long colRGB);
+    %name(SetRGB) void Set(unsigned long colRGB);
 
     bool operator==(const wxColour& colour) const;
     bool operator != (const wxColour& colour) const;
 
+    void InitFromName(const wxString& colourName);
+
     %extend {
         PyObject* Get() {
             PyObject* rv = PyTuple_New(3);

diff --git a/wxPython/src/_gdicmn.i b/wxPython/src/_gdicmn.i
index 1fd60f0b5adf050cc609f141d75de672a5ac75d9..059343e1c297495044b246ebb1724a57457a6003 100644 (file)
--- a/wxPython/src/_gdicmn.i
+++ b/wxPython/src/_gdicmn.i
@@ -403,6 +403,16 @@ public:
     wxSize GetSize() const;
     void SetSize( const wxSize &s );
 
+    wxPoint GetTopLeft() const;
+    void SetTopLeft(const wxPoint &p);
+    wxPoint GetBottomRight() const;
+    void SetBottomRight(const wxPoint &p);
+
+//    wxPoint GetLeftTop() const;
+//    void SetLeftTop(const wxPoint &p);
+//    wxPoint GetRightBottom() const;
+//    void SetRightBottom(const wxPoint &p);
+
     int GetLeft()   const;
     int GetTop()    const;
     int GetBottom() const;

diff --git a/wxPython/src/_pen.i b/wxPython/src/_pen.i
index 3c0677b5fb977a32466ea5f737c84dc0ceefcf39..6f0afd99c333205c82070dcd6035fb0043e998f6 100644 (file)
--- a/wxPython/src/_pen.i
+++ b/wxPython/src/_pen.i
@@ -63,6 +63,9 @@ public:
         }
     }
 
+//  wxDash* GetDash() const { return (M_PENDATA ? (wxDash*)M_PENDATA->m_dash : (wxDash*)NULL); };
+    int GetDashCount() const;
+
 #ifdef __WXMSW__
     wxBitmap* GetStipple();
     void SetStipple(wxBitmap& stipple);

diff --git a/wxPython/src/_treectrl.i b/wxPython/src/_treectrl.i
index bbcfb4090be29e24dede9ba4a8d15cc4e03a4d4c..e5bece1eeece24a430543705ab20e7b2a13cbada 100644 (file)
--- a/wxPython/src/_treectrl.i
+++ b/wxPython/src/_treectrl.i
@@ -196,7 +196,7 @@ public:
 %constant wxEventType wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK;
 %constant wxEventType wxEVT_COMMAND_TREE_END_DRAG;
 %constant wxEventType wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK;
-
+%constant wxEventType wxEVT_COMMAND_TREE_ITEM_GETTOOLTIP;
 
 
 %pythoncode {
@@ -220,7 +220,7 @@ EVT_TREE_ITEM_RIGHT_CLICK  = wx.PyEventBinder(wxEVT_COMMAND_TREE_ITEM_RIGHT_CLIC
 EVT_TREE_ITEM_MIDDLE_CLICK = wx.PyEventBinder(wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK, 1)
 EVT_TREE_END_DRAG          = wx.PyEventBinder(wxEVT_COMMAND_TREE_END_DRAG         , 1)
 EVT_TREE_STATE_IMAGE_CLICK = wx.PyEventBinder(wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK, 1)
-
+EVT_TREE_ITEM_GETTOOLTIP   = wx.PyEventBinder(wxEVT_COMMAND_TREE_ITEM_GETTOOLTIP,   1)
 }
 
 
@@ -261,6 +261,8 @@ public:
     bool IsEditCancelled() const;
     void SetEditCanceled(bool editCancelled);
 
+        // Set the tooltip for the item (for EVT_TREE_ITEM_GETTOOLTIP events)
+    void SetToolTip(const wxString& toolTip);
 };
 
 //---------------------------------------------------------------------------

diff --git a/wxPython/src/calendar.i b/wxPython/src/calendar.i
index 80eb674984d02121a9c95bb177068567966b282b..a1cc4173d355fe4fff187d7772ceba6ea56f0abf 100644 (file)
--- a/wxPython/src/calendar.i
+++ b/wxPython/src/calendar.i
@@ -109,6 +109,8 @@ public:
     wxCalendarEvent(wxCalendarCtrl *cal, wxEventType type);
 
     const wxDateTime& GetDate() const;
+    void SetDate(const wxDateTime &date);
+    void SetWeekDay(const wxDateTime::WeekDay wd);
     wxDateTime::WeekDay GetWeekDay() const;
 
 };
@@ -241,6 +243,9 @@ public:
     bool Enable(bool enable = True);
     bool Show(bool show = True);
 
+    // get the currently shown control for month/year
+    wxControl *GetMonthControl() const;
+    wxControl *GetYearControl() const;
 };