Fix implementation details being used as base class for RTTI in wxQT
This commit is contained in:
parent
538cdc0841
commit
00030b56cb
@ -15,7 +15,7 @@
|
||||
#include <QtCore/QStringList>
|
||||
#include <QtWidgets/QApplication>
|
||||
|
||||
wxIMPLEMENT_DYNAMIC_CLASS(wxApp, wxAppBase);
|
||||
wxIMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler);
|
||||
|
||||
wxApp::wxApp()
|
||||
{
|
||||
|
@ -15,7 +15,7 @@
|
||||
|
||||
#include <QtGui/QBrush>
|
||||
|
||||
wxIMPLEMENT_DYNAMIC_CLASS(wxBrush,wxBrushBase);
|
||||
wxIMPLEMENT_DYNAMIC_CLASS(wxBrush,wxGDIObject);
|
||||
|
||||
static Qt::BrushStyle ConvertBrushStyle(wxBrushStyle style)
|
||||
{
|
||||
|
@ -61,7 +61,7 @@ wxWindowDCImpl::~wxWindowDCImpl()
|
||||
|
||||
//##############################################################################
|
||||
|
||||
wxIMPLEMENT_CLASS(wxClientDCImpl,wxQtDCImpl);
|
||||
wxIMPLEMENT_CLASS(wxClientDCImpl,wxWindowDCImpl);
|
||||
|
||||
wxClientDCImpl::wxClientDCImpl( wxDC *owner )
|
||||
: wxWindowDCImpl( owner )
|
||||
@ -121,7 +121,7 @@ wxClientDCImpl::~wxClientDCImpl()
|
||||
|
||||
//##############################################################################
|
||||
|
||||
wxIMPLEMENT_CLASS(wxPaintDCImpl,wxQtDCImpl);
|
||||
wxIMPLEMENT_CLASS(wxPaintDCImpl,wxClientDCImpl);
|
||||
|
||||
wxPaintDCImpl::wxPaintDCImpl( wxDC *owner )
|
||||
: wxWindowDCImpl( owner )
|
||||
|
@ -16,7 +16,7 @@
|
||||
#include <QtWidgets/QApplication>
|
||||
#include <QtGui/QPixmap>
|
||||
|
||||
wxIMPLEMENT_ABSTRACT_CLASS(wxScreenDCImpl, wxWindowDCImpl);
|
||||
wxIMPLEMENT_ABSTRACT_CLASS(wxScreenDCImpl, wxQtDCImpl);
|
||||
|
||||
wxScreenDCImpl::wxScreenDCImpl( wxScreenDC *owner )
|
||||
: wxWindowDCImpl( owner )
|
||||
|
@ -111,7 +111,7 @@ wxMessageDialog::wxMessageDialog( wxWindow *parent, const wxString& message,
|
||||
PostCreation();
|
||||
}
|
||||
|
||||
wxIMPLEMENT_CLASS(wxMessageDialog,wxMessageDialogBase);
|
||||
wxIMPLEMENT_CLASS(wxMessageDialog,wxDialog);
|
||||
|
||||
int wxMessageDialog::ShowModal()
|
||||
{
|
||||
|
@ -10,7 +10,7 @@
|
||||
|
||||
#include "wx/palette.h"
|
||||
|
||||
wxIMPLEMENT_DYNAMIC_CLASS(wxPalette,wxPaletteBase)
|
||||
wxIMPLEMENT_DYNAMIC_CLASS(wxPalette,wxGDIObject)
|
||||
|
||||
wxPalette::wxPalette()
|
||||
{
|
||||
|
@ -13,7 +13,7 @@
|
||||
#include "wx/qt/private/utils.h"
|
||||
#include <QtGui/QPen>
|
||||
|
||||
wxIMPLEMENT_DYNAMIC_CLASS(wxPen,wxPenBase);
|
||||
wxIMPLEMENT_DYNAMIC_CLASS(wxPen,wxGDIObject);
|
||||
|
||||
static Qt::PenStyle ConvertPenStyle(wxPenStyle style)
|
||||
{
|
||||
|
@ -53,7 +53,7 @@ class wxRegionRefData: public wxGDIRefData
|
||||
|
||||
#define M_REGIONDATA ((wxRegionRefData *)m_refData)->m_qtRegion
|
||||
|
||||
wxIMPLEMENT_DYNAMIC_CLASS(wxRegion,wxRegionBase);
|
||||
wxIMPLEMENT_DYNAMIC_CLASS(wxRegion,wxGDIObject);
|
||||
|
||||
wxRegion::wxRegion()
|
||||
{
|
||||
|
@ -54,7 +54,7 @@ void wxQtToggleButton::clicked( bool checked )
|
||||
|
||||
wxDEFINE_EVENT( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEvent );
|
||||
|
||||
wxIMPLEMENT_DYNAMIC_CLASS(wxBitmapToggleButton, wxToggleButtonBase);
|
||||
wxIMPLEMENT_DYNAMIC_CLASS(wxBitmapToggleButton, wxToggleButton);
|
||||
|
||||
wxBitmapToggleButton::wxBitmapToggleButton()
|
||||
{
|
||||
@ -103,7 +103,7 @@ QWidget *wxBitmapToggleButton::GetHandle() const
|
||||
|
||||
//##############################################################################
|
||||
|
||||
wxIMPLEMENT_DYNAMIC_CLASS(wxToggleButton, wxToggleButtonBase);
|
||||
wxIMPLEMENT_DYNAMIC_CLASS(wxToggleButton, wxControl);
|
||||
|
||||
wxToggleButton::wxToggleButton()
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user