From 7352a2879c242cc32fa134082ba031919b779e95 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 30 Aug 2020 22:03:47 +0200
Subject: [PATCH] Rename Qt-specific GetEventType() to start with "Qt" prefix

This avoids conflicts with another method with the same name defined in
generic wxGenericFileDirButton, which must neither override nor hide
this method of wxButton.
---
 include/wx/qt/anybutton.h | 2 +-
 include/wx/qt/button.h    | 2 +-
 include/wx/qt/tglbtn.h    | 2 +-
 src/qt/anybutton.cpp      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/wx/qt/anybutton.h b/include/wx/qt/anybutton.h
index 85a8bb9cbe..23f409c8bd 100644
--- a/include/wx/qt/anybutton.h
+++ b/include/wx/qt/anybutton.h
@@ -29,7 +29,7 @@ public:
 
     // implementation only
     void QtUpdateState();
-    virtual int GetEventType() const = 0;
+    virtual int QtGetEventType() const = 0;
 
 protected:
     virtual wxBitmap DoGetBitmap(State state) const wxOVERRIDE;
diff --git a/include/wx/qt/button.h b/include/wx/qt/button.h
index 06cfb10876..efc17c646d 100644
--- a/include/wx/qt/button.h
+++ b/include/wx/qt/button.h
@@ -32,7 +32,7 @@ public:
    virtual wxWindow *SetDefault() wxOVERRIDE;
 
     // implementation only
-    virtual int GetEventType() const wxOVERRIDE { return wxEVT_BUTTON; }
+    virtual int QtGetEventType() const wxOVERRIDE { return wxEVT_BUTTON; }
 
 private:
     wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxButton);
diff --git a/include/wx/qt/tglbtn.h b/include/wx/qt/tglbtn.h
index 3d1d7a64d0..936669425a 100644
--- a/include/wx/qt/tglbtn.h
+++ b/include/wx/qt/tglbtn.h
@@ -36,7 +36,7 @@ public:
     virtual bool GetValue() const wxOVERRIDE;
 
     // implementation only
-    virtual int GetEventType() const wxOVERRIDE { return wxEVT_TOGGLEBUTTON; }
+    virtual int QtGetEventType() const wxOVERRIDE { return wxEVT_TOGGLEBUTTON; }
 
 private:
     wxDECLARE_DYNAMIC_CLASS(wxToggleButton);
diff --git a/src/qt/anybutton.cpp b/src/qt/anybutton.cpp
index 5c6f880c6b..6a5f142b4f 100644
--- a/src/qt/anybutton.cpp
+++ b/src/qt/anybutton.cpp
@@ -45,7 +45,7 @@ void wxQtPushButton::clicked(bool checked)
     wxAnyButton *handler = GetHandler();
     if ( handler )
     {
-        wxCommandEvent event( handler->GetEventType(), handler->GetId() );
+        wxCommandEvent event( handler->QtGetEventType(), handler->GetId() );
         if ( isCheckable() ) // toggle buttons
         {
             event.SetInt(checked);