Add missing and fix broken interface items for wxPython

interface/wx/clrpicker.h

@@ -11,6 +11,8 @@
 #define wxCLRP_SHOW_ALPHA         0x0010
 
 wxEventType wxEVT_COLOURPICKER_CHANGED;
+wxEventType wxEVT_COLOURPICKER_CURRENT_CHANGED;
+wxEventType wxEVT_COLOURPICKER_DIALOG_CANCELLED;
 
 
 /**

interface/wx/colordlg.h

@@ -109,12 +109,30 @@ public:
 class wxColourDialogEvent : public wxCommandEvent
 {
 public:
+    wxColourDialogEvent();
+
+    /**
+        The constructor is not normally used by the user code.
+    */
+    wxColourDialogEvent(wxEventType evtType,
+                        wxColourDialog* dialog,
+                        const wxColour& colour);
+    
     /**
         Retrieve the colour the user has just selected.
     */
     wxColour GetColour() const;
+
+    /**
+       Set the colour to be sent with the event.
+    */
+    void SetColour(const wxColour& colour);
 };
 
+
+wxEventType wxEVT_COLOUR_CHANGED;
+
+
 // ============================================================================
 // Global functions/macros
 // ============================================================================

interface/wx/gbsizer.h

@@ -187,7 +187,7 @@ public:
         Called when the managed size of the sizer is needed or when layout
         needs done.
     */
-    void RecalcSizes();
+    virtual void RepositionChildren(const wxSize& minSize);
 
     /**
         Set the size used for cells in the grid with no item.

interface/wx/graphics.h

@@ -1359,7 +1359,7 @@ public:
 
         @since 3.1.3
      */
-    static wxGraphicsContext* CreateContextFromUnknownDC(wxDC& dc);
+     wxGraphicsContext* CreateContextFromUnknownDC(wxDC& dc);
 
     /**
         Creates a wxGraphicsContext associated with a wxImage.

interface/wx/popupwin.h

@@ -5,6 +5,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+#define wxPU_CONTAINS_CONTROLS     0x0001
+
 /**
     @class wxPopupWindow
 

interface/wx/sizer.h

@@ -1038,7 +1038,7 @@ public:
     */
     void SetNegativeButton(wxButton* button);
 
-    virtual void RecalcSizes();
+    virtual void RepositionChildren(const wxSize& minSize);
     virtual wxSize CalcMin();
 };
 
@@ -1713,7 +1713,7 @@ public:
     */
     const wxArrayInt& GetColWidths() const;
 
-    virtual void RecalcSizes();
+    virtual void RepositionChildren(const wxSize& minSize);
     virtual wxSize CalcMin();
 
 };
@@ -1840,7 +1840,7 @@ public:
     void SetVGap(int gap);
 
     virtual wxSize CalcMin();
-    virtual void RecalcSizes();
+    virtual void RepositionChildren(const wxSize& minSize);
 };
 
 
@@ -1903,7 +1903,7 @@ public:
     wxStaticBox* GetStaticBox() const;
 
     virtual wxSize CalcMin();
-    virtual void RecalcSizes();
+    virtual void RepositionChildren(const wxSize& minSize);
 };
 
 
@@ -1968,12 +1968,15 @@ public:
     void SetOrientation(int orient);
 
     /**
-        Implements the calculation of a box sizer's dimensions and then sets
+        Method which must be overridden in the derived sizer classes.
-        the size of its children (calling wxWindow::SetSize if the child is a window).
 
-        It is used internally only and must not be called by the user
+        The implementation should reposition the children using the current
-        (call Layout() if you want to resize). Documented for information.
+        total size available to the sizer (@c m_size) and the size computed by
+        the last call to CalcMin().
+
+        @since 3.1.3, before this version RecalcSizes() method not taking any
+            arguments had to be overridden in the derived classes instead.
     */
-    virtual void RecalcSizes();
+    virtual void RepositionChildren(const wxSize& minSize);
 };
 

interface/wx/wrapsizer.h

@@ -59,7 +59,7 @@ public:
     virtual bool InformFirstDirection(int direction, int size,
                                       int availableOtherDir);
 
-    virtual void RecalcSizes();
+    virtual void RepositionChildren(const wxSize& minSize);
     virtual wxSize CalcMin();
 
 protected: