AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix implementation details being used as base class for RTTI in wxQT

Browse Source
This commit is contained in:
Graham Dawes 2019-01-07 09:18:50 +00:00
parent 538cdc0841
commit 00030b56cb
9 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/qt/app.cpp
View File

@ -15,7 +15,7 @@
#include <QtCore/QStringList> #include <QtCore/QStringList>
#include <QtWidgets/QApplication> #include <QtWidgets/QApplication>
wxIMPLEMENT_DYNAMIC_CLASS(wxApp, wxAppBase); wxIMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler);
wxApp::wxApp() wxApp::wxApp()
{ {

2
src/qt/brush.cpp
View File

@ -15,7 +15,7 @@
#include <QtGui/QBrush> #include <QtGui/QBrush>
wxIMPLEMENT_DYNAMIC_CLASS(wxBrush,wxBrushBase); wxIMPLEMENT_DYNAMIC_CLASS(wxBrush,wxGDIObject);
static Qt::BrushStyle ConvertBrushStyle(wxBrushStyle style) static Qt::BrushStyle ConvertBrushStyle(wxBrushStyle style)
{ {

4
src/qt/dcclient.cpp
View File

@ -61,7 +61,7 @@ wxWindowDCImpl::~wxWindowDCImpl()
//############################################################################## //##############################################################################
wxIMPLEMENT_CLASS(wxClientDCImpl,wxQtDCImpl); wxIMPLEMENT_CLASS(wxClientDCImpl,wxWindowDCImpl);
wxClientDCImpl::wxClientDCImpl( wxDC *owner ) wxClientDCImpl::wxClientDCImpl( wxDC *owner )
: wxWindowDCImpl( owner ) : wxWindowDCImpl( owner )
@ -121,7 +121,7 @@ wxClientDCImpl::~wxClientDCImpl()
//############################################################################## //##############################################################################
wxIMPLEMENT_CLASS(wxPaintDCImpl,wxQtDCImpl); wxIMPLEMENT_CLASS(wxPaintDCImpl,wxClientDCImpl);
wxPaintDCImpl::wxPaintDCImpl( wxDC *owner ) wxPaintDCImpl::wxPaintDCImpl( wxDC *owner )
: wxWindowDCImpl( owner ) : wxWindowDCImpl( owner )

2
src/qt/dcscreen.cpp
View File

@ -16,7 +16,7 @@
#include <QtWidgets/QApplication> #include <QtWidgets/QApplication>
#include <QtGui/QPixmap> #include <QtGui/QPixmap>
wxIMPLEMENT_ABSTRACT_CLASS(wxScreenDCImpl, wxWindowDCImpl); wxIMPLEMENT_ABSTRACT_CLASS(wxScreenDCImpl, wxQtDCImpl);
wxScreenDCImpl::wxScreenDCImpl( wxScreenDC *owner ) wxScreenDCImpl::wxScreenDCImpl( wxScreenDC *owner )
: wxWindowDCImpl( owner ) : wxWindowDCImpl( owner )

2
src/qt/msgdlg.cpp
View File

@ -111,7 +111,7 @@ wxMessageDialog::wxMessageDialog( wxWindow *parent, const wxString& message,
PostCreation(); PostCreation();
} }
wxIMPLEMENT_CLASS(wxMessageDialog,wxMessageDialogBase); wxIMPLEMENT_CLASS(wxMessageDialog,wxDialog);
int wxMessageDialog::ShowModal() int wxMessageDialog::ShowModal()
{ {

2
src/qt/palette.cpp
View File

@ -10,7 +10,7 @@
#include "wx/palette.h" #include "wx/palette.h"
wxIMPLEMENT_DYNAMIC_CLASS(wxPalette,wxPaletteBase) wxIMPLEMENT_DYNAMIC_CLASS(wxPalette,wxGDIObject)
wxPalette::wxPalette() wxPalette::wxPalette()
{ {

2
src/qt/pen.cpp
View File

@ -13,7 +13,7 @@
#include "wx/qt/private/utils.h" #include "wx/qt/private/utils.h"
#include <QtGui/QPen> #include <QtGui/QPen>
wxIMPLEMENT_DYNAMIC_CLASS(wxPen,wxPenBase); wxIMPLEMENT_DYNAMIC_CLASS(wxPen,wxGDIObject);
static Qt::PenStyle ConvertPenStyle(wxPenStyle style) static Qt::PenStyle ConvertPenStyle(wxPenStyle style)
{ {

2
src/qt/region.cpp
View File

@ -53,7 +53,7 @@ class wxRegionRefData: public wxGDIRefData
#define M_REGIONDATA ((wxRegionRefData *)m_refData)->m_qtRegion #define M_REGIONDATA ((wxRegionRefData *)m_refData)->m_qtRegion
wxIMPLEMENT_DYNAMIC_CLASS(wxRegion,wxRegionBase); wxIMPLEMENT_DYNAMIC_CLASS(wxRegion,wxGDIObject);
wxRegion::wxRegion() wxRegion::wxRegion()
{ {

4
src/qt/tglbtn.cpp
View File

@ -54,7 +54,7 @@ void wxQtToggleButton::clicked( bool checked )
wxDEFINE_EVENT( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEvent ); wxDEFINE_EVENT( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEvent );
wxIMPLEMENT_DYNAMIC_CLASS(wxBitmapToggleButton, wxToggleButtonBase); wxIMPLEMENT_DYNAMIC_CLASS(wxBitmapToggleButton, wxToggleButton);
wxBitmapToggleButton::wxBitmapToggleButton() wxBitmapToggleButton::wxBitmapToggleButton()
{ {
@ -103,7 +103,7 @@ QWidget *wxBitmapToggleButton::GetHandle() const
//############################################################################## //##############################################################################
wxIMPLEMENT_DYNAMIC_CLASS(wxToggleButton, wxToggleButtonBase); wxIMPLEMENT_DYNAMIC_CLASS(wxToggleButton, wxControl);
wxToggleButton::wxToggleButton() wxToggleButton::wxToggleButton()
{ {