Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename Qt-specific GetEventType() to start with "Qt" prefix

Browse Source 
This avoids conflicts with another method with the same name defined in
generic wxGenericFileDirButton, which must neither override nor hide
this method of wxButton.
This commit is contained in:
Vadim Zeitlin
2020-08-30 22:03:47 +02:00
parent 9f63592eba
commit 7352a2879c
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/qt/anybutton.h
View File

@@ -29,7 +29,7 @@ public:
// implementation only // implementation only
void QtUpdateState(); void QtUpdateState();
virtual int GetEventType() const = 0; virtual int QtGetEventType() const = 0;
protected: protected:
virtual wxBitmap DoGetBitmap(State state) const wxOVERRIDE; virtual wxBitmap DoGetBitmap(State state) const wxOVERRIDE;

2
include/wx/qt/button.h
View File

@@ -32,7 +32,7 @@ public:
virtual wxWindow *SetDefault() wxOVERRIDE; virtual wxWindow *SetDefault() wxOVERRIDE;
// implementation only // implementation only
virtual int GetEventType() const wxOVERRIDE { return wxEVT_BUTTON; } virtual int QtGetEventType() const wxOVERRIDE { return wxEVT_BUTTON; }
private: private:
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxButton); wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxButton);

2
include/wx/qt/tglbtn.h
View File

@@ -36,7 +36,7 @@ public:
virtual bool GetValue() const wxOVERRIDE; virtual bool GetValue() const wxOVERRIDE;
// implementation only // implementation only
virtual int GetEventType() const wxOVERRIDE { return wxEVT_TOGGLEBUTTON; } virtual int QtGetEventType() const wxOVERRIDE { return wxEVT_TOGGLEBUTTON; }
private: private:
wxDECLARE_DYNAMIC_CLASS(wxToggleButton); wxDECLARE_DYNAMIC_CLASS(wxToggleButton);

2
src/qt/anybutton.cpp
View File

@@ -45,7 +45,7 @@ void wxQtPushButton::clicked(bool checked)
wxAnyButton *handler = GetHandler(); wxAnyButton *handler = GetHandler();
if ( handler ) if ( handler )
{ {
wxCommandEvent event( handler->GetEventType(), handler->GetId() ); wxCommandEvent event( handler->QtGetEventType(), handler->GetId() );
if ( isCheckable() ) // toggle buttons if ( isCheckable() ) // toggle buttons
{ {
event.SetInt(checked); event.SetInt(checked);