Added wxHyperlinkCtrl, wxPowerEvent, and lots of little things to

match changes made in wx.


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

wxPython/docs/CHANGES.txt

@@ -153,6 +153,16 @@ to OpenEditor to send the BEGIN_LABEL_EDIT event and to not allow the
 opening of the editor to continue if the event handler doesn't allow
 it.
 
+wx.StaticBoxSizer now keeps better track of the wx.StaticBox, and it
+will destroy it if the sizer is destroyed before the parent window is.
+
+Added wx.HyperlinkCtrl.
+
+Added battery and power related functions and events (wxMSW only so
+far.)  See wx.PowerEvent, wx.GetPowerType and wx.GetBatteryState.
+
+Added wx.ListCtrl.HitTestSubItem which returns the sub-item that was
+hit (if any) in addition to the item and flags.
 
 
 

wxPython/src/_cmndlgs.i

@@ -30,48 +30,48 @@ DocStr(wxColourData,
 "This class holds a variety of information related to the colour
 chooser dialog, used to transfer settings and results to and from the
 `wx.ColourDialog`.", "");
-    
+
 class wxColourData : public wxObject {
 public:
     DocCtorStr(
         wxColourData(),
         "Constructor, sets default values.", "");
-    
+
     ~wxColourData();
 
-    
+
     DocDeclStr(
         bool , GetChooseFull(),
         "Under Windows, determines whether the Windows colour dialog will
 display the full dialog with custom colour selection controls. Has no
 meaning under other platforms.  The default value is true.", "");
-    
+
     DocDeclStr(
         wxColour , GetColour(),
         "Gets the colour (pre)selected by the dialog.", "");
-    
+
     DocDeclStr(
         wxColour , GetCustomColour(int i),
         "Gets the i'th custom colour associated with the colour dialog. i
 should be an integer between 0 and 15. The default custom colours are
 all invalid colours.", "");
-    
+
     DocDeclStr(
         void , SetChooseFull(int flag),
         "Under Windows, tells the Windows colour dialog to display the full
 dialog with custom colour selection controls. Under other platforms,
 has no effect.  The default value is true.", "");
-    
+
     DocDeclStr(
         void , SetColour(const wxColour& colour),
         "Sets the default colour for the colour dialog.  The default colour is
 black.", "");
-    
+
     DocDeclStr(
         void , SetCustomColour(int i, const wxColour& colour),
         "Sets the i'th custom colour for the colour dialog. i should be an
 integer between 0 and 15. The default custom colours are all invalid colours.", "");
-    
+
 };
 
 
@@ -105,6 +105,11 @@ wxColour wxGetColourFromUser(wxWindow *parent = (wxWindow *)NULL,
 
 //--------------------------------------------------------------------------------
 
+enum {
+    wxDD_NEW_DIR_BUTTON,
+    wxDD_DEFAULT_STYLE,
+    wxDD_CHANGE_DIR,
+};
 
 DocStr(wxDirDialog,
        "wx.DirDialog allows the user to select a directory by browising the
@@ -113,10 +118,17 @@ file system.", "
 Window  Styles
 --------------
     ====================  ==========================================
+    wx.DD_DEFAULT_STYLE   Equivalent to a combination of
+                          wx.DEFAULT_DIALOG_STYLE, wx.DD_NEW_DIR_BUTTON
+                          and wx.RESIZE_BORDER.
+
     wx.DD_NEW_DIR_BUTTON  Add 'Create new directory' button and allow
                           directory names to be editable. On Windows
                           the new directory button is only available
                           with recent versions of the common dialogs.
+
+    wx.DD_CHANGE_DIR      Change the current working directory to the
+                          directory chosen by the user.
     ====================  ==========================================
 ");
 
@@ -126,12 +138,12 @@ class wxDirDialog : public wxDialog {
 public:
     %pythonAppend wxDirDialog   "self._setOORInfo(self)"
     %pythonAppend wxDirDialog() ""
-   
+
     DocCtorStr(
         wxDirDialog(wxWindow* parent,
                     const wxString& message = wxPyDirSelectorPromptStr,
                     const wxString& defaultPath = wxPyEmptyString,
-                    long style = 0,
+                    long style = wxDD_DEFAULT_STYLE,
                     const wxPoint& pos = wxDefaultPosition,
                     const wxSize& size = wxDefaultSize,
                     const wxString& name = wxPyDirDialogNameStr),
@@ -150,24 +162,43 @@ public:
     DocDeclStr(
         wxString , GetPath(),
         "Returns the default or user-selected path.", "");
-    
+
     DocDeclStr(
         wxString , GetMessage(),
         "Returns the message that will be displayed on the dialog.", "");
-    
+
     DocDeclStr(
         void , SetMessage(const wxString& message),
         "Sets the message that will be displayed on the dialog.", "");
-    
+
     DocDeclStr(
         void , SetPath(const wxString& path),
         "Sets the default path.", "");
-    
+
 };
 
 
 //---------------------------------------------------------------------------
 
+enum {
+    // These will dissappear in 2.8
+    wxOPEN,
+    wxSAVE,
+    wxHIDE_READONLY,
+    wxOVERWRITE_PROMPT,
+    wxFILE_MUST_EXIST,
+    wxMULTIPLE,
+    wxCHANGE_DIR,
+
+    wxFD_OPEN,
+    wxFD_SAVE,
+    wxFD_OVERWRITE_PROMPT,
+    wxFD_FILE_MUST_EXIST,
+    wxFD_MULTIPLE,
+    wxFD_CHANGE_DIR,
+    wxFD_DEFAULT_STYLE,
+};
+
 DocStr(wxFileDialog,
 "wx.FileDialog allows the user to select one or more files from the
 filesystem.", "
@@ -191,24 +222,21 @@ types of file with a description for each, such as::
 
 Window  Styles
 --------------
-    ===================   ==========================================
+    ======================   ==========================================
-    wx.OPEN               This is an open dialog.
+    wx.FD_OPEN               This is an open dialog.
 
-    wx.SAVE               This is a save dialog.
+    wx.FD_SAVE               This is a save dialog.
 
-    wx.HIDE_READONLY      For open dialog only: hide the checkbox
+    wx.FD_OVERWRITE_PROMPT   For save dialog only: prompt for a confirmation
-                          allowing to open the file in read-only mode.
+                             if a file will be overwritten.
 
-    wx.OVERWRITE_PROMPT   For save dialog only: prompt for a confirmation
+    wx.FD_MULTIPLE           For open dialog only: allows selecting multiple
-                          if a file will be overwritten.
+                             files.
 
-    wx.MULTIPLE           For open dialog only: allows selecting multiple
+    wx.FD_CHANGE_DIR         Change the current working directory to the
-                          files.
+                             directory  where the file(s) chosen by the user
-
+                             are.
-    wx.CHANGE_DIR         Change the current working directory to the
+    ======================   ==========================================
-                          directory  where the file(s) chosen by the user
-                          are.
-    ===================   ==========================================
 ");
 
 
@@ -225,7 +253,7 @@ public:
                      const wxString& defaultDir = wxPyEmptyString,
                      const wxString& defaultFile = wxPyEmptyString,
                      const wxString& wildcard = wxPyFileSelectorDefaultWildcardStr,
-                     long style = 0,
+                     long style = wxFD_DEFAULT_STYLE,
                      const wxPoint& pos = wxDefaultPosition),
         "Constructor.  Use ShowModal method to show the dialog.", "");
 
@@ -233,20 +261,20 @@ public:
     DocDeclStr(
         void , SetMessage(const wxString& message),
         "Sets the message that will be displayed on the dialog.", "");
-    
+
     DocDeclStr(
         void , SetPath(const wxString& path),
         "Sets the path (the combined directory and filename that will be
 returned when the dialog is dismissed).", "");
-    
+
     DocDeclStr(
         void , SetDirectory(const wxString& dir),
         "Sets the default directory.", "");
-    
+
     DocDeclStr(
         void , SetFilename(const wxString& name),
         "Sets the default filename.", "");
-    
+
     DocDeclStr(
         void , SetWildcard(const wxString& wildCard),
         "Sets the wildcard, which can contain multiple file types, for
@@ -254,39 +282,39 @@ example::
 
     \"BMP files (*.bmp)|*.bmp|GIF files (*.gif)|*.gif\"
 ", "");
-    
+
     DocDeclStr(
         void , SetStyle(long style),
         "Sets the dialog style.", "");
-    
+
     DocDeclStr(
         void , SetFilterIndex(int filterIndex),
         "Sets the default filter index, starting from zero.", "");
-    
+
     DocDeclStr(
         wxString , GetMessage() const,
         "Returns the message that will be displayed on the dialog.", "");
-    
+
     DocDeclStr(
         wxString , GetPath() const,
         "Returns the full path (directory and filename) of the selected file.", "");
-    
+
     DocDeclStr(
         wxString , GetDirectory() const,
         "Returns the default directory.", "");
-    
+
     DocDeclStr(
         wxString , GetFilename() const,
         "Returns the default filename.", "");
-    
+
     DocDeclStr(
         wxString , GetWildcard() const,
         "Returns the file dialog wildcard.", "");
-    
+
     DocDeclStr(
         long , GetStyle() const,
         "Returns the dialog style.", "");
-    
+
     DocDeclStr(
         int , GetFilterIndex() const,
         "Returns the index into the list of filters supplied, optionally, in
@@ -309,8 +337,8 @@ GetFilename for the others.", "");
         DocStr(GetPaths,
                "Fills the array paths with the full paths of the files chosen. This
 function should only be used with the dialogs which have wx.MULTIPLE
-style, use GetPath for the others.", "");   
+style, use GetPath for the others.", "");
-    
+
         PyObject* GetPaths() {
             wxArrayString arr;
             self->GetPaths(arr);
@@ -379,7 +407,7 @@ public:
 
 ", "");
 
-    
+
     DocDeclAStr(
         void, SetSelections(const wxArrayInt& selections),
         "SetSelections(List selections)",
@@ -434,11 +462,11 @@ public:
     DocDeclStr(
         int , GetSelection(),
         "Get the index of teh currently selected item.", "");
-    
+
     DocDeclStr(
         wxString , GetStringSelection(),
         "Returns the string value of the currently selected item", "");
-    
+
     DocDeclStr(
         void , SetSelection(int sel),
         "Set the current selected item to sel", "");
@@ -471,7 +499,7 @@ public:
         wxString , GetValue(),
         "Returns the text that the user has entered if the user has pressed OK,
 or the original value if the user has pressed Cancel.", "");
-    
+
     DocDeclStr(
         void , SetValue(const wxString& value),
         "Sets the default text value.", "");
@@ -510,60 +538,60 @@ public:
         "Enables or disables 'effects' under MS Windows only. This refers to
 the controls for manipulating colour, strikeout and underline
 properties.  The default value is true.", "");
-    
+
     DocDeclStr(
         bool , GetAllowSymbols(),
         "Under MS Windows, returns a flag determining whether symbol fonts can
 be selected. Has no effect on other platforms. The default value is
 true.", "");
-    
+
     DocDeclStr(
         wxColour , GetColour(),
         "Gets the colour associated with the font dialog. The default value is
 black.", "");
-    
+
     DocDeclStr(
         wxFont , GetChosenFont(),
         "Gets the font chosen by the user.", "");
-    
+
     DocDeclStr(
         bool , GetEnableEffects(),
         "Determines whether 'effects' are enabled under Windows.", "");
-    
+
     DocDeclStr(
         wxFont , GetInitialFont(),
         "Gets the font that will be initially used by the font dialog. This
 should have previously been set by the application.", "");
-    
+
     DocDeclStr(
         bool , GetShowHelp(),
         "Returns true if the Help button will be shown (Windows only).  The
 default value is false.", "");
-    
+
     DocDeclStr(
         void , SetAllowSymbols(bool allowSymbols),
         "Under MS Windows, determines whether symbol fonts can be selected. Has
 no effect on other platforms.  The default value is true.", "");
-    
+
     DocDeclStr(
         void , SetChosenFont(const wxFont& font),
         "Sets the font that will be returned to the user (normally for internal
 use only).", "");
-    
+
     DocDeclStr(
         void , SetColour(const wxColour& colour),
         "Sets the colour that will be used for the font foreground colour.  The
 default colour is black.", "");
-    
+
     DocDeclStr(
         void , SetInitialFont(const wxFont& font),
         "Sets the font that will be initially used by the font dialog.", "");
-    
+
     DocDeclStr(
         void , SetRange(int min, int max),
         "Sets the valid range for the font point size (Windows only).  The
 default is 0, 0 (unrestricted range).", "");
-    
+
     DocDeclStr(
         void , SetShowHelp(bool showHelp),
         "Determines whether the Help button will be displayed in the font
@@ -592,11 +620,11 @@ the dialog.  If ShowModal returns ``wx.ID_OK`` then you can fetch the
 results with via the `wx.FontData` returned by `GetFontData`.", "");
     wxFontDialog(wxWindow* parent, const wxFontData& data);
 
-    
+
     DocDeclStr(
         wxFontData& , GetFontData(),
         "Returns a reference to the internal `wx.FontData` used by the
-wx.FontDialog.", "");    
+wx.FontDialog.", "");
 };
 
 
@@ -638,7 +666,7 @@ MustHaveApp(wxMessageDialog);
 class wxMessageDialog : public wxDialog {
 public:
     %pythonAppend wxMessageDialog   "self._setOORInfo(self)"
-    
+
     DocCtorStr(
         wxMessageDialog(wxWindow* parent,
                         const wxString& message,
@@ -731,12 +759,12 @@ If the ``continue`` return value is ``false``, the application can either
 immediately destroy the dialog or ask the user for confirmation, and if the
 abort is not confirmed the dialog may be resumed with `Resume` function.
 ", "");
-    
+
     DocDeclStr(
         void , Resume(),
         "Can be used to continue with the dialog, after the user had chosen to
 abort.", "");
-    
+
 };
 
 //---------------------------------------------------------------------------
@@ -786,11 +814,11 @@ EVT_FIND_REPLACE_ALL = wx.PyEventBinder( wxEVT_COMMAND_FIND_REPLACE_ALL, 1 )
 EVT_FIND_CLOSE = wx.PyEventBinder( wxEVT_COMMAND_FIND_CLOSE, 1 )
 
 %# For backwards compatibility.  Should they be removed?
-EVT_COMMAND_FIND             = EVT_FIND 
+EVT_COMMAND_FIND             = EVT_FIND
 EVT_COMMAND_FIND_NEXT        = EVT_FIND_NEXT
 EVT_COMMAND_FIND_REPLACE     = EVT_FIND_REPLACE
 EVT_COMMAND_FIND_REPLACE_ALL = EVT_FIND_REPLACE_ALL
-EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE        
+EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE
 }
 
 
@@ -801,33 +829,33 @@ class wxFindDialogEvent : public wxCommandEvent
 {
 public:
     wxFindDialogEvent(wxEventType commandType = wxEVT_NULL, int id = 0);
-    
+
     DocDeclStr(
         int , GetFlags(),
         "Get the currently selected flags: this is the combination of
 wx.FR_DOWN, wx.FR_WHOLEWORD and wx.FR_MATCHCASE flags.", "");
-    
+
     DocDeclStr(
         const wxString& , GetFindString(),
         "Return the string to find (never empty).", "");
-    
+
     DocDeclStr(
         const wxString& , GetReplaceString(),
         "Return the string to replace the search string with (only for replace
 and replace all events).", "");
-    
+
     DocDeclStr(
         wxFindReplaceDialog *, GetDialog(),
         "Return the pointer to the dialog which generated this event.", "");
-    
+
     DocDeclStr(
         void , SetFlags(int flags),
         "", "");
-    
+
     DocDeclStr(
         void , SetFindString(const wxString& str),
         "", "");
-    
+
     DocDeclStr(
         void , SetReplaceString(const wxString& str),
         "", "");
@@ -835,7 +863,7 @@ and replace all events).", "");
 
 
 
-DocStr(wxFindReplaceData, 
+DocStr(wxFindReplaceData,
 "wx.FindReplaceData holds the data for wx.FindReplaceDialog. It is used
 to initialize the dialog with the default values and will keep the
 last values from the dialog when it is closed. It is also updated each
@@ -847,7 +875,7 @@ dialog and calling them has no effect later.", "
 
 Flags
 -----
-    ================   ===============================================  
+    ================   ===============================================
     wx.FR_DOWN         Downward search/replace selected (otherwise,
                        upwards)
 
@@ -855,7 +883,7 @@ Flags
 
     wx.FR_MATCHCASE    Case sensitive search/replace selected
                        (otherwise, case insensitive)
-    ================   ===============================================  
+    ================   ===============================================
 ");
 
 
@@ -867,34 +895,34 @@ public:
     DocCtorStr(
         wxFindReplaceData(int flags=0),
         "Constuctor initializes the flags to default value (0).", "");
-    
+
     ~wxFindReplaceData();
-    
+
 
     DocDeclStr(
         const wxString& , GetFindString(),
         "Get the string to find.", "");
-    
+
     DocDeclStr(
         const wxString& , GetReplaceString(),
         "Get the replacement string.", "");
-    
+
     DocDeclStr(
         int , GetFlags(),
         "Get the combination of flag values.", "");
-    
+
     DocDeclStr(
         void , SetFlags(int flags),
         "Set the flags to use to initialize the controls of the dialog.", "");
-    
+
     DocDeclStr(
         void , SetFindString(const wxString& str),
         "Set the string to find (used as initial value by the dialog).", "");
-    
+
     DocDeclStr(
         void , SetReplaceString(const wxString& str),
         "Set the replacement string (used as initial value by the dialog).", "");
-    
+
 };
 
 
@@ -944,21 +972,21 @@ non-None.  Use Show to display the dialog.", "");
         "Precreate a FindReplaceDialog for 2-phase creation", "",
         PreFindReplaceDialog);
 
-    
+
     DocDeclStr(
         bool , Create(wxWindow *parent, wxFindReplaceData *data,
                       const wxString &title, int style = 0),
         "Create the dialog, for 2-phase create.", "");
-    
+
 
     DocDeclStr(
         const wxFindReplaceData *, GetData(),
         "Get the FindReplaceData object used by this dialog.", "");
-    
+
     DocDeclStr(
         void , SetData(wxFindReplaceData *data),
         "Set the FindReplaceData object used by this dialog.", "");
-    
+
 };
 
 //---------------------------------------------------------------------------

wxPython/src/_defs.i

@@ -679,14 +679,6 @@ enum {
    
     wxID_HIGHEST,
 
-    wxOPEN,
-    wxSAVE,
-    wxHIDE_READONLY,
-    wxOVERWRITE_PROMPT,
-    wxFILE_MUST_EXIST,
-    wxMULTIPLE,
-    wxCHANGE_DIR,
-
     wxACCEL_ALT,
     wxACCEL_CTRL,
     wxACCEL_SHIFT,
@@ -701,10 +693,6 @@ enum {
     wxPD_SMOOTH,
     wxPD_CAN_SKIP,
 
-    wxDD_NEW_DIR_BUTTON,
-    wxDD_DEFAULT_STYLE,
-    wxDD_CHANGE_DIR,
-    
     wxMENU_TEAROFF,
     wxMB_DOCKABLE,
     wxNO_FULL_REPAINT_ON_RESIZE,

wxPython/src/_dirctrl.i

@@ -86,7 +86,8 @@ public:
     
     // Try to expand as much of the given path as possible.
     virtual bool ExpandPath(const wxString& path);
-
+    // collapse the path
+    virtual bool CollapsePath(const wxString& path);
 
     virtual inline wxString GetDefaultPath() const;
     virtual void SetDefaultPath(const wxString& path);

wxPython/src/_font.i

@@ -250,10 +250,18 @@ public:
     void SetStyle(wxFontStyle style);
     void SetWeight(wxFontWeight weight);
     void SetUnderlined(bool underlined);
-    void SetFaceName(wxString facename);
+    bool SetFaceName(wxString facename);
     void SetFamily(wxFontFamily family);
     void SetEncoding(wxFontEncoding encoding);
 
+// TODO:     
+//     // sets the first facename in the given array which is found
+//     // to be valid. If no valid facename is given, sets the
+//     // first valid facename returned by wxFontEnumerator::GetFacenames().
+//     // Does not return a bool since it cannot fail.
+//     void SetFaceName(const wxArrayString &facenames);
+
+    
     // it is important to be able to serialize wxNativeFontInfo objects to be
     // able to store them (in config file, for example)
     bool FromString(const wxString& s);
@@ -734,7 +742,7 @@ size is found using a binary search.", "");
         "Sets the font weight.", "");
     
     DocDeclStr(
-        virtual void , SetFaceName( const wxString& faceName ),
+        virtual bool , SetFaceName( const wxString& faceName ),
         "Sets the facename for the font.  The facename, which should be a valid
 font installed on the end-user's system.
 
@@ -758,13 +766,13 @@ then for a font belonging to the same family.", "");
     
 
     DocDeclStrName(
-        void , SetNativeFontInfo(const wxString& info),
+        bool , SetNativeFontInfo(const wxString& info),
         "Set the font's attributes from string representation of a
 `wx.NativeFontInfo` object.", "",
         SetNativeFontInfoFromString);
     
     DocDeclStr(
-        void , SetNativeFontInfoUserDesc(const wxString& info),
+        bool , SetNativeFontInfoUserDesc(const wxString& info),
         "Set the font's attributes from a string formerly returned from
 `GetNativeFontInfoDesc`.", "");
     
@@ -838,33 +846,31 @@ public:
 
     bool EnumerateEncodings(const wxString& facename = wxPyEmptyString);
 
-    //wxArrayString* GetEncodings();
-    //wxArrayString* GetFacenames();
     %extend {
-        PyObject* GetEncodings() {
+        static PyObject* GetEncodings() {
             PyObject* ret;
-            wxArrayString* arr = self->GetEncodings();
+            wxArrayString arr = wxFontEnumerator::GetEncodings();
             wxPyBlock_t blocked = wxPyBeginBlockThreads();            
-            if (arr)
+            ret = wxArrayString2PyList_helper(arr);
-                ret = wxArrayString2PyList_helper(*arr);
-            else
-                ret = PyList_New(0);
             wxPyEndBlockThreads(blocked);
             return ret;
         }
 
-        PyObject* GetFacenames() {
+        static PyObject* GetFacenames() {
             PyObject* ret;
-            wxArrayString* arr = self->GetFacenames();
+            wxArrayString arr = wxFontEnumerator::GetFacenames();
             wxPyBlock_t blocked = wxPyBeginBlockThreads();            
-            if (arr)
+            ret = wxArrayString2PyList_helper(arr);
-                ret = wxArrayString2PyList_helper(*arr);
-            else
-                ret =  PyList_New(0);
             wxPyEndBlockThreads(blocked);
             return ret;
         }
     }
+
+    DocDeclStr(
+        static bool , IsValidFacename(const wxString &str),
+        "Convenience function that returns true if the given face name exist in
+the user's system", "");
+    
 };
 
 

wxPython/src/_functions.i

@@ -427,40 +427,5 @@ MustHaveApp(wxThread);
     }
 %}
 
-//---------------------------------------------------------------------------
-
-// enum wxPowerType
-// {
-//     wxPOWER_SOCKET,
-//     wxPOWER_BATTERY,
-//     wxPOWER_UNKNOWN
-// };
-
-// DocDeclStr(
-//     wxPowerType , wxGetPowerType(),
-//     "Returns the type of power source as one of wx.POWER_SOCKET,
-// wx.POWER_BATTERY or wx.POWER_UNKNOWN.  wx.POWER_UNKNOWN is also the
-// default on platforms where this feature is not implemented.", "");
-
-
-// enum wxBatteryState
-// {
-//     wxBATTERY_NORMAL_STATE,    // system is fully usable
-//     wxBATTERY_LOW_STATE,       // start to worry
-//     wxBATTERY_CRITICAL_STATE,  // save quickly
-//     wxBATTERY_SHUTDOWN_STATE,  // too late
-//     wxBATTERY_UNKNOWN_STATE
-// };
-
-// DocDeclStr(
-//     wxBatteryState , wxGetBatteryState(),
-//     "Returns battery state as one of wx.BATTERY_NORMAL_STATE,
-// wx.BATTERY_LOW_STATE}, wx.BATTERY_CRITICAL_STATE,
-// wx.BATTERY_SHUTDOWN_STATE or wx.BATTERY_UNKNOWN_STATE.
-// wx.BATTERY_UNKNOWN_STATE is also the default on platforms where this
-// feature is not implemented.", "");
-
-
-
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------

wxPython/src/_hyperlink.i

@@ -0,0 +1,118 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        _hyperlink.i
+// Purpose:     SWIG interface defs for wxHyperlinkCtrl
+//
+// Author:      Robin Dunn
+//
+// Created:     28-May-2006
+// RCS-ID:      $Id$
+// Copyright:   (c) 2006 by Total Control Software
+// Licence:     wxWindows license
+/////////////////////////////////////////////////////////////////////////////
+
+// Not a %module
+
+
+//---------------------------------------------------------------------------
+
+%{
+#include <wx/hyperlink.h>
+%}
+
+MAKE_CONST_WXSTRING(HyperlinkCtrlNameStr);
+
+enum {
+    wxHL_CONTEXTMENU,
+    wxHL_DEFAULT_STYLE
+};
+
+//---------------------------------------------------------------------------
+%newgroup
+
+MustHaveApp(wxHyperlinkCtrl);
+
+
+DocStr( wxHyperlinkCtrl,
+"A static text control that emulates a hyperlink. The link is displayed
+in an appropriate text style, derived from the control's normal font.
+When the mouse rolls over the link, the cursor changes to a hand and
+the link's color changes to the active color.
+
+Clicking on the link does not launch a web browser; instead, a
+wx.HyperlinkEvent is fired. Use the wx.EVT_HYPERLINK to catch link
+events.
+", "");
+
+class wxHyperlinkCtrl : public wxControl
+{
+public:
+    %pythonAppend wxHyperlinkCtrl      "self._setOORInfo(self)"
+    %pythonAppend wxHyperlinkCtrl()    ""
+
+    
+    // Constructor.
+    wxHyperlinkCtrl(wxWindow *parent,
+                    wxWindowID id,
+                    const wxString& label, const wxString& url,
+                    const wxPoint& pos = wxDefaultPosition,
+                    const wxSize& size = wxDefaultSize,
+                    long style = wxHL_DEFAULT_STYLE,
+                    const wxString& name = wxPyHyperlinkCtrlNameStr);
+    %RenameCtor(PreHyperlinkCtrl, wxHyperlinkCtrl());
+
+    // Creation function (for two-step construction).
+    bool Create(wxWindow *parent,
+                wxWindowID id,
+                const wxString& label, const wxString& url,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = wxHL_DEFAULT_STYLE,
+                const wxString& name = wxPyHyperlinkCtrlNameStr);
+
+    // get/set
+    wxColour GetHoverColour() const;
+    void SetHoverColour(const wxColour &colour);
+
+    wxColour GetNormalColour() const;
+    void SetNormalColour(const wxColour &colour);
+
+    wxColour GetVisitedColour() const;
+    void SetVisitedColour(const wxColour &colour);
+
+    wxString GetURL() const;
+    void SetURL (const wxString &url);
+
+    void SetVisited(bool visited = true);
+    bool GetVisited() const;
+
+};
+
+
+%constant wxEventType wxEVT_COMMAND_HYPERLINK;
+
+
+//
+// An event fired when the user clicks on the label in a hyperlink control.
+// See HyperlinkControl for details.
+//
+class wxHyperlinkEvent : public wxCommandEvent
+{
+public:
+
+    wxHyperlinkEvent(wxObject *generator, wxWindowID id, const wxString& url);
+
+    // Returns the URL associated with the hyperlink control
+    // that the user clicked on.
+    wxString GetURL() const;
+    void SetURL(const wxString &url);
+};
+
+
+%pythoncode {
+    EVT_HYPERLINK = wx.PyEventBinder( wxEVT_COMMAND_HYPERLINK, 1 )
+}
+
+
+
+//---------------------------------------------------------------------------
+//---------------------------------------------------------------------------

wxPython/src/_listctrl.i

@@ -84,6 +84,9 @@ enum {
     wxLIST_HITTEST_TOLEFT,
     wxLIST_HITTEST_TORIGHT,
     wxLIST_HITTEST_ONITEM,
+
+// GetSubItemRect constants    
+    wxLIST_GETSUBITEMRECT_WHOLEITEM,
 };
 
 
@@ -544,6 +547,13 @@ public:
             self->GetItemRect(item, rect, code);
             return rect;
         }
+
+// MSW only so far...        
+//         wxRect GetSubItemRect(long item, long subItem, int code = wxLIST_RECT_BOUNDS) {
+//             wxRect rect;
+//             self->GetSubItemRect(item, subItem, rect, code);
+//             return rect;
+//         }
     }
 
 
@@ -660,6 +670,15 @@ public:
         "Determines which item (if any) is at the specified point, giving
 details in the second return value (see wx.LIST_HITTEST flags.)", "");
 
+    DocDeclAStrName(
+        long, HitTest(const wxPoint& point, int& OUTPUT, long* OUTPUT),
+        "HitTestSubItem(Point point) -> (item, where, subItem)",
+        "Determines which item (if any) is at the specified point, giving details in
+the second return value (see wx.LIST_HITTEST flags) and also the subItem, if
+any.", "",
+        HitTestSubItem);
+
+    
     // Inserts an item, returning the index of the new item if successful,
     // -1 otherwise.
     long InsertItem(wxListItem& info);

wxPython/src/_power.i

@@ -0,0 +1,108 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        _power.i
+// Purpose:     SWIG interface for wx poser events and functions
+//
+// Author:      Robin Dunn
+//
+// Created:     28-May-2006
+// RCS-ID:      $Id$
+// Copyright:   (c) 2006 by Total Control Software
+// Licence:     wxWindows license
+/////////////////////////////////////////////////////////////////////////////
+
+// Not a %module
+
+//---------------------------------------------------------------------------
+%newgroup
+
+%{
+#include <wx/power.h>
+%}
+
+
+
+%{
+#ifndef wxHAS_POWER_EVENTS
+// Dummy class and other definitions for platforms that don't have them
+
+class wxPowerEvent : public wxEvent
+{
+public:
+    wxPowerEvent(wxEventType evtType) : wxEvent(wxID_NONE, evtType) {}
+    void Veto() {}
+    bool IsVetoed() const { return false; }
+
+    virtual wxEvent *Clone() const { return new wxPowerEvent(*this); }
+};
+
+enum {
+    wxEVT_POWER_SUSPENDING,
+    wxEVT_POWER_SUSPENDED,
+    wxEVT_POWER_SUSPEND_CANCEL,
+    wxEVT_POWER_RESUME,
+};
+
+wxPowerType wxGetPowerType()       { return wxPOWER_UNKNOWN; }
+wxBatteryState wxGetBatteryState() { return wxBATTERY_UNKNOWN_STATE; }
+
+#endif
+%}
+
+
+
+enum wxPowerType
+{
+    wxPOWER_SOCKET,
+    wxPOWER_BATTERY,
+    wxPOWER_UNKNOWN
+};
+
+enum wxBatteryState
+{
+    wxBATTERY_NORMAL_STATE,    // system is fully usable
+    wxBATTERY_LOW_STATE,       // start to worry
+    wxBATTERY_CRITICAL_STATE,  // save quickly
+    wxBATTERY_SHUTDOWN_STATE,  // too late
+    wxBATTERY_UNKNOWN_STATE
+};
+
+
+DocStr(wxPowerEvent,
+"wx.PowerEvent is generated when the system online status changes.
+Currently this is only implemented for Windows.",
+"");
+class wxPowerEvent : public wxEvent
+{
+public:
+    wxPowerEvent(wxEventType evtType);
+
+    // Veto the operation (only makes sense with EVT_POWER_SUSPENDING)
+    void Veto();
+    bool IsVetoed() const;
+};
+
+
+%constant wxEventType wxEVT_POWER_SUSPENDING;
+%constant wxEventType wxEVT_POWER_SUSPENDED;
+%constant wxEventType wxEVT_POWER_SUSPEND_CANCEL;
+%constant wxEventType wxEVT_POWER_RESUME;
+
+%pythoncode {
+EVT_POWER_SUSPENDING       = wx.PyEventBinder( wxEVT_POWER_SUSPENDING , 1 )
+EVT_POWER_SUSPENDED        = wx.PyEventBinder( wxEVT_POWER_SUSPENDED , 1 )
+EVT_POWER_SUSPEND_CANCEL   = wx.PyEventBinder( wxEVT_POWER_SUSPEND_CANCEL , 1 )
+EVT_POWER_RESUME           = wx.PyEventBinder( wxEVT_POWER_RESUME , 1 )
+}
+
+
+DocDeclStr(
+    wxPowerType , wxGetPowerType(),
+    "return the current system power state: online or offline", "");
+
+
+DocDeclStr(
+    wxBatteryState , wxGetBatteryState(),
+    "return approximate battery state", "");
+
+
+//---------------------------------------------------------------------------

wxPython/src/_toolbar.i

@@ -43,6 +43,7 @@ enum {
     wxTB_NOALIGN,
     wxTB_HORZ_LAYOUT,
     wxTB_HORZ_TEXT,
+    wxTB_NO_TOOLTIPS,
 };
 
 

wxPython/src/_window.i

@@ -980,9 +980,18 @@ functions so should not be required by the application programmer.", "");
         "Removes a child window. This is called automatically by window
 deletion functions so should not be required by the application
 programmer.", "");
-    
 
 
+    DocStr(SetDoubleBuffered,
+           "Currently wxGTK2 only.", "");
+#ifdef __WXGTK__
+    void SetDoubleBuffered(bool on);
+#else
+    %extend {
+        void SetDoubleBuffered(bool on) {}
+    }
+#endif
+
 
     // looking for windows
     // -------------------

wxPython/src/controls.i

@@ -59,7 +59,7 @@ MAKE_CONST_WXSTRING_NOSWIG(ControlNameStr);
 %include _cshelp.i
 %include _dragimg.i
 %include _datectrl.i
-
+%include _hyperlink.i
 
 
 //---------------------------------------------------------------------------

wxPython/src/html.i

@@ -1146,10 +1146,8 @@ public:
                           const wxString& normal_face = wxPyEmptyString,
                           const wxString& fixed_face = wxPyEmptyString);
 
-    int Render(int x, int y, int from = 0, int dont_render = false, int maxHeight = INT_MAX,
+    int Render(int x, int y, wxArrayInt& known_pagebreaks, int from = 0,
-               //int *known_pagebreaks = NULL, int number_of_pages = 0
+               int dont_render = FALSE, int to = INT_MAX);
-               int* choices=NULL, int LCOUNT = 0
-               );
     int GetTotalHeight();
                 // returns total height of the html document
                 // (compare Render's return value with this)

wxPython/src/misc.i

@@ -48,5 +48,6 @@ MAKE_CONST_WXSTRING_NOSWIG(EmptyString);
 %include _clipbrd.i
 %include _display.i
 %include _stdpaths.i
+%include _power.i
 
 //---------------------------------------------------------------------------