Update to wxwidgets 2024.06

xLightsSequencer · Mar 24, 2024 · 467798d · 467798d
1 parent f224b3b
commit 467798d
Show file tree

Hide file tree

Showing 36 changed files with 166 additions and 52 deletions.
diff --git a/bin/wxrc-3.3 b/bin/wxrc-3.3
diff --git a/include/wx-3.3/wx/dataobj.h b/include/wx-3.3/wx/dataobj.h
@@ -378,11 +378,15 @@ class WXDLLIMPEXP_CORE wxTextDataObject : public wxDataObjectSimple
     // implement base class pure virtuals
     // ----------------------------------
 
-    // some platforms have 2 and not 1 format for text data
+    // non-MSW platforms need to support wxDF_TEXT in addition to wxDF_UNICODETEXT
 #if defined(wxNEEDS_UTF8_FOR_TEXT_DATAOBJ) || defined(wxNEEDS_UTF16_FOR_TEXT_DATAOBJ)
     virtual size_t GetFormatCount(Direction WXUNUSED(dir) = Get) const override { return 2; }
     virtual void GetAllFormats(wxDataFormat *formats,
-                               wxDataObjectBase::Direction WXUNUSED(dir) = Get) const override;
+                               wxDataObjectBase::Direction WXUNUSED(dir) = Get) const override
+    {
+        *formats++ = wxDataFormat(wxDF_UNICODETEXT);
+        *formats = wxDataFormat(wxDF_TEXT);
+    }
 
     virtual size_t GetDataSize() const override { return GetDataSize(GetPreferredFormat()); }
     virtual bool GetDataHere(void *buf) const override { return GetDataHere(GetPreferredFormat(), buf); }

diff --git a/include/wx-3.3/wx/notifmsg.h b/include/wx-3.3/wx/notifmsg.h
@@ -81,6 +81,15 @@ class WXDLLIMPEXP_CORE wxNotificationMessageBase : public wxEvtHandler
         Timeout_Never = 0   // notification will never time out
     };
 
+    // reasons for dismissal, posted with wxEVT_NOTIFICATION_MESSAGE_DISMISSED events
+    enum class DismissalReason
+    {
+        Unknown,
+        ByUser,
+        ByApp,
+        TimedOut
+    };
+
     // show the notification to the user and hides it after timeout seconds
     // pass (special values Timeout_Auto and Timeout_Never can be used)
     //

diff --git a/include/wx-3.3/wx/platform.h b/include/wx-3.3/wx/platform.h
@@ -461,6 +461,15 @@
 #        ifndef MAC_OS_VERSION_11_0
 #           define MAC_OS_VERSION_11_0 110000
 #        endif
+#        ifndef MAC_OS_VERSION_12_0
+#           define MAC_OS_VERSION_12_0 120000
+#        endif
+#        ifndef MAC_OS_VERSION_13_0
+#           define MAC_OS_VERSION_13_0 130000
+#        endif
+#        ifndef MAC_OS_VERSION_14_0
+#           define MAC_OS_VERSION_14_0 140000
+#        endif
 #        if __MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_13
 #            ifndef NSAppKitVersionNumber10_10
 #                define NSAppKitVersionNumber10_10 1343

diff --git a/include/wx-3.3/wx/stc/stc.h b/include/wx-3.3/wx/stc/stc.h
@@ -623,6 +623,9 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_LEX_HOLLYWOOD 130
 #define wxSTC_LEX_RAKU 131
 #define wxSTC_LEX_FSHARP 132
+#define wxSTC_LEX_JULIA 133
+#define wxSTC_LEX_ASCIIDOC 134
+#define wxSTC_LEX_GDSCRIPT 135
 
 /// When a lexer specifies its language as SCLEX_AUTOMATIC it receives a
 /// value assigned in sequence from SCLEX_AUTOMATIC+1.
@@ -649,6 +652,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_P_FCHARACTER 17
 #define wxSTC_P_FTRIPLE 18
 #define wxSTC_P_FTRIPLEDOUBLE 19
+#define wxSTC_P_ATTRIBUTE 20
 
 /// Lexical states for SCLEX_CPP
 /// Lexical states for SCLEX_BULLANT
@@ -759,7 +763,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 /// More HTML
 #define wxSTC_H_VALUE 19
 
-/// X-Code
+/// X-Code, ASP.NET, JSP
 #define wxSTC_H_XCCOMMENT 20
 
 /// SGML
@@ -951,7 +955,11 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_RB_STDIN 30
 #define wxSTC_RB_STDOUT 31
 #define wxSTC_RB_STDERR 40
-#define wxSTC_RB_UPPER_BOUND 41
+#define wxSTC_RB_STRING_W 41
+#define wxSTC_RB_STRING_I 42
+#define wxSTC_RB_STRING_QI 43
+#define wxSTC_RB_STRING_QS 44
+#define wxSTC_RB_UPPER_BOUND 45
 
 /// Lexical states for SCLEX_VB, SCLEX_VBSCRIPT, SCLEX_POWERBASIC, SCLEX_BLITZBASIC, SCLEX_PUREBASIC, SCLEX_FREEBASIC
 #define wxSTC_B_DEFAULT 0
@@ -1051,6 +1059,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_ERR_ESCSEQ 23
 #define wxSTC_ERR_ESCSEQ_UNKNOWN 24
 #define wxSTC_ERR_GCC_EXCERPT 25
+#define wxSTC_ERR_BASH 26
 #define wxSTC_ERR_ES_BLACK 40
 #define wxSTC_ERR_ES_RED 41
 #define wxSTC_ERR_ES_GREEN 42
@@ -1077,6 +1086,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_BAT_COMMAND 5
 #define wxSTC_BAT_IDENTIFIER 6
 #define wxSTC_BAT_OPERATOR 7
+#define wxSTC_BAT_AFTER_LABEL 8
 
 /// Lexical states for SCLEX_TCMD
 #define wxSTC_TCMD_DEFAULT 0
@@ -1335,7 +1345,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_CSS_EXTENDED_IDENTIFIER 19
 #define wxSTC_CSS_EXTENDED_PSEUDOCLASS 20
 #define wxSTC_CSS_EXTENDED_PSEUDOELEMENT 21
-#define wxSTC_CSS_MEDIA 22
+#define wxSTC_CSS_GROUP_RULE 22
 #define wxSTC_CSS_VARIABLE 23
 
 /// Lexical states for SCLEX_POV
@@ -1527,6 +1537,30 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_ERLANG_UNKNOWN 31
 
 /// Lexical states for SCLEX_OCTAVE are identical to MatLab
+/// Lexical states for SCLEX_JULIA
+#define wxSTC_JULIA_DEFAULT 0
+#define wxSTC_JULIA_COMMENT 1
+#define wxSTC_JULIA_NUMBER 2
+#define wxSTC_JULIA_KEYWORD1 3
+#define wxSTC_JULIA_KEYWORD2 4
+#define wxSTC_JULIA_KEYWORD3 5
+#define wxSTC_JULIA_CHAR 6
+#define wxSTC_JULIA_OPERATOR 7
+#define wxSTC_JULIA_BRACKET 8
+#define wxSTC_JULIA_IDENTIFIER 9
+#define wxSTC_JULIA_STRING 10
+#define wxSTC_JULIA_SYMBOL 11
+#define wxSTC_JULIA_MACRO 12
+#define wxSTC_JULIA_STRINGINTERP 13
+#define wxSTC_JULIA_DOCSTRING 14
+#define wxSTC_JULIA_STRINGLITERAL 15
+#define wxSTC_JULIA_COMMAND 16
+#define wxSTC_JULIA_COMMANDLITERAL 17
+#define wxSTC_JULIA_TYPEANNOT 18
+#define wxSTC_JULIA_LEXERROR 19
+#define wxSTC_JULIA_KEYWORD4 20
+#define wxSTC_JULIA_TYPEOPERATOR 21
+
 /// Lexical states for SCLEX_MSSQL
 #define wxSTC_MSSQL_DEFAULT 0
 #define wxSTC_MSSQL_COMMENT 1
@@ -2020,6 +2054,10 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_R_IDENTIFIER 9
 #define wxSTC_R_INFIX 10
 #define wxSTC_R_INFIXEOL 11
+#define wxSTC_R_BACKTICKS 12
+#define wxSTC_R_RAWSTRING 13
+#define wxSTC_R_RAWSTRING2 14
+#define wxSTC_R_ESCAPESEQUENCE 15
 
 /// Lexical state for SCLEX_MAGIK
 #define wxSTC_MAGIK_DEFAULT 0
@@ -2370,16 +2408,18 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_VISUALPROLOG_ANONYMOUS 10
 #define wxSTC_VISUALPROLOG_NUMBER 11
 #define wxSTC_VISUALPROLOG_OPERATOR 12
-#define wxSTC_VISUALPROLOG_CHARACTER 13
-#define wxSTC_VISUALPROLOG_CHARACTER_TOO_MANY 14
-#define wxSTC_VISUALPROLOG_CHARACTER_ESCAPE_ERROR 15
-#define wxSTC_VISUALPROLOG_STRING 16
+#define wxSTC_VISUALPROLOG_UNUSED1 13
+#define wxSTC_VISUALPROLOG_UNUSED2 14
+#define wxSTC_VISUALPROLOG_UNUSED3 15
+#define wxSTC_VISUALPROLOG_STRING_QUOTE 16
 #define wxSTC_VISUALPROLOG_STRING_ESCAPE 17
 #define wxSTC_VISUALPROLOG_STRING_ESCAPE_ERROR 18
-#define wxSTC_VISUALPROLOG_STRING_EOL_OPEN 19
-#define wxSTC_VISUALPROLOG_STRING_VERBATIM 20
-#define wxSTC_VISUALPROLOG_STRING_VERBATIM_SPECIAL 21
-#define wxSTC_VISUALPROLOG_STRING_VERBATIM_EOL 22
+#define wxSTC_VISUALPROLOG_UNUSED4 19
+#define wxSTC_VISUALPROLOG_STRING 20
+#define wxSTC_VISUALPROLOG_UNUSED5 21
+#define wxSTC_VISUALPROLOG_STRING_EOL 22
+#define wxSTC_VISUALPROLOG_EMBEDDED 23
+#define wxSTC_VISUALPROLOG_PLACEHOLDER 24
 
 /// Lexical states for SCLEX_STTXT
 #define wxSTC_STTXT_DEFAULT 0
@@ -2702,6 +2742,51 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_FSHARP_ATTRIBUTE 18
 #define wxSTC_FSHARP_FORMAT_SPEC 19
 
+/// Lexical states for SCLEX_ASCIIDOC
+#define wxSTC_ASCIIDOC_DEFAULT 0
+#define wxSTC_ASCIIDOC_STRONG1 1
+#define wxSTC_ASCIIDOC_STRONG2 2
+#define wxSTC_ASCIIDOC_EM1 3
+#define wxSTC_ASCIIDOC_EM2 4
+#define wxSTC_ASCIIDOC_HEADER1 5
+#define wxSTC_ASCIIDOC_HEADER2 6
+#define wxSTC_ASCIIDOC_HEADER3 7
+#define wxSTC_ASCIIDOC_HEADER4 8
+#define wxSTC_ASCIIDOC_HEADER5 9
+#define wxSTC_ASCIIDOC_HEADER6 10
+#define wxSTC_ASCIIDOC_ULIST_ITEM 11
+#define wxSTC_ASCIIDOC_OLIST_ITEM 12
+#define wxSTC_ASCIIDOC_BLOCKQUOTE 13
+#define wxSTC_ASCIIDOC_LINK 14
+#define wxSTC_ASCIIDOC_CODEBK 15
+#define wxSTC_ASCIIDOC_PASSBK 16
+#define wxSTC_ASCIIDOC_COMMENT 17
+#define wxSTC_ASCIIDOC_COMMENTBK 18
+#define wxSTC_ASCIIDOC_LITERAL 19
+#define wxSTC_ASCIIDOC_LITERALBK 20
+#define wxSTC_ASCIIDOC_ATTRIB 21
+#define wxSTC_ASCIIDOC_ATTRIBVAL 22
+#define wxSTC_ASCIIDOC_MACRO 23
+
+/// Lexical states for SCLEX_GDSCRIPT
+#define wxSTC_GD_DEFAULT 0
+#define wxSTC_GD_COMMENTLINE 1
+#define wxSTC_GD_NUMBER 2
+#define wxSTC_GD_STRING 3
+#define wxSTC_GD_CHARACTER 4
+#define wxSTC_GD_WORD 5
+#define wxSTC_GD_TRIPLE 6
+#define wxSTC_GD_TRIPLEDOUBLE 7
+#define wxSTC_GD_CLASSNAME 8
+#define wxSTC_GD_FUNCNAME 9
+#define wxSTC_GD_OPERATOR 10
+#define wxSTC_GD_IDENTIFIER 11
+#define wxSTC_GD_COMMENTBLOCK 12
+#define wxSTC_GD_STRINGEOL 13
+#define wxSTC_GD_WORD2 14
+#define wxSTC_GD_ANNOTATION 15
+#define wxSTC_GD_NODEPATH 16
+
 //}}}
 //----------------------------------------------------------------------
 

diff --git a/include/wx-3.3/wx/webrequest.h b/include/wx-3.3/wx/webrequest.h
@@ -119,9 +119,11 @@ class WXDLLIMPEXP_NET wxWebResponse
     wxString GetDataFile() const;
 
 protected:
-    // Ctor is used by wxWebRequest and wxWebRequestImpl.
+    // Ctor is used by wxWebRequest and implementation classes to create public
+    // objects from the existing implementation pointers.
     friend class wxWebRequest;
     friend class wxWebRequestImpl;
+    friend class wxWebResponseImpl;
     explicit wxWebResponse(const wxWebResponseImplPtr& impl);
 
     wxWebResponseImplPtr m_impl;
@@ -195,9 +197,11 @@ class WXDLLIMPEXP_NET wxWebRequest
     bool IsPeerVerifyDisabled() const;
 
 private:
-    // Ctor is used by wxWebSession and wxWebRequestImpl.
+    // Ctor is used by wxWebSession and implementation classes to create
+    // wxWebRequest objects from the existing implementation pointers.
     friend class wxWebSession;
     friend class wxWebRequestImpl;
+    friend class wxWebResponseImpl;
     explicit wxWebRequest(const wxWebRequestImplPtr& impl);
 
     wxWebRequestImplPtr m_impl;
@@ -242,6 +246,8 @@ class WXDLLIMPEXP_NET wxWebSession
 
     void Close();
 
+    bool EnablePersistentStorage(bool enable = true);
+
     wxWebSessionHandle GetNativeHandle() const;
 
 private:

diff --git a/include/wx-3.3/wx/webview.h b/include/wx-3.3/wx/webview.h
@@ -155,6 +155,7 @@ class WXDLLIMPEXP_WEBVIEW wxWebViewConfiguration
     void* GetNativeConfiguration() const;
     void SetDataPath(const wxString& path);
     wxString GetDataPath() const;
+    bool EnablePersistentStorage(bool enable);
 
     const wxString& GetBackend() const { return m_backend; }
 

diff --git a/lib/libwx_baseu-3.3.a b/lib/libwx_baseu-3.3.a
diff --git a/lib/libwx_baseu_net-3.3.a b/lib/libwx_baseu_net-3.3.a
diff --git a/lib/libwx_baseu_xml-3.3.a b/lib/libwx_baseu_xml-3.3.a
diff --git a/lib/libwx_osx_cocoau_adv-3.3.a b/lib/libwx_osx_cocoau_adv-3.3.a
diff --git a/lib/libwx_osx_cocoau_aui-3.3.a b/lib/libwx_osx_cocoau_aui-3.3.a
diff --git a/lib/libwx_osx_cocoau_core-3.3.a b/lib/libwx_osx_cocoau_core-3.3.a
diff --git a/lib/libwx_osx_cocoau_gl-3.3.a b/lib/libwx_osx_cocoau_gl-3.3.a
diff --git a/lib/libwx_osx_cocoau_html-3.3.a b/lib/libwx_osx_cocoau_html-3.3.a
diff --git a/lib/libwx_osx_cocoau_propgrid-3.3.a b/lib/libwx_osx_cocoau_propgrid-3.3.a
diff --git a/lib/libwx_osx_cocoau_qa-3.3.a b/lib/libwx_osx_cocoau_qa-3.3.a
diff --git a/lib/libwx_osx_cocoau_richtext-3.3.a b/lib/libwx_osx_cocoau_richtext-3.3.a
diff --git a/lib/libwx_osx_cocoau_webview-3.3.a b/lib/libwx_osx_cocoau_webview-3.3.a
diff --git a/lib/libwxexpat-3.3.a b/lib/libwxexpat-3.3.a
diff --git a/lib/libwxjpeg-3.3.a b/lib/libwxjpeg-3.3.a
diff --git a/lib/libwxpng-3.3.a b/lib/libwxpng-3.3.a
diff --git a/lib/libwxregexu-3.3.a b/lib/libwxregexu-3.3.a
diff --git a/lib/libwxzlib-3.3.a b/lib/libwxzlib-3.3.a
diff --git a/libdbg/libwx_baseu-3.3.0.0.0.dylib b/libdbg/libwx_baseu-3.3.0.0.0.dylib
diff --git a/libdbg/libwx_baseu_net-3.3.0.0.0.dylib b/libdbg/libwx_baseu_net-3.3.0.0.0.dylib
diff --git a/libdbg/libwx_baseu_xml-3.3.0.0.0.dylib b/libdbg/libwx_baseu_xml-3.3.0.0.0.dylib
diff --git a/libdbg/libwx_osx_cocoau_adv-3.3.0.0.0.dylib b/libdbg/libwx_osx_cocoau_adv-3.3.0.0.0.dylib
diff --git a/libdbg/libwx_osx_cocoau_aui-3.3.0.0.0.dylib b/libdbg/libwx_osx_cocoau_aui-3.3.0.0.0.dylib