xlights_2024.20

include/wx-3.3/wx/cmdline.h

@@ -75,6 +75,10 @@ enum wxCmdLineSwitchState
     wxCMD_SWITCH_ON         // Found in normal state.
 };
 
+// Constants determining how (and if) to wrap the usage message
+constexpr int wxCMD_LINE_WRAP_AUTO = -1;
+constexpr int wxCMD_LINE_WRAP_NONE = 0;
+
 // ----------------------------------------------------------------------------
 // wxCmdLineEntryDesc is a description of one command line
 // switch/option/parameter
@@ -246,6 +250,9 @@ class WXDLLIMPEXP_BASE wxCmdLineParser
     // extra text may be shown by Usage() method if set by this function
     void SetLogo(const wxString& logo);
 
+    // set the brief usage string instead of constructing it automatically
+    void SetUsageSynopsis(const wxString& synopsis);
+
     // construct the cmd line description
     // ----------------------------------
 
@@ -292,14 +299,16 @@ class WXDLLIMPEXP_BASE wxCmdLineParser
     // syntax error occurred
     //
     // if showUsage is true, Usage() is called in case of syntax error or if
-    // help was requested
-    int Parse(bool showUsage = true);
+    // help was requested and if wrapColumn is not 0, the usage message is
+    // wrapped at the specified column, which will be the terminal width for
+    // its default value
+    int Parse(bool showUsage = true, int wrapColumn = wxCMD_LINE_WRAP_AUTO);
 
     // give the usage message describing all program options
-    void Usage() const;
+    void Usage(int wrapColumn = wxCMD_LINE_WRAP_AUTO) const;
 
     // return the usage string, call Usage() to directly show it to the user
-    wxString GetUsageString() const;
+    wxString GetUsageString(int wrapColumn = wxCMD_LINE_WRAP_AUTO) const;
 
     // get the command line arguments
     // ------------------------------

include/wx-3.3/wx/defs.h

@@ -1013,20 +1013,23 @@ typedef double wxDouble;
 
 /* Define wxChar16 and wxChar32                                              */
 
+#ifdef __cplusplus
+
 #if SIZEOF_WCHAR_T == 2
     #define wxWCHAR_T_IS_WXCHAR16
     typedef wchar_t wxChar16;
 #else
-    typedef wxUint16 wxChar16;
+    typedef char16_t wxChar16;
 #endif
 
 #if SIZEOF_WCHAR_T == 4
     #define wxWCHAR_T_IS_WXCHAR32
     typedef wchar_t wxChar32;
 #else
-    typedef wxUint32 wxChar32;
+    typedef char32_t wxChar32;
 #endif
 
+#endif /* __cplusplus */
 
 /*
     Helper macro expanding into the given "m" macro invoked with each of the

include/wx-3.3/wx/glcanvas.h

@@ -53,7 +53,7 @@ enum
     WX_GL_CORE_PROFILE,    // use an OpenGL core profile
     WX_GL_MAJOR_VERSION,   // major OpenGL version of the core profile
     WX_GL_MINOR_VERSION,   // minor OpenGL version of the core profile
-    wx_GL_COMPAT_PROFILE,  // use compatible profile (use all versions features)
+    WX_GL_COMPAT_PROFILE,  // use compatible profile (use all versions features)
     WX_GL_FORWARD_COMPAT,  // forward compatible context. OpenGL >= 3.0
     WX_GL_ES2,             // ES or ES2 context.
     WX_GL_DEBUG,           // create a debug context
@@ -62,7 +62,10 @@ enum
     WX_GL_LOSE_ON_RESET,   // if graphics reset, all context state is lost
     WX_GL_RESET_ISOLATION, // protect other apps or share contexts from reset side-effects
     WX_GL_RELEASE_FLUSH,   // on context release, flush pending commands
-    WX_GL_RELEASE_NONE     // on context release, pending commands are not flushed
+    WX_GL_RELEASE_NONE,    // on context release, pending commands are not flushed
+
+    // Old name defined (ironically) for compatibility.
+    wx_GL_COMPAT_PROFILE = WX_GL_COMPAT_PROFILE
 };
 
 #define wxGLCanvasName wxT("GLCanvas")

include/wx-3.3/wx/html/htmlcell.h

@@ -202,7 +202,11 @@ enum wxHtmlScriptMode
 class WXDLLIMPEXP_HTML wxHtmlCell : public wxObject
 {
 public:
-    wxHtmlCell();
+    wxHtmlCell() = default;
+    explicit wxHtmlCell(const wxHtmlTag& tag)
+        : m_id(tag.GetParam(wxASCII_STR("id")))
+    {
+    }
     virtual ~wxHtmlCell();
 
     void SetParent(wxHtmlContainerCell *p) {m_Parent = p;}
@@ -228,7 +232,9 @@ class WXDLLIMPEXP_HTML wxHtmlCell : public wxObject
     bool IsFormattingCell() const { return m_Width == 0 && m_Height == 0; }
 
     const wxString& GetId() const { return m_id; }
+    bool HasId() const { return !m_id.empty(); }
     void SetId(const wxString& id) { m_id = id; }
+    void CopyId(const wxHtmlTag& tag) { m_id = tag.GetParam(wxASCII_STR("id")); }
 
     // returns the link associated with this cell. The position is position
     // within the cell so it varies from 0 to m_Width, from 0 to m_Height
@@ -284,8 +290,9 @@ class WXDLLIMPEXP_HTML wxHtmlCell : public wxObject
     // Condition is unique condition identifier (see htmldefs.h)
     // (user-defined condition IDs should start from 10000)
     // and param is optional parameter
-    // Example : m_Cell->Find(wxHTML_COND_ISANCHOR, "news");
-    //   returns pointer to anchor news
+    // Example : m_Cell->Find(wxHTML_COND_ISANCHOR, &string);
+    //   returns pointer to anchor with the name specified by the string
+    // (see protected CheckIsAnchor() helper)
     virtual const wxHtmlCell* Find(int condition, const void* param) const;
 
 
@@ -380,25 +387,45 @@ class WXDLLIMPEXP_HTML wxHtmlCell : public wxObject
     // Return the description used by Dump().
     virtual wxString GetDescription() const;
 
+    // Can be used in Find() to check if the condition is wxHTML_COND_ISANCHOR
+    // and the parameter matches the given string or, in the overload not
+    // taking anchor, the ID of this cell.
+    //
+    // This is supposed to only be used as a helper from Find().
+    bool CheckIsAnchor(int cond, const void* p, const wxString& anchor) const
+    {
+        // Note that we know that the parameter is always a valid pointer to
+        // wxString for this condition.
+        return cond == wxHTML_COND_ISANCHOR &&
+                    *static_cast<const wxString*>(p) == anchor;
+    }
+
+    bool CheckIsAnchor(int cond, const void* p) const
+    {
+        return CheckIsAnchor(cond, p, GetId());
+    }
+
 
     // pointer to the next cell
-    wxHtmlCell *m_Next;
+    wxHtmlCell *m_Next = nullptr;
     // pointer to parent cell
-    wxHtmlContainerCell *m_Parent;
+    wxHtmlContainerCell *m_Parent = nullptr;
 
     // dimensions of fragment (m_Descent is used to position text & images)
-    int m_Width, m_Height, m_Descent;
+    int m_Width = 0,
+        m_Height = 0,
+        m_Descent = 0;
     // position where the fragment is drawn:
     int m_PosX, m_PosY;
 
     // superscript/subscript/normal:
-    wxHtmlScriptMode m_ScriptMode;
-    long m_ScriptBaseline;
+    wxHtmlScriptMode m_ScriptMode = wxHTML_SCRIPT_NORMAL;
+    long m_ScriptBaseline = 0;
 
     // destination address if this fragment is hypertext link, nullptr otherwise
-    wxHtmlLinkInfo *m_Link;
+    wxHtmlLinkInfo *m_Link = nullptr;
     // true if this cell can be placed on pagebreak, false otherwise
-    bool m_CanLiveOnPagebreak;
+    bool m_CanLiveOnPagebreak = true;
     // unique identifier of the cell, generated from "id" property of tags
     wxString m_id;
 
@@ -483,6 +510,7 @@ class WXDLLIMPEXP_HTML wxHtmlContainerCell : public wxHtmlCell
 {
 public:
     explicit wxHtmlContainerCell(wxHtmlContainerCell *parent);
+    wxHtmlContainerCell(const wxHtmlTag& tag, wxHtmlContainerCell *parent);
     virtual ~wxHtmlContainerCell();
 
     virtual void Layout(int w) override;
@@ -569,32 +597,42 @@ class WXDLLIMPEXP_HTML wxHtmlContainerCell : public wxHtmlCell
                                   wxHtmlCell *cell) const;
 
 protected:
-    int m_IndentLeft, m_IndentRight, m_IndentTop, m_IndentBottom;
+    int m_IndentLeft = 0,
+        m_IndentRight = 0,
+        m_IndentTop = 0,
+        m_IndentBottom = 0;
             // indentation of subcells. There is always m_Indent pixels
             // big space between given border of the container and the subcells
             // it m_Indent < 0 it is in PERCENTS, otherwise it is in pixels
-    int m_MinHeight, m_MinHeightAlign;
+    int m_MinHeight = 0,
+        m_MinHeightAlign = wxHTML_ALIGN_TOP;
         // minimal height.
-    wxHtmlCell *m_Cells, *m_LastCell;
+    wxHtmlCell *m_Cells = nullptr,
+               *m_LastCell = nullptr;
             // internal cells, m_Cells points to the first of them, m_LastCell to the last one.
             // (LastCell is needed only to speed-up InsertCell)
-    int m_AlignHor, m_AlignVer;
+    int m_AlignHor = wxHTML_ALIGN_LEFT,
+        m_AlignVer = wxHTML_ALIGN_BOTTOM;
             // alignment horizontal and vertical (left, center, right)
-    int m_WidthFloat, m_WidthFloatUnits;
+    int m_WidthFloat = 100,
+        m_WidthFloatUnits = wxHTML_UNITS_PERCENT;
             // width float is used in adjustWidth
     wxColour m_BkColour;
             // background color of this container
-    int m_Border;
+    int m_Border = 0;
             // border size. Draw only if m_Border > 0
     wxColour m_BorderColour1, m_BorderColour2;
             // borders color of this container
-    int m_LastLayout;
+    int m_LastLayout = -1;
             // if != -1 then call to Layout may be no-op
             // if previous call to Layout has same argument
-    int m_MaxTotalWidth;
+    int m_MaxTotalWidth = 0;
             // Maximum possible length if ignoring line wrap
 
 
+private:
+    void InitParent(wxHtmlContainerCell *parent);
+
     wxDECLARE_ABSTRACT_CLASS(wxHtmlContainerCell);
     wxDECLARE_NO_COPY_CLASS(wxHtmlContainerCell);
 };
@@ -637,6 +675,7 @@ class WXDLLIMPEXP_HTML wxHtmlFontCell : public wxHtmlCell
 {
 public:
     wxHtmlFontCell(wxFont *font) : wxHtmlCell(), m_Font(*font) { }
+    wxHtmlFontCell(const wxHtmlTag& tag, wxFont *font) : wxHtmlCell(tag), m_Font(*font) { }
     virtual void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2,
                       wxHtmlRenderingInfo& info) override;
     virtual void DrawInvisible(wxDC& dc, int x, int y,

include/wx-3.3/wx/msgout.h

@@ -49,6 +49,14 @@ class WXDLLIMPEXP_BASE wxMessageOutput
     static wxMessageOutput* ms_msgOut;
 };
 
+// This is equivalent to wxMessageOutput::Get()->Output() but doesn't crash if
+// there is no message output object (which shouldn't normally happen).
+inline void wxSafeMessageOutput(const wxString& str)
+{
+    if ( wxMessageOutput* msgOut = wxMessageOutput::Get() )
+        msgOut->Output(str);
+}
+
 // ----------------------------------------------------------------------------
 // helper mix-in for output targets that can use difference encodings
 // ----------------------------------------------------------------------------

include/wx-3.3/wx/textctrl.h

@@ -913,6 +913,10 @@ class WXDLLIMPEXP_CORE wxTextCtrlBase : public wxControl,
         return GetCompositeControlsDefaultAttributes(variant);
     }
 
+    // Setting label for text control doesn't work portably, use SetValue() or
+    // ChangeValue() instead.
+    virtual void SetLabel(const wxString& label) override;
+
     virtual const wxTextEntry* WXGetTextEntry() const override { return this; }
 
 #if wxUSE_SPELLCHECK