Updating wxWidgets to 3.1.4

- Changed some default values for the simulator default
config.

Author: Danny Glover

platform/linux/Rtt_LinuxContext.cpp

@@ -880,11 +880,11 @@ void SolarFrame::CreateMenus()
 			fMenuMain->Append(fileMenu, _T("&File"));
 
 			// view menu
-			fViewMenu = new wxMenu();
-			fZoomIn = fViewMenu->Append(ID_MENU_ZOOM_IN, _T("&Zoom In \tCtrl-KP_ADD"));
-			fZoomOut = fViewMenu->Append(ID_MENU_ZOOM_OUT, _T("&Zoom Out \tCtrl-KP_Subtract"));
-			fViewMenu->AppendSeparator();
-			fMenuMain->Append(fViewMenu, _T("&View"));
+			//fViewMenu = new wxMenu();
+			//fZoomIn = fViewMenu->Append(ID_MENU_ZOOM_IN, _T("&Zoom In \tCtrl-KP_ADD"));
+			//fZoomOut = fViewMenu->Append(ID_MENU_ZOOM_OUT, _T("&Zoom Out \tCtrl-KP_Subtract"));
+			//fViewMenu->AppendSeparator();
+			//fMenuMain->Append(fViewMenu, _T("&View"));
 
 			// about menu
 			wxMenu *helpMenu = new wxMenu();
@@ -1202,7 +1202,6 @@ void SolarFrame::OnFileSystemEvent(wxFileSystemWatcherEvent &event)
 				wxCommandEvent ev(eventRelaunchProject);
 				wxPostEvent(wxGetApp().GetFrame(), ev);
 			}
-
 			break;
 		}
 
@@ -1565,10 +1564,7 @@ SolarGLCanvas::~SolarGLCanvas()
 	if (fGLContext)
 	{
 		SetCurrent(*fGLContext);
-	}
 
-	if (fGLContext)
-	{
 		delete fGLContext;
 		fGLContext = NULL;
 	}

platform/linux/Rtt_LinuxSimulatorView.cpp

@@ -62,13 +62,13 @@ namespace Rtt
 	LinuxPreferencesDialog::RelaunchType LinuxSimulatorView::Config::relaunchOnFileChange = LinuxPreferencesDialog::RelaunchType::Always;
 	int LinuxSimulatorView::Config::windowXPos = 10;
 	int LinuxSimulatorView::Config::windowYPos = 10;
-	int LinuxSimulatorView::Config::skinID = 6246;
+	int LinuxSimulatorView::Config::skinID = 6223;
 	int LinuxSimulatorView::Config::skinWidth = 320;
 	int LinuxSimulatorView::Config::skinHeight = 480;
 	int LinuxSimulatorView::Config::zoomedWidth = LinuxSimulatorView::Config::skinWidth;
 	int LinuxSimulatorView::Config::zoomedHeight = LinuxSimulatorView::Config::skinHeight;
-	int LinuxSimulatorView::Config::welcomeScreenZoomedWidth = 640;
-	int LinuxSimulatorView::Config::welcomeScreenZoomedHeight = 480;
+	int LinuxSimulatorView::Config::welcomeScreenZoomedWidth = 960;
+	int LinuxSimulatorView::Config::welcomeScreenZoomedHeight = 720;
 	wxConfig *LinuxSimulatorView::Config::configFile;
 	std::map<int, LinuxSimulatorView::SkinProperties> LinuxSimulatorView::fSkins;
 

platform/linux/wx/include/wx/addremovectrl.h

@@ -66,7 +66,7 @@ class WXDLLIMPEXP_CORE wxAddRemoveCtrl : public wxPanel
                     const wxPoint& pos = wxDefaultPosition,
                     const wxSize& size = wxDefaultSize,
                     long style = 0,
-                    const wxString& name = wxAddRemoveCtrlNameStr)
+                    const wxString& name = wxASCII_STR(wxAddRemoveCtrlNameStr))
     {
         Init();
 
@@ -78,7 +78,7 @@ class WXDLLIMPEXP_CORE wxAddRemoveCtrl : public wxPanel
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
-                const wxString& name = wxAddRemoveCtrlNameStr);
+                const wxString& name = wxASCII_STR(wxAddRemoveCtrlNameStr));
 
     virtual ~wxAddRemoveCtrl();
 

platform/linux/wx/include/wx/affinematrix2dbase.h

@@ -44,7 +44,7 @@ class WXDLLIMPEXP_CORE wxAffineMatrix2DBase
     // sets the matrix to the respective values
     virtual void Set(const wxMatrix2D& mat2D, const wxPoint2DDouble& tr) = 0;
 
-    // gets the component valuess of the matrix
+    // gets the component values of the matrix
     virtual void Get(wxMatrix2D* mat2D, wxPoint2DDouble* tr) const = 0;
 
     // concatenates the matrix

platform/linux/wx/include/wx/android/setup.h

@@ -183,17 +183,14 @@
 // Unicode support
 // ----------------------------------------------------------------------------
 
-// These settings are obsolete: the library is always built in Unicode mode
+// This option is deprecated: the library should be always built in Unicode mode
 // now, only set wxUSE_UNICODE to 0 to compile legacy code in ANSI mode if
 // absolutely necessary -- updating it is strongly recommended as the ANSI mode
 // will disappear completely in future wxWidgets releases.
 #ifndef wxUSE_UNICODE
     #define wxUSE_UNICODE 1
 #endif
 
-// wxUSE_WCHAR_T is required by wxWidgets now, don't change.
-#define wxUSE_WCHAR_T 1
-
 // ----------------------------------------------------------------------------
 // global features
 // ----------------------------------------------------------------------------
@@ -762,6 +759,13 @@
 #define wxUSE_WEBVIEW_IE 0
 #endif
 
+// Use the Edge (Chromium) wxWebView backend (Requires WebView2 SDK)
+//
+// Default is 0 because WebView2 is not always available, set it to 1 if you do have it.
+//
+// Recommended setting: 1 when building for Windows with WebView2 SDK
+#define wxUSE_WEBVIEW_EDGE 0
+
 // Use the WebKit wxWebView backend
 //
 // Default is 1 on GTK and OSX
@@ -910,6 +914,14 @@
 #define wxUSE_TREECTRL      1   // wxTreeCtrl
 #define wxUSE_TREELISTCTRL  1   // wxTreeListCtrl
 
+// Use generic version of wxDataViewCtrl even if a native one is available?
+//
+// Default is 1.
+//
+// Recommended setting: 1, but can be set to 0 if your program is affected by
+// the native control limitations.
+#define wxUSE_NATIVE_DATAVIEWCTRL 1
+
 // Use a status bar class? Depending on the value of wxUSE_NATIVE_STATUSBAR
 // below either wxStatusBar95 or a generic wxStatusBar will be used.
 //
@@ -1117,13 +1129,20 @@
 // depends on it)
 #define wxUSE_INFOBAR       1
 
-// Use wxMenu, wxMenuBar, wxMenuItem.
+// Use wxMenu, wxMenuItem.
 //
 // Default is 1.
 //
 // Recommended setting: 1 (can't be disabled under MSW)
 #define wxUSE_MENUS         1
 
+// Use wxMenuBar.
+//
+// Default is 1.
+//
+// Recommended setting: 1 (can't be disabled under MSW)
+#define wxUSE_MENUBAR       1
+
 // Use wxNotificationMessage.
 //
 // wxNotificationMessage allows to show non-intrusive messages to the user
@@ -1547,7 +1566,6 @@
 #define wxUSE_THEME_MONO    0
 #define wxUSE_THEME_WIN32   0
 
-
 /* --- end common options --- */
 
 /* --- start MSW options --- */

platform/linux/wx/include/wx/anidecod.h

@@ -53,11 +53,12 @@ class WXDLLIMPEXP_CORE wxANIDecoder : public wxAnimationDecoder
     wxAnimationType GetType() const wxOVERRIDE
         { return wxANIMATION_TYPE_ANI; }
 
-private:
+protected:
     // wxAnimationDecoder pure virtual:
     virtual bool DoCanRead( wxInputStream& stream ) const wxOVERRIDE;
             // modifies current stream position (see wxAnimationDecoder::CanRead)
 
+private:
     // frames stored as wxImage(s): ANI files are meant to be used mostly for animated
     // cursors and thus they do not use any optimization to encode differences between
     // two frames: they are just a list of images to display sequentially.

platform/linux/wx/include/wx/animate.h

@@ -21,38 +21,63 @@
 #include "wx/bitmap.h"
 
 class WXDLLIMPEXP_FWD_CORE wxAnimation;
+class wxAnimationImpl;
 
 extern WXDLLIMPEXP_DATA_CORE(wxAnimation) wxNullAnimation;
 extern WXDLLIMPEXP_DATA_CORE(const char) wxAnimationCtrlNameStr[];
 
+WX_DECLARE_LIST_WITH_DECL(wxAnimationDecoder, wxAnimationDecoderList, class WXDLLIMPEXP_CORE);
 
 // ----------------------------------------------------------------------------
-// wxAnimationBase
+// wxAnimation
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxAnimationBase : public wxObject
+class WXDLLIMPEXP_CORE wxAnimation : public wxObject
 {
 public:
-    wxAnimationBase() {}
+    wxAnimation();
+    explicit wxAnimation(const wxString &name, wxAnimationType type = wxANIMATION_TYPE_ANY);
 
-    virtual bool IsOk() const = 0;
+#ifdef wxHAS_MEMBER_DEFAULT
+    wxAnimation(const wxAnimation&) = default;
+    wxAnimation& operator=(const wxAnimation&) = default;
+#endif
 
-    // can be -1
-    virtual int GetDelay(unsigned int frame) const = 0;
+    bool IsOk() const;
+    bool IsCompatibleWith(wxClassInfo* ci) const;
 
-    virtual unsigned int GetFrameCount() const = 0;
-    virtual wxImage GetFrame(unsigned int frame) const = 0;
-    virtual wxSize GetSize() const = 0;
+    int GetDelay(unsigned int frame) const;
+    unsigned int GetFrameCount() const;
+    wxImage GetFrame(unsigned int frame) const;
+    wxSize GetSize() const;
 
-    virtual bool LoadFile(const wxString& name,
-                          wxAnimationType type = wxANIMATION_TYPE_ANY) = 0;
-    virtual bool Load(wxInputStream& stream,
-                      wxAnimationType type = wxANIMATION_TYPE_ANY) = 0;
+    bool LoadFile(const wxString& name, wxAnimationType type = wxANIMATION_TYPE_ANY);
+    bool Load(wxInputStream& stream, wxAnimationType type = wxANIMATION_TYPE_ANY);
+
+    // Methods for managing the list of decoders
+    static inline wxAnimationDecoderList& GetHandlers() { return sm_handlers; }
+    static void AddHandler(wxAnimationDecoder *handler);
+    static void InsertHandler(wxAnimationDecoder *handler);
+    static const wxAnimationDecoder *FindHandler( wxAnimationType animType );
+
+    static void CleanUpHandlers();
+    static void InitStandardHandlers();
 
 protected:
-    wxDECLARE_ABSTRACT_CLASS(wxAnimationBase);
-};
+    wxAnimationImpl* GetImpl() const;
+
+private:
+    static wxAnimationDecoderList sm_handlers;
+
+    // Ctor used by wxAnimationCtrl::CreateAnimation() only.
+    explicit wxAnimation(wxAnimationImpl* impl);
+
+    // Give it permission to create objects of this class using specific impl
+    // and access our GetImpl().
+    friend class wxAnimationCtrlBase;
 
+    wxDECLARE_DYNAMIC_CLASS(wxAnimation);
+};
 
 
 // ----------------------------------------------------------------------------
@@ -78,7 +103,7 @@ class WXDLLIMPEXP_CORE wxAnimationCtrlBase : public wxControl
                       wxAnimationType type = wxANIMATION_TYPE_ANY) = 0;
 
     virtual void SetAnimation(const wxAnimation &anim) = 0;
-    virtual wxAnimation GetAnimation() const = 0;
+    wxAnimation GetAnimation() const { return m_animation; }
 
     virtual bool Play() = 0;
     virtual void Stop() = 0;
@@ -91,7 +116,23 @@ class WXDLLIMPEXP_CORE wxAnimationCtrlBase : public wxControl
     wxBitmap GetInactiveBitmap() const
         { return m_bmpStatic; }
 
+    wxAnimation CreateAnimation() const
+        { return MakeAnimFromImpl(DoCreateAnimationImpl()); }
+
 protected:
+    virtual wxAnimationImpl* DoCreateAnimationImpl() const = 0;
+
+    // These methods allow derived classes access to private wxAnimation ctor
+    // and wxAnimation::GetImpl(), respectively.
+    static wxAnimation MakeAnimFromImpl(wxAnimationImpl* impl)
+        { return wxAnimation(impl); }
+
+    wxAnimationImpl* GetAnimImpl() const
+        { return m_animation.GetImpl(); }
+
+    // The associated animation, possibly invalid/empty.
+    wxAnimation m_animation;
+
     // the inactive bitmap as it was set by the user
     wxBitmap m_bmpStatic;
 
@@ -104,9 +145,6 @@ class WXDLLIMPEXP_CORE wxAnimationCtrlBase : public wxControl
 
     // called by SetInactiveBitmap
     virtual void DisplayStaticImage() = 0;
-
-private:
-    wxDECLARE_ABSTRACT_CLASS(wxAnimationCtrlBase);
 };
 
 
@@ -116,9 +154,31 @@ class WXDLLIMPEXP_CORE wxAnimationCtrlBase : public wxControl
 
 #if defined(__WXGTK20__) && !defined(__WXUNIVERSAL__)
     #include "wx/gtk/animate.h"
+
+    #define wxHAS_NATIVE_ANIMATIONCTRL
 #else
     #include "wx/generic/animate.h"
-#endif
+
+    class WXDLLIMPEXP_ADV wxAnimationCtrl : public wxGenericAnimationCtrl
+    {
+    public:
+        wxAnimationCtrl()
+            : wxGenericAnimationCtrl()
+            {}
+        wxAnimationCtrl(wxWindow *parent,
+                        wxWindowID id,
+                        const wxAnimation& anim = wxNullAnimation,
+                        const wxPoint& pos = wxDefaultPosition,
+                        const wxSize& size = wxDefaultSize,
+                        long style = wxAC_DEFAULT_STYLE,
+                        const wxString& name = wxASCII_STR(wxAnimationCtrlNameStr))
+            : wxGenericAnimationCtrl(parent, id, anim, pos, size, style, name)
+            {}
+
+    private:
+        wxDECLARE_DYNAMIC_CLASS(wxAnimationCtrl);
+    };
+#endif // defined(__WXGTK20__)
 
 #endif // wxUSE_ANIMATIONCTRL
 

platform/linux/wx/include/wx/any.h

@@ -504,8 +504,10 @@ extern WXDLLIMPEXP_BASE bool wxAnyConvertString(const wxString& value,
                                                 wxAnyValueBuffer& dst);
 
 WX_ANY_DEFINE_CONVERTIBLE_TYPE_BASE(wxString, wxString, wxAnyConvertString)
+#ifndef wxNO_IMPLICIT_WXSTRING_ENCODING
 WX_ANY_DEFINE_CONVERTIBLE_TYPE(const char*, ConstCharPtr,
                                wxAnyConvertString, wxString)
+#endif
 WX_ANY_DEFINE_CONVERTIBLE_TYPE(const wchar_t*, ConstWchar_tPtr,
                                wxAnyConvertString, wxString)
 
@@ -757,11 +759,13 @@ class wxAny
     }
 
     // These two constructors are needed to deal with string literals
+#ifndef wxNO_IMPLICIT_WXSTRING_ENCODING
     wxAny(const char* value)
     {
         m_type = wxAnyValueTypeImpl<const char*>::sm_instance.get();
         wxAnyValueTypeImpl<const char*>::SetValue(value, m_buffer);
     }
+#endif
     wxAny(const wchar_t* value)
     {
         m_type = wxAnyValueTypeImpl<const wchar_t*>::sm_instance.get();
@@ -865,11 +869,13 @@ class wxAny
 #endif
 
     // These two operators are needed to deal with string literals
+#ifndef wxNO_IMPLICIT_WXSTRING_ENCODING
     wxAny& operator=(const char* value)
     {
         Assign(value);
         return *this;
     }
+#endif
     wxAny& operator=(const wchar_t* value)
     {
         Assign(value);
@@ -888,8 +894,10 @@ class wxAny
         return value == value2;
     }
 
+#ifndef wxNO_IMPLICIT_WXSTRING_ENCODING
     bool operator==(const char* value) const
         { return (*this) == wxString(value); }
+#endif // wxNO_IMPLICIT_WXSTRING_ENCODING
     bool operator==(const wchar_t* value) const
         { return (*this) == wxString(value); }
 
@@ -1017,6 +1025,13 @@ class wxAny
 #endif
 
 private:
+#ifdef wxNO_IMPLICIT_WXSTRING_ENCODING
+    wxAny(const char*);  // Disabled
+    wxAny& operator=(const char *&value); // Disabled
+    wxAny& operator=(const char value[]); // Disabled
+    wxAny& operator==(const char *value); // Disabled
+#endif
+
     // Assignment functions
     void AssignAny(const wxAny& any)
     {