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);