Merge branch 'ci-stop-using-ubuntu-18.04'

Don't use Ubuntu 18.04 and its flaky PPAs for the CI builds any more.

See #26758.

.github/workflows/ci.yml

@@ -78,27 +78,19 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - name: Ubuntu 18.04 wxGTK 2
-            runner: ubuntu-latest
-            container: ubuntu:18.04
+          - name: Ubuntu 26.04 wxGTK 2
+            runner: ubuntu-26.04
             gtk_version: 2
             use_xvfb: true
-          - name: Ubuntu 18.04 wxGTK UTF-8
-            runner: ubuntu-latest
-            container: ubuntu:18.04
+          - name: Ubuntu 26.04 wxGTK UTF-8
+            runner: ubuntu-26.04
             configure_flags: --enable-utf8 --enable-utf8only --enable-monolithic
             use_xvfb: true
-          - name: Ubuntu 18.04 wxGTK 3 static with gcc 4.8
-            runner: ubuntu-latest
-            compiler: g++-4.8
-            container: ubuntu:18.04
-            configure_flags: --disable-shared
-            allow_extra_warnings: true
-            use_xvfb: true
-          - name: Ubuntu 18.04 wxGTK 3 compatible 3.0
-            runner: ubuntu-latest
-            container: ubuntu:18.04
-            configure_flags: --enable-compat30 --enable-pch
+          - name: Ubuntu 20.04 wxGTK gcc 7 static compatible 3.0
+            runner: ubuntu-26.04
+            container: ubuntu:20.04
+            compiler: g++-7
+            configure_flags: --enable-compat30 --enable-pch --disable-shared
             use_xvfb: true
           - name: Ubuntu 20.04 wxGTK 3 with clang
             runner: ubuntu-latest
@@ -127,20 +119,18 @@ jobs:
             use_ubsan: true
             use_xvfb: true
             build_out_of_tree_samples: true
-          - name: Ubuntu 18.04 wxX11
-            runner: ubuntu-latest
-            container: ubuntu:18.04
+          - name: Ubuntu 26.04 wxX11
+            runner: ubuntu-26.04
             configure_flags: --with-x11 --disable-stc
             skip_samples: true
-          - name: Ubuntu 18.04 wxDFB
-            runner: ubuntu-latest
-            container: ubuntu:18.04
+          - name: Ubuntu 24.04 wxDFB
+            # This is the latest Ubuntu version that still has DirectFB in its repositories.
+            runner: ubuntu-24.04
             configure_flags: --with-directfb --disable-stc
             skip_samples: true
             allow_warnings: true
-          - name: Ubuntu 18.04 wxQt
-            runner: ubuntu-latest
-            container: ubuntu:18.04
+          - name: Ubuntu 26.04 wxQt
+            runner: ubuntu-26.04
             configure_flags: --with-qt --without-opengl
             skip_samples: true
             use_xvfb: true
@@ -159,16 +149,6 @@ jobs:
             ubuntu:*)
               export DEBIAN_FRONTEND=noninteractive
 
-              if [ '${{ matrix.container }}' = 'ubuntu:18.04' ]; then
-                # First get the package containing /usr/bin/apt-add-repository.
-                apt-get update -qq
-                apt-get install -qq software-properties-common
-
-                # Git 2.17 in the official repository is too old to checkout
-                # submodules using it, so get a newer version.
-                apt-add-repository ppa:git-core/ppa
-              fi
-
               compiler=${{ matrix.compiler }}
               case "$compiler" in
                 clang++*)
@@ -194,22 +174,6 @@ jobs:
               #   - xvfb is used for running the GUI tests.
               apt-get update -qq
               apt-get install -qq coreutils ${compiler_packages} git make pkg-config sudo xvfb
-
-              # Checkout action doesn't work under Ubuntu 18.04 any more, so
-              # run checkout manually.
-              git config --global --add safe.directory $GITHUB_WORKSPACE
-              git config --global gc.auto 0
-              git init $GITHUB_WORKSPACE
-              cd $GITHUB_WORKSPACE
-              git remote add origin $GITHUB_SERVER_URL/$GITHUB_REPOSITORY
-              git fetch --depth=1 origin $GITHUB_REF
-              git checkout FETCH_HEAD
-              git submodule update --init --depth=1 --recursive
-              git log -1 --format='%H'
-
-              # We can't easily install Go either, so skip the tests requiring
-              # httpbin.
-              echo WX_TEST_WEBREQUEST_URL=0 >> $GITHUB_ENV
               ;;
 
             '')
@@ -221,13 +185,11 @@ jobs:
           esac
 
       - name: Checkout
-        if: matrix.container != 'ubuntu:18.04'
         uses: actions/checkout@v6
         with:
           submodules: 'recursive'
 
       - name: Install CCache
-        if: matrix.container != 'ubuntu:18.04'
         uses: hendrikmuhs/ccache-action@v1.2.23
         with:
           key: ${{ matrix.name }}
@@ -370,7 +332,6 @@ jobs:
         if: ${{ github.event_name == 'workflow_dispatch' && inputs.debug_tests }}
 
       - name: Setup Go
-        if: matrix.container != 'ubuntu:18.04'
         uses: actions/setup-go@v6
         with:
           go-version: '1'

include/wx/bmpbuttn.h

@@ -98,17 +98,17 @@ protected:
     // function called when any of the bitmaps changes
     virtual void OnSetBitmap() { InvalidateBestSize(); Refresh(); }
 
-    virtual wxBitmap DoGetBitmap(State which) const
+    virtual wxBitmap DoGetBitmap(State which) const override
         { return m_bitmaps[which].GetBitmap(wxDefaultSize); }
-    virtual void DoSetBitmap(const wxBitmapBundle& bitmap, State which)
+    virtual void DoSetBitmap(const wxBitmapBundle& bitmap, State which) override
         { m_bitmaps[which] = bitmap; OnSetBitmap(); }
 
-    virtual wxSize DoGetBitmapMargins() const
+    virtual wxSize DoGetBitmapMargins() const override
     {
         return wxSize(m_marginX, m_marginY);
     }
 
-    virtual void DoSetBitmapMargins(int x, int y)
+    virtual void DoSetBitmapMargins(int x, int y) override
     {
         m_marginX = x;
         m_marginY = y;

include/wx/evtloop.h

@@ -316,9 +316,9 @@ public:
     wxGUIEventLoop() { m_impl = nullptr; }
     virtual ~wxGUIEventLoop();
 
-    virtual bool Pending() const;
-    virtual bool Dispatch();
-    virtual int DispatchTimeout(unsigned long timeout)
+    virtual bool Pending() const override;
+    virtual bool Dispatch() override;
+    virtual int DispatchTimeout(unsigned long timeout) override
     {
         // TODO: this is, of course, horribly inefficient and a proper wait with
         //       timeout should be implemented for all ports natively...
@@ -332,12 +332,12 @@ public:
                 return -1;
         }
     }
-    virtual void WakeUp() { }
+    virtual void WakeUp() override { }
 
 protected:
-    virtual int DoRun();
-    virtual void DoStop(int rc);
-    virtual void DoYieldFor(long eventsToProcess);
+    virtual int DoRun() override;
+    virtual void DoStop(int rc) override;
+    virtual void DoYieldFor(long eventsToProcess) override;
 
     // the pointer to the port specific implementation class
     wxEventLoopImpl *m_impl;

include/wx/generic/combo.h

@@ -75,7 +75,7 @@ public:
     // we have our own input handler and our own actions
     virtual bool PerformAction(const wxControlAction& action,
                                long numArg = 0l,
-                               const wxString& strArg = wxEmptyString);
+                               const wxString& strArg = wxEmptyString) override;
 #endif
 
 protected:

include/wx/generic/mdig.h

@@ -68,13 +68,13 @@ public:
     // implement base class pure virtuals
     static bool IsTDI() { return true; }
 
-    virtual void ActivateNext() { AdvanceActive(true); }
-    virtual void ActivatePrevious() { AdvanceActive(false); }
+    virtual void ActivateNext() override { AdvanceActive(true); }
+    virtual void ActivatePrevious() override { AdvanceActive(false); }
 
 #if wxUSE_MENUS
-    virtual void SetWindowMenu(wxMenu* pMenu);
+    virtual void SetWindowMenu(wxMenu* pMenu) override;
 
-    virtual void SetMenuBar(wxMenuBar *pMenuBar);
+    virtual void SetMenuBar(wxMenuBar *pMenuBar) override;
 #endif // wxUSE_MENUS
 
     virtual wxGenericMDIClientWindow *OnCreateGenericClient();
@@ -109,7 +109,7 @@ private:
     void OnWindowMenu(wxCommandEvent& event);
 #endif // wxUSE_MENUS
 
-    virtual bool ProcessEvent(wxEvent& event);
+    virtual bool ProcessEvent(wxEvent& event) override;
 
     void OnClose(wxCloseEvent& event);
 
@@ -160,18 +160,18 @@ public:
     virtual ~wxGenericMDIChildFrame();
 
     // implement MDI operations
-    virtual void Activate();
+    virtual void Activate() override;
 
 
 #if wxUSE_MENUS
-    virtual void SetMenuBar( wxMenuBar *menu_bar );
-    virtual wxMenuBar *GetMenuBar() const;
+    virtual void SetMenuBar( wxMenuBar *menu_bar ) override;
+    virtual wxMenuBar *GetMenuBar() const override;
 #endif // wxUSE_MENUS
 
-    virtual wxString GetTitle() const { return m_title; }
-    virtual void SetTitle(const wxString& title);
+    virtual wxString GetTitle() const override { return m_title; }
+    virtual void SetTitle(const wxString& title) override;
 
-    virtual bool TryAfter(wxEvent& event);
+    virtual bool TryAfter(wxEvent& event) override;
 
     // implementation only from now on
 
@@ -226,7 +226,7 @@ public:
     // window creation by overriding it in the derived classes)
     virtual bool CreateGenericClient(wxWindow *parent);
     virtual bool CreateClient(wxMDIParentFrame *parent,
-                              long WXUNUSED(style) = wxVSCROLL | wxHSCROLL)
+                              long WXUNUSED(style) = wxVSCROLL | wxHSCROLL) override
     {
         return CreateGenericClient(parent);
     }

include/wx/gtk/app.h

@@ -46,13 +46,11 @@ public:
     // GTK-specific methods
     // -------------------
 
-#ifndef __WXGTK3__
     // this can be overridden to return a specific visual to be used for GTK+
     // instead of the default one (it's used by wxGLApp)
     //
     // must return XVisualInfo pointer (it is not freed by caller)
     virtual void *GetXVisualInfo() { return nullptr; }
-#endif // GTK < 3
 
     // Check if we're using a global menu. Currently this is only true when
     // running under Ubuntu Unity and global menu is not disabled.

include/wx/popupwin.h

@@ -229,7 +229,7 @@ public:
 
 protected:
     // notify the combo here
-    virtual void OnDismiss();
+    virtual void OnDismiss() override;
 
     // forward the key presses to the combobox
     void OnKeyDown(wxKeyEvent& event);

include/wx/radiobut.h

@@ -26,8 +26,12 @@ class WXDLLIMPEXP_FWD_CORE wxRadioButton;
     #include "wx/checkbox.h"
 
     typedef wxCheckBox wxRadioButtonBaseBase;
+
+    #define wxOVERRIDE_CHECKBOX override
 #else
     typedef wxControl wxRadioButtonBaseBase;
+
+    #define wxOVERRIDE_CHECKBOX
 #endif
 
 class WXDLLIMPEXP_CORE wxRadioButtonBase : public wxRadioButtonBaseBase
@@ -36,8 +40,8 @@ public:
     wxRadioButtonBase() = default;
 
     // Methods to be implemented by the derived classes:
-    virtual void SetValue(bool value) = 0;
-    virtual bool GetValue() const = 0;
+    virtual void SetValue(bool value) wxOVERRIDE_CHECKBOX = 0;
+    virtual bool GetValue() const wxOVERRIDE_CHECKBOX = 0;
 
 
     // Methods implemented by this class itself.

include/wx/univ/tglbtn.h

@@ -46,8 +46,8 @@ public:
     virtual void Click() override;
 
     // Get/set the value
-    void SetValue(bool state);
-    bool GetValue() const { return m_value; }
+    void SetValue(bool state) override;
+    bool GetValue() const override { return m_value; }
 
 protected:
     virtual wxBorder GetDefaultBorder() const override { return wxBORDER_NONE; }

include/wx/univ/theme.h

@@ -87,11 +87,11 @@ public:
     wxDelegateTheme(const wxString& theme);
     virtual ~wxDelegateTheme();
 
-    virtual wxRenderer *GetRenderer();
-    virtual wxArtProvider *GetArtProvider();
+    virtual wxRenderer *GetRenderer() override;
+    virtual wxArtProvider *GetArtProvider() override;
     virtual wxInputHandler *GetInputHandler(const wxString& control,
-                                            wxInputConsumer *consumer);
-    virtual wxColourScheme *GetColourScheme();
+                                            wxInputConsumer *consumer) override;
+    virtual wxColourScheme *GetColourScheme() override;
 
 protected:
     // gets or creates theme and sets m_theme to point to it,

include/wx/unix/glcanvas.h

@@ -114,7 +114,7 @@ public:
 
     virtual bool InitGLVisual(const int *attribList) override;
 
-    virtual void* GetXVisualInfo();
+    virtual void* GetXVisualInfo() override;
 
     // and override this wxApp method to clean up
     virtual int OnExit() override;

include/wx/vlbox.h

@@ -92,7 +92,7 @@ public:
     // is this item the current one?
     bool IsCurrent(size_t item) const { return item == (size_t)m_current; }
     #ifdef __WXUNIVERSAL__
-    bool IsCurrent() const { return wxVScrolledCanvas::IsCurrent(); }
+    using wxVScrolledCanvas::IsCurrent;
     #endif
 
     // get current item

include/wx/x11/app.h

@@ -41,9 +41,9 @@ public:
     // override base class (pure) virtuals
     // -----------------------------------
 
-    virtual void WakeUpIdle();
+    virtual void WakeUpIdle() override;
 
-    virtual bool OnInitGui();
+    virtual bool OnInitGui() override;
 
     // implementation from now on
     // --------------------------
@@ -53,8 +53,8 @@ public:
 
 public:
     // Implementation
-    virtual bool Initialize(int& argc, wxChar **argv);
-    virtual void CleanUp();
+    virtual bool Initialize(int& argc, wxChar **argv) override;
+    virtual void CleanUp() override;
 
     WXWindow       GetTopLevelWidget() const { return m_topLevelWidget; }
     WXColormap     GetMainColormap(WXDisplay* display);

include/wx/x11/bitmap.h

@@ -76,29 +76,29 @@ public:
     // create the wxBitmap using a _copy_ of the pixmap
     bool Create(WXPixmap pixmap);
 
-    int GetHeight() const;
-    int GetWidth() const;
-    int GetDepth() const;
+    int GetHeight() const override;
+    int GetWidth() const override;
+    int GetDepth() const override;
 
 #if wxUSE_IMAGE
     wxBitmap( const wxImage& image, int depth = -1, double WXUNUSED(scale) = 1.0 ) { (void)CreateFromImage(image, depth); }
     wxBitmap( const wxImage& image, const wxDC& WXUNUSED(dc) ) { (void)CreateFromImage(image); }
-    wxImage ConvertToImage() const;
+    wxImage ConvertToImage() const override;
     bool CreateFromImage(const wxImage& image, int depth = -1);
 #endif // wxUSE_IMAGE
 
-    wxMask *GetMask() const;
-    void SetMask( wxMask *mask );
+    wxMask *GetMask() const override;
+    void SetMask( wxMask *mask ) override;
 
-    wxBitmap GetSubBitmap( const wxRect& rect ) const;
+    wxBitmap GetSubBitmap( const wxRect& rect ) const override;
 
-    bool SaveFile( const wxString &name, wxBitmapType type, const wxPalette *palette = nullptr ) const;
-    bool LoadFile( const wxString &name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE );
+    bool SaveFile( const wxString &name, wxBitmapType type, const wxPalette *palette = nullptr ) const override;
+    bool LoadFile( const wxString &name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE ) override;
 
-    wxPalette *GetPalette() const;
+    wxPalette *GetPalette() const override;
     wxPalette *GetColourMap() const
         { return GetPalette(); }
-    virtual void SetPalette(const wxPalette& palette);
+    virtual void SetPalette(const wxPalette& palette) override;
 
     // implementation
     // --------------
@@ -120,11 +120,11 @@ public:
 
     // This is provided only for compatibility with the other ports, there is
     // no alpha support in X11 bitmaps.
-    bool HasAlpha() const { return false; }
+    bool HasAlpha() const override { return false; }
 
 protected:
-    virtual wxGDIRefData *CreateGDIRefData() const;
-    wxNODISCARD virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
+    virtual wxGDIRefData *CreateGDIRefData() const override;
+    wxNODISCARD virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const override;
 
 private:
     wxDECLARE_DYNAMIC_CLASS(wxBitmap);

include/wx/x11/brush.h

@@ -35,14 +35,14 @@ public:
     bool operator==(const wxBrush& brush) const;
     bool operator!=(const wxBrush& brush) const { return !(*this == brush); }
 
-    wxBrushStyle GetStyle() const;
-    wxColour GetColour() const;
-    wxBitmap *GetStipple() const;
+    wxBrushStyle GetStyle() const override;
+    wxColour GetColour() const override;
+    wxBitmap *GetStipple() const override;
 
-    void SetColour( const wxColour& col );
-    void SetColour( unsigned char r, unsigned char g, unsigned char b );
-    void SetStyle( wxBrushStyle style );
-    void SetStipple( const wxBitmap& stipple );
+    void SetColour( const wxColour& col ) override;
+    void SetColour( unsigned char r, unsigned char g, unsigned char b ) override;
+    void SetStyle( wxBrushStyle style ) override;
+    void SetStipple( const wxBitmap& stipple ) override;
 
 
     wxDEPRECATED_MSG("use wxBRUSHSTYLE_XXX constants")
@@ -52,8 +52,8 @@ public:
     void SetStyle(int style) { SetStyle((wxBrushStyle)style); }
 
 protected:
-    virtual wxGDIRefData *CreateGDIRefData() const;
-    wxNODISCARD virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
+    virtual wxGDIRefData *CreateGDIRefData() const override;
+    wxNODISCARD virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const override;
 
     wxDECLARE_DYNAMIC_CLASS(wxBrush);
 };

include/wx/x11/clipbrd.h

@@ -29,28 +29,28 @@ public:
     virtual ~wxClipboard();
 
     // open the clipboard before SetData() and GetData()
-    virtual bool Open();
+    virtual bool Open() override;
 
     // close the clipboard after SetData() and GetData()
-    virtual void Close();
+    virtual void Close() override;
 
     // query whether the clipboard is opened
-    virtual bool IsOpened() const;
+    virtual bool IsOpened() const override;
 
     // set the clipboard data. all other formats will be deleted.
-    virtual bool SetData( wxDataObject *data );
+    virtual bool SetData( wxDataObject *data ) override;
 
     // add to the clipboard data.
-    virtual bool AddData( wxDataObject *data );
+    virtual bool AddData( wxDataObject *data ) override;
 
     // ask if data in correct format is available
-    virtual bool IsSupported( const wxDataFormat& format );
+    virtual bool IsSupported( const wxDataFormat& format ) override;
 
     // fill data with data on the clipboard (if available)
-    virtual bool GetData( wxDataObject& data );
+    virtual bool GetData( wxDataObject& data ) override;
 
     // clears wxTheClipboard and the system's clipboard if possible
-    virtual void Clear();
+    virtual void Clear() override;
 
     // implementation from now on
     bool              m_open;

include/wx/x11/colour.h

@@ -39,9 +39,9 @@ public:
     bool operator==(const wxColourImpl& col) const;
     bool operator!=(const wxColourImpl& col) const { return !(*this == col); }
 
-    unsigned char Red() const;
-    unsigned char Green() const;
-    unsigned char Blue() const;
+    unsigned char Red() const override;
+    unsigned char Green() const override;
+    unsigned char Blue() const override;
 
     // Implementation part
 
@@ -50,13 +50,13 @@ public:
     WXColor *GetColor() const;
 
 protected:
-    virtual wxGDIRefData *CreateGDIRefData() const;
-    wxNODISCARD virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
+    virtual wxGDIRefData *CreateGDIRefData() const override;
+    wxNODISCARD virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const override;
 
     virtual void
-    InitRGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a);
+    InitRGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a) override;
 
-    virtual bool FromString(const wxString& str);
+    virtual bool FromString(const wxString& str) override;
 };
 
 #endif // _WX_COLOUR_H_

include/wx/x11/cursor.h

@@ -44,8 +44,8 @@ public:
 protected:
     void InitFromStock(wxStockCursor);
 
-    virtual wxGDIRefData *CreateGDIRefData() const;
-    wxNODISCARD virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
+    virtual wxGDIRefData *CreateGDIRefData() const override;
+    wxNODISCARD virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const override;
 
 private:
     wxDECLARE_DYNAMIC_CLASS(wxCursor);

include/wx/x11/dataobj2.h

@@ -25,24 +25,24 @@ public:
     virtual ~wxBitmapDataObject();
 
     // override base class virtual to update PNG data too
-    virtual void SetBitmap(const wxBitmap& bitmap);
+    virtual void SetBitmap(const wxBitmap& bitmap) override;
 
     // implement base class pure virtuals
     // ----------------------------------
 
-    virtual size_t GetDataSize() const { return m_pngSize; }
-    virtual bool GetDataHere(void *buf) const;
-    virtual bool SetData(size_t len, const void *buf);
+    virtual size_t GetDataSize() const override { return m_pngSize; }
+    virtual bool GetDataHere(void *buf) const override;
+    virtual bool SetData(size_t len, const void *buf) override;
     // Must provide overloads to avoid hiding them (and warnings about it)
-    virtual size_t GetDataSize(const wxDataFormat&) const
+    virtual size_t GetDataSize(const wxDataFormat&) const override
     {
         return GetDataSize();
     }
-    virtual bool GetDataHere(const wxDataFormat&, void *buf) const
+    virtual bool GetDataHere(const wxDataFormat&, void *buf) const override
     {
         return GetDataHere(buf);
     }
-    virtual bool SetData(const wxDataFormat&, size_t len, const void *buf)
+    virtual bool SetData(const wxDataFormat&, size_t len, const void *buf) override
     {
         return SetData(len, buf);
     }
@@ -70,19 +70,19 @@ public:
 
     void AddFile( const wxString &filename );
 
-    virtual size_t GetDataSize() const;
-    virtual bool GetDataHere(void *buf) const;
-    virtual bool SetData(size_t len, const void *buf);
+    virtual size_t GetDataSize() const override;
+    virtual bool GetDataHere(void *buf) const override;
+    virtual bool SetData(size_t len, const void *buf) override;
     // Must provide overloads to avoid hiding them (and warnings about it)
-    virtual size_t GetDataSize(const wxDataFormat&) const
+    virtual size_t GetDataSize(const wxDataFormat&) const override
     {
         return GetDataSize();
     }
-    virtual bool GetDataHere(const wxDataFormat&, void *buf) const
+    virtual bool GetDataHere(const wxDataFormat&, void *buf) const override
     {
         return GetDataHere(buf);
     }
-    virtual bool SetData(const wxDataFormat&, size_t len, const void *buf)
+    virtual bool SetData(const wxDataFormat&, size_t len, const void *buf) override
     {
         return SetData(len, buf);
     }

include/wx/x11/font.h

@@ -78,25 +78,25 @@ public:
     // bool Create(const wxNativeFontInfo& fontinfo);
 
     // implement base class pure virtuals
-    virtual double GetFractionalPointSize() const;
-    virtual wxFontStyle GetStyle() const;
-    virtual int GetNumericWeight() const;
-    virtual bool GetUnderlined() const;
+    virtual double GetFractionalPointSize() const override;
+    virtual wxFontStyle GetStyle() const override;
+    virtual int GetNumericWeight() const override;
+    virtual bool GetUnderlined() const override;
     virtual bool GetStrikethrough() const override;
-    virtual wxString GetFaceName() const;
-    virtual wxFontEncoding GetEncoding() const;
-    virtual const wxNativeFontInfo *GetNativeFontInfo() const;
+    virtual wxString GetFaceName() const override;
+    virtual wxFontEncoding GetEncoding() const override;
+    virtual const wxNativeFontInfo *GetNativeFontInfo() const override;
 
-    virtual bool IsFixedWidth() const;
+    virtual bool IsFixedWidth() const override;
 
-    virtual void SetFractionalPointSize(double pointSize);
-    virtual void SetFamily(wxFontFamily family);
-    virtual void SetStyle(wxFontStyle style);
-    virtual void SetNumericWeight(int weight);
-    virtual bool SetFaceName(const wxString& faceName);
-    virtual void SetUnderlined(bool underlined);
+    virtual void SetFractionalPointSize(double pointSize) override;
+    virtual void SetFamily(wxFontFamily family) override;
+    virtual void SetStyle(wxFontStyle style) override;
+    virtual void SetNumericWeight(int weight) override;
+    virtual bool SetFaceName(const wxString& faceName) override;
+    virtual void SetUnderlined(bool underlined) override;
     virtual void SetStrikethrough(bool strikethrough) override;
-    virtual void SetEncoding(wxFontEncoding encoding);
+    virtual void SetEncoding(wxFontEncoding encoding) override;
 
     wxDECLARE_COMMON_FONT_METHODS();
 
@@ -122,11 +122,11 @@ public:
     bool SetPangoAttrs(PangoLayout* layout) const;
 
 protected:
-    virtual wxGDIRefData *CreateGDIRefData() const;
-    wxNODISCARD virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
+    virtual wxGDIRefData *CreateGDIRefData() const override;
+    wxNODISCARD virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const override;
 
-    virtual void DoSetNativeFontInfo( const wxNativeFontInfo& info );
-    virtual wxFontFamily DoGetFamily() const;
+    virtual void DoSetNativeFontInfo( const wxNativeFontInfo& info ) override;
+    virtual wxFontFamily DoGetFamily() const override;
 
     void Unshare();
 

include/wx/x11/glcanvas.h

@@ -58,10 +58,10 @@ public:
     // implement wxGLCanvasUnix methods
     // --------------------------------
 
-    virtual unsigned long GetXWindow() const;
+    virtual unsigned long GetXWindow() const override;
 
 protected:
-    virtual int GetColourIndex(const wxColour& col);
+    virtual int GetColourIndex(const wxColour& col) override;
 
     wxDECLARE_CLASS(wxGLCanvas);
 };

include/wx/x11/palette.h

@@ -66,8 +66,8 @@ public:
     virtual int GetColoursCount() const override;
 
 protected:
-    virtual wxGDIRefData *CreateGDIRefData() const;
-    wxNODISCARD virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
+    virtual wxGDIRefData *CreateGDIRefData() const override;
+    wxNODISCARD virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const override;
 };
 
 #endif // _WX_PALETTE_H_

include/wx/x11/pen.h

@@ -41,24 +41,24 @@ public:
     bool operator == ( const wxPen& pen ) const;
     bool operator != (const wxPen& pen) const { return !(*this == pen); }
 
-    void SetColour( const wxColour &colour );
-    void SetColour( unsigned char red, unsigned char green, unsigned char blue );
-    void SetCap( wxPenCap capStyle );
-    void SetJoin( wxPenJoin joinStyle );
-    void SetStyle( wxPenStyle style );
-    void SetWidth( int width );
-    void SetDashes( int number_of_dashes, const wxDash *dash );
-    void SetStipple( const wxBitmap& stipple );
+    void SetColour( const wxColour &colour ) override;
+    void SetColour( unsigned char red, unsigned char green, unsigned char blue ) override;
+    void SetCap( wxPenCap capStyle ) override;
+    void SetJoin( wxPenJoin joinStyle ) override;
+    void SetStyle( wxPenStyle style ) override;
+    void SetWidth( int width ) override;
+    void SetDashes( int number_of_dashes, const wxDash *dash ) override;
+    void SetStipple( const wxBitmap& stipple ) override;
 
-    wxColour GetColour() const;
-    wxPenCap GetCap() const;
-    wxPenJoin GetJoin() const;
-    wxPenStyle GetStyle() const;
-    int GetWidth() const;
-    int GetDashes(wxDash **ptr) const;
+    wxColour GetColour() const override;
+    wxPenCap GetCap() const override;
+    wxPenJoin GetJoin() const override;
+    wxPenStyle GetStyle() const override;
+    int GetWidth() const override;
+    int GetDashes(wxDash **ptr) const override;
     int GetDashCount() const;
     wxDash* GetDash() const;
-    wxBitmap* GetStipple() const;
+    wxBitmap* GetStipple() const override;
 
 
     wxDEPRECATED_MSG("use wxPENSTYLE_XXX constants")
@@ -67,8 +67,8 @@ public:
     void SetStyle(int style) { SetStyle((wxPenStyle)style); }
 
 protected:
-    virtual wxGDIRefData *CreateGDIRefData() const;
-    wxNODISCARD virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
+    virtual wxGDIRefData *CreateGDIRefData() const override;
+    wxNODISCARD virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const override;
 
     wxDECLARE_DYNAMIC_CLASS(wxPen);
 };

include/wx/x11/popupwin.h

@@ -29,13 +29,13 @@ public:
 
     bool Create(wxWindow *parent, int flags = wxBORDER_NONE);
 
-    virtual bool Show( bool show = TRUE );
+    virtual bool Show( bool show = TRUE ) override;
 
 protected:
-    virtual void DoMoveWindow(int x, int y, int width, int height);
+    virtual void DoMoveWindow(int x, int y, int width, int height) override;
     virtual void DoSetSize(int x, int y,
                            int width, int height,
-                           int sizeFlags = wxSIZE_AUTO);
+                           int sizeFlags = wxSIZE_AUTO) override;
 
 private:
     wxDECLARE_EVENT_TABLE();

include/wx/x11/region.h

@@ -52,28 +52,28 @@ public:
     virtual ~wxRegion();
 
     // wxRegionBase methods
-    virtual void Clear();
-    virtual bool IsEmpty() const;
+    virtual void Clear() override;
+    virtual bool IsEmpty() const override;
 
 public:
     WXRegion *GetX11Region() const;
 
 protected:
-    virtual wxGDIRefData *CreateGDIRefData() const;
-    wxNODISCARD virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
+    virtual wxGDIRefData *CreateGDIRefData() const override;
+    wxNODISCARD virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const override;
 
     // wxRegionBase pure virtuals
-    virtual bool DoIsEqual(const wxRegion& region) const;
-    virtual bool DoGetBox(wxCoord& x, wxCoord& y, wxCoord& w, wxCoord& h) const;
-    virtual wxRegionContain DoContainsPoint(wxCoord x, wxCoord y) const;
-    virtual wxRegionContain DoContainsRect(const wxRect& rect) const;
+    virtual bool DoIsEqual(const wxRegion& region) const override;
+    virtual bool DoGetBox(wxCoord& x, wxCoord& y, wxCoord& w, wxCoord& h) const override;
+    virtual wxRegionContain DoContainsPoint(wxCoord x, wxCoord y) const override;
+    virtual wxRegionContain DoContainsRect(const wxRect& rect) const override;
 
-    virtual bool DoOffset(wxCoord x, wxCoord y);
-    virtual bool DoUnionWithRect(const wxRect& rect);
-    virtual bool DoUnionWithRegion(const wxRegion& region);
-    virtual bool DoIntersect(const wxRegion& region);
-    virtual bool DoSubtract(const wxRegion& region);
-    virtual bool DoXor(const wxRegion& region);
+    virtual bool DoOffset(wxCoord x, wxCoord y) override;
+    virtual bool DoUnionWithRect(const wxRect& rect) override;
+    virtual bool DoUnionWithRegion(const wxRegion& region) override;
+    virtual bool DoIntersect(const wxRegion& region) override;
+    virtual bool DoSubtract(const wxRegion& region) override;
+    virtual bool DoXor(const wxRegion& region) override;
 
     // common part of ctors for a rectangle region
     void InitRect(wxCoord x, wxCoord y, wxCoord w, wxCoord h);

include/wx/x11/toplevel.h

@@ -44,20 +44,20 @@ public:
     virtual ~wxTopLevelWindowX11();
 
     // implement base class pure virtuals
-    virtual void Maximize(bool maximize = true);
-    virtual bool IsMaximized() const;
-    virtual void Iconize(bool iconize = true);
-    virtual bool IsIconized() const;
-    virtual void SetIcons(const wxIconBundle& icons);
-    virtual void Restore();
+    virtual void Maximize(bool maximize = true) override;
+    virtual bool IsMaximized() const override;
+    virtual void Iconize(bool iconize = true) override;
+    virtual bool IsIconized() const override;
+    virtual void SetIcons(const wxIconBundle& icons) override;
+    virtual void Restore() override;
 
-    virtual bool Show( bool show = true );
+    virtual bool Show( bool show = true ) override;
 
-    virtual bool ShowFullScreen( bool show, long style = wxFULLSCREEN_ALL );
-    virtual bool IsFullScreen() const { return m_fsIsShowing; }
+    virtual bool ShowFullScreen( bool show, long style = wxFULLSCREEN_ALL ) override;
+    virtual bool IsFullScreen() const override { return m_fsIsShowing; }
 
-    virtual void SetTitle( const wxString& title);
-    virtual wxString GetTitle() const;
+    virtual void SetTitle( const wxString& title) override;
+    virtual wxString GetTitle() const override;
 
     // implementation
     void SetNeedResizeInIdle( bool set = true )
@@ -69,9 +69,9 @@ public:
 
     // For implementation purposes - sometimes decorations make the
     // client area smaller
-    virtual wxPoint GetClientAreaOrigin() const;
+    virtual wxPoint GetClientAreaOrigin() const override;
 
-    virtual void OnInternalIdle();
+    virtual void OnInternalIdle() override;
 
 protected:
     // common part of all ctors
@@ -83,13 +83,13 @@ protected:
     // For implementation of delayed resize events
     bool m_needResizeInIdle;
 
-    virtual void DoGetClientSize( int *width, int *height ) const;
-    virtual void DoGetSize( int *width, int *height ) const;
-    virtual void DoSetClientSize(int width, int height);
+    virtual void DoGetClientSize( int *width, int *height ) const override;
+    virtual void DoGetSize( int *width, int *height ) const override;
+    virtual void DoSetClientSize(int width, int height) override;
     virtual void DoSetSize(int x, int y,
         int width, int height,
-        int sizeFlags = wxSIZE_AUTO);
-    virtual void DoGetPosition( int *x, int *y ) const;
+        int sizeFlags = wxSIZE_AUTO) override;
+    virtual void DoGetPosition( int *x, int *y ) const override;
 
     // Is the frame currently iconized?
     bool m_iconized;

include/wx/x11/window.h

@@ -44,44 +44,45 @@ public:
         long style = 0,
         const wxString& name = wxASCII_STR(wxPanelNameStr));
 
-    virtual void Raise();
-    virtual void Lower();
+    virtual void Raise() override;
+    virtual void Lower() override;
 
     // SetLabel(), which does nothing in wxWindow
     virtual void SetLabel(const wxString& label) override { m_Label = label; }
     virtual wxString GetLabel() const override            { return m_Label; }
 
-    virtual bool Show( bool show = true );
-    virtual bool Enable( bool enable = true );
+    virtual bool Show( bool show = true ) override;
+    virtual bool Enable( bool enable = true ) override;
 
-    virtual void SetFocus();
+    virtual void SetFocus() override;
 
-    virtual void WarpPointer(int x, int y);
+    virtual void WarpPointer(int x, int y) override;
 
     virtual void Refresh( bool eraseBackground = true,
-                          const wxRect *rect = nullptr );
-    virtual void Update();
+                          const wxRect *rect = nullptr ) override;
+    virtual void Update() override;
 
-    virtual bool SetBackgroundColour( const wxColour &colour );
-    virtual bool SetForegroundColour( const wxColour &colour );
+    virtual bool SetBackgroundColour( const wxColour &colour ) override;
+    virtual bool SetForegroundColour( const wxColour &colour ) override;
 
-    virtual bool SetCursor( const wxCursor &cursor );
-    virtual bool SetFont( const wxFont &font );
+    virtual bool SetCursor( const wxCursor &cursor ) override;
+    virtual bool SetFont( const wxFont &font ) override;
 
-    virtual int GetCharHeight() const;
-    virtual int GetCharWidth() const;
+    virtual int GetCharHeight() const override;
+    virtual int GetCharWidth() const override;
 
-    virtual void ScrollWindow( int dx, int dy, const wxRect* rect = nullptr );
+    virtual void ScrollWindow( int dx, int dy,
+                               const wxRect* rect = nullptr ) override;
 
 #if wxUSE_DRAG_AND_DROP
-    virtual void SetDropTarget( wxDropTarget *dropTarget );
-#endif // wxUSE_DRAG_AND_DROP
+    virtual void SetDropTarget( wxDropTarget *dropTarget ) override;
 
     // Accept files for dragging
-    virtual void DragAcceptFiles(bool accept);
+    virtual void DragAcceptFiles(bool accept) override;
+#endif // wxUSE_DRAG_AND_DROP
 
     // Get the unique identifier of a window
-    virtual WXWindow GetHandle() const { return X11GetMainWindow(); }
+    virtual WXWindow GetHandle() const override { return X11GetMainWindow(); }
 
     // implementation from now on
     // --------------------------
@@ -135,7 +136,7 @@ public:
     // I don't want users to override what's done in idle so everything that
     // has to be done in idle time in order for wxX11 to work is done in
     // OnInternalIdle
-    virtual void OnInternalIdle();
+    virtual void OnInternalIdle() override;
 
 protected:
     // Responds to colour changes: passes event on to children.
@@ -161,23 +162,22 @@ protected:
                                  int *x, int *y,
                                  int *descent = nullptr,
                                  int *externalLeading = nullptr,
-                                 const wxFont *font = nullptr) const;
-    virtual void DoClientToScreen( int *x, int *y ) const;
-    virtual void DoScreenToClient( int *x, int *y ) const;
-    virtual void DoGetPosition( int *x, int *y ) const;
-    virtual void DoGetSize( int *width, int *height ) const;
-    virtual void DoGetClientSize( int *width, int *height ) const;
+                                 const wxFont *font = nullptr) const override;
+    virtual void DoClientToScreen( int *x, int *y ) const override;
+    virtual void DoScreenToClient( int *x, int *y ) const override;
+    virtual void DoGetPosition( int *x, int *y ) const override;
+    virtual void DoGetSize( int *width, int *height ) const override;
+    virtual void DoGetClientSize( int *width, int *height ) const override;
     virtual void DoSetSize(int x, int y,
         int width, int height,
-        int sizeFlags = wxSIZE_AUTO);
-    virtual void DoSetClientSize(int width, int height);
-    virtual void DoMoveWindow(int x, int y, int width, int height);
+        int sizeFlags = wxSIZE_AUTO) override;
+    virtual void DoSetClientSize(int width, int height) override;
+    virtual void DoMoveWindow(int x, int y, int width, int height) override;
     virtual void DoSetSizeHints(int minW, int minH,
         int maxW, int maxH,
-        int incW, int incH);
-    virtual void DoCaptureMouse();
-    virtual void DoReleaseMouse();
-    virtual void KillFocus();
+        int incW, int incH) override;
+    virtual void DoCaptureMouse() override;
+    virtual void DoReleaseMouse() override;
 
 #if wxUSE_TOOLTIPS
     virtual void DoSetToolTip( wxToolTip *tip );
@@ -187,6 +187,8 @@ private:
     // common part of all ctors
     void Init();
 
+    void KillFocus();
+
     wxString m_Label;
 
     wxDECLARE_DYNAMIC_CLASS(wxWindowX11);

src/x11/window.cpp

@@ -773,14 +773,14 @@ void wxWindowX11::SetDropTarget(wxDropTarget * WXUNUSED(pDropTarget))
     // TODO
 }
 
-#endif
-
 // Old style file-manager drag&drop
 void wxWindowX11::DragAcceptFiles(bool WXUNUSED(accept))
 {
     // TODO
 }
 
+#endif
+
 // ----------------------------------------------------------------------------
 // tooltips
 // ----------------------------------------------------------------------------

tests/allheaders.cpp

@@ -321,6 +321,11 @@
     GCC_TURN_OFF(suggest-override)
 #endif
 
+    // There are just too many of those in wxDFB headers.
+#if defined(__WXDFB__)
+    GCC_TURN_OFF(suggest-override)
+#endif
+
     // The rest are the warnings that we don't ever want to enable.
 
     // This one is given whenever inheriting from std:: classes without using

tests/controls/listboxtest.cpp

@@ -109,26 +109,26 @@ void ListBoxTestCase::Sort()
 
     m_list->Append(testitems);
 
-#ifndef __WXQT__
-    CPPUNIT_ASSERT_EQUAL("AAA", m_list->GetString(0));
-    CPPUNIT_ASSERT_EQUAL("Aaa", m_list->GetString(1));
-    CPPUNIT_ASSERT_EQUAL("aaa", m_list->GetString(2));
-    CPPUNIT_ASSERT_EQUAL("aaab", m_list->GetString(3));
-    CPPUNIT_ASSERT_EQUAL("aab", m_list->GetString(4));
-    CPPUNIT_ASSERT_EQUAL("aba", m_list->GetString(5));
-#else
+#if defined(__WXQT__) && defined(__WINDOWS__)
     CPPUNIT_ASSERT_EQUAL("aaa", m_list->GetString(0));
     CPPUNIT_ASSERT_EQUAL("Aaa", m_list->GetString(1));
     CPPUNIT_ASSERT_EQUAL("AAA", m_list->GetString(2));
     CPPUNIT_ASSERT_EQUAL("aaab", m_list->GetString(3));
     CPPUNIT_ASSERT_EQUAL("aab", m_list->GetString(4));
     CPPUNIT_ASSERT_EQUAL("aba", m_list->GetString(5));
-#endif
 
     m_list->Append("a", wxUIntToPtr(1));
 
     CPPUNIT_ASSERT_EQUAL("a", m_list->GetString(0));
     CPPUNIT_ASSERT_EQUAL(wxUIntToPtr(1), m_list->GetClientData(0));
+#else
+    CPPUNIT_ASSERT_EQUAL("AAA", m_list->GetString(0));
+    CPPUNIT_ASSERT_EQUAL("Aaa", m_list->GetString(1));
+    CPPUNIT_ASSERT_EQUAL("aaa", m_list->GetString(2));
+    CPPUNIT_ASSERT_EQUAL("aaab", m_list->GetString(3));
+    CPPUNIT_ASSERT_EQUAL("aab", m_list->GetString(4));
+    CPPUNIT_ASSERT_EQUAL("aba", m_list->GetString(5));
+#endif
 #endif
 }