Add missing RTTI to some wxQT classes

This commit is contained in:
Graham Dawes 2018-12-21 14:55:33 +00:00
parent 622deec262
commit 538cdc0841
25 changed files with 71 additions and 4 deletions

View File

@ -41,6 +41,9 @@ public:
protected:
virtual wxGDIRefData *CreateGDIRefData() const;
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
private:
wxDECLARE_DYNAMIC_CLASS(wxBrush);
};
#endif // _WX_QT_BRUSH_H_

View File

@ -27,6 +27,8 @@ private:
QColorDialog *GetQColorDialog() const;
wxColourData m_data;
wxDECLARE_DYNAMIC_CLASS(wxColourDialog);
};
#endif // _WX_QT_COLORDLG_H_

View File

@ -129,6 +129,9 @@ private:
QColor *m_qtPenColor;
QColor *m_qtBrushColor;
void ApplyRasterColourOp();
wxDECLARE_CLASS(wxQtDCImpl);
wxDECLARE_NO_COPY_CLASS(wxQtDCImpl);
};

View File

@ -20,6 +20,10 @@ public:
protected:
wxWindow *m_window;
private:
wxDECLARE_CLASS(wxWindowDCImpl);
wxDECLARE_NO_COPY_CLASS(wxWindowDCImpl);
};
@ -30,6 +34,9 @@ public:
wxClientDCImpl( wxDC *owner, wxWindow *win );
~wxClientDCImpl();
private:
wxDECLARE_CLASS(wxClientDCImpl);
wxDECLARE_NO_COPY_CLASS(wxClientDCImpl);
};
@ -38,6 +45,9 @@ class WXDLLIMPEXP_CORE wxPaintDCImpl : public wxWindowDCImpl
public:
wxPaintDCImpl( wxDC *owner );
wxPaintDCImpl( wxDC *owner, wxWindow *win );
private:
wxDECLARE_CLASS(wxPaintDCImpl);
wxDECLARE_NO_COPY_CLASS(wxPaintDCImpl);
};
#endif // _WX_QT_DCCLIENT_H_

View File

@ -26,6 +26,9 @@ public:
private:
wxBitmap m_selected;
DECLARE_CLASS(wxMemoryDCImpl);
DECLARE_NO_COPY_CLASS(wxMemoryDCImpl);
};
#endif // _WX_QT_DCMEMORY_H_

View File

@ -98,9 +98,9 @@ public:
wxCoord xoffset, wxCoord yoffset,
wxPolygonFillMode fillStyle = wxODDEVEN_RULE);
protected:
private:
wxDECLARE_CLASS(wxPrinterDCImpl);
wxDECLARE_NO_COPY_CLASS(wxPrinterDCImpl);
};
#endif // _WX_QT_DCPRINT_H_

View File

@ -65,6 +65,8 @@ public:
const wxString& name = wxFrameNameStr);
virtual void Activate();
wxDECLARE_DYNAMIC_CLASS(wxMDIChildFrame);
};
@ -75,6 +77,7 @@ public:
wxMDIClientWindow();
virtual bool CreateClient(wxMDIParentFrame *parent, long style = wxVSCROLL | wxHSCROLL);
wxDECLARE_DYNAMIC_CLASS(wxMDIClientWindow);
};
#endif // _WX_QT_MDI_H_

View File

@ -23,6 +23,9 @@ public:
// Reimplemented to translate return codes from Qt to wx
virtual int ShowModal();
private:
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxMessageDialog);
};
#endif // _WX_QT_MSGDLG_H_

View File

@ -23,6 +23,9 @@ protected:
virtual wxGDIRefData *CreateGDIRefData() const;
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
private:
wxDECLARE_DYNAMIC_CLASS(wxPalette);
};
#endif // _WX_QT_PALETTE_H_

View File

@ -49,6 +49,9 @@ public:
protected:
virtual wxGDIRefData *CreateGDIRefData() const;
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
private:
wxDECLARE_DYNAMIC_CLASS(wxPen);
};
#endif // _WX_QT_PEN_H_

View File

@ -47,6 +47,9 @@ protected:
virtual bool DoIntersect(const wxRegion& region);
virtual bool DoSubtract(const wxRegion& region);
virtual bool DoXor(const wxRegion& region);
private:
wxDECLARE_DYNAMIC_CLASS(wxRegion);
};
@ -81,6 +84,8 @@ public:
private:
QVector < QRect > *m_qtRects;
int m_pos;
wxDECLARE_DYNAMIC_CLASS(wxRegionIterator);
};
#endif // _WX_QT_REGION_H_

View File

@ -41,8 +41,6 @@ protected:
virtual void DoSetValue(const wxString& value, int flags=0);
virtual wxWindow *GetEditableWindow();
private:
};
#endif // _WX_QT_TEXTENTRY_H_

View File

@ -72,6 +72,7 @@ public:
virtual QWidget *GetHandle() const;
private:
wxDECLARE_DYNAMIC_CLASS(wxToggleButton);
};

View File

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

View File

@ -21,6 +21,8 @@ public:
{ }
};
wxIMPLEMENT_DYNAMIC_CLASS(wxColourDialog,wxDialog)
bool wxColourDialog::Create(wxWindow *parent, wxColourData *data )
{
m_qtWindow = new wxQtColorDialog( parent, this );

View File

@ -43,6 +43,8 @@ static void SetBrushColour( QPainter *qtPainter, QColor col )
qtPainter->setBrush( b );
}
wxIMPLEMENT_CLASS(wxQtDCImpl,wxDCImpl);
wxQtDCImpl::wxQtDCImpl( wxDC *owner )
: wxDCImpl( owner )
{

View File

@ -27,6 +27,8 @@
//##############################################################################
wxIMPLEMENT_CLASS(wxWindowDCImpl,wxQtDCImpl);
wxWindowDCImpl::wxWindowDCImpl( wxDC *owner )
: wxQtDCImpl( owner )
{
@ -59,6 +61,7 @@ wxWindowDCImpl::~wxWindowDCImpl()
//##############################################################################
wxIMPLEMENT_CLASS(wxClientDCImpl,wxQtDCImpl);
wxClientDCImpl::wxClientDCImpl( wxDC *owner )
: wxWindowDCImpl( owner )
@ -118,6 +121,8 @@ wxClientDCImpl::~wxClientDCImpl()
//##############################################################################
wxIMPLEMENT_CLASS(wxPaintDCImpl,wxQtDCImpl);
wxPaintDCImpl::wxPaintDCImpl( wxDC *owner )
: wxWindowDCImpl( owner )
{

View File

@ -13,6 +13,8 @@
#include <QtGui/QPainter>
wxIMPLEMENT_CLASS(wxMemoryDCImpl,wxQtDCImpl);
wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner )
: wxQtDCImpl( owner )
{

View File

@ -11,6 +11,8 @@
#include "wx/dcprint.h"
#include "wx/qt/dcprint.h"
wxIMPLEMENT_CLASS(wxPrinterDCImpl,wxDCImpl)
wxPrinterDCImpl::wxPrinterDCImpl( wxPrinterDC *owner, const wxPrintData & )
: wxDCImpl( owner )
{

View File

@ -88,6 +88,8 @@ void wxMDIParentFrame::ActivatePrevious()
//##############################################################################
wxIMPLEMENT_DYNAMIC_CLASS(wxMDIChildFrame,wxMDIChildFrameBase)
wxMDIChildFrame::wxMDIChildFrame()
{
}
@ -129,6 +131,8 @@ void wxMDIChildFrame::Activate()
//##############################################################################
wxIMPLEMENT_DYNAMIC_CLASS(wxMDIClientWindow,wxMDIClientWindowBase)
wxMDIClientWindow::wxMDIClientWindow()
{
}

View File

@ -111,6 +111,8 @@ wxMessageDialog::wxMessageDialog( wxWindow *parent, const wxString& message,
PostCreation();
}
wxIMPLEMENT_CLASS(wxMessageDialog,wxMessageDialogBase);
int wxMessageDialog::ShowModal()
{
wxCHECK_MSG( m_qtWindow, -1, "Invalid dialog" );

View File

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

View File

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

View File

@ -53,6 +53,8 @@ class wxRegionRefData: public wxGDIRefData
#define M_REGIONDATA ((wxRegionRefData *)m_refData)->m_qtRegion
wxIMPLEMENT_DYNAMIC_CLASS(wxRegion,wxRegionBase);
wxRegion::wxRegion()
{
m_refData = new wxRegionRefData();
@ -255,6 +257,8 @@ const QRegion &wxRegion::GetHandle() const
//##############################################################################
wxIMPLEMENT_DYNAMIC_CLASS(wxRegionIterator,wxObject);
wxRegionIterator::wxRegionIterator()
{
m_qtRects = NULL;

View File

@ -103,6 +103,8 @@ QWidget *wxBitmapToggleButton::GetHandle() const
//##############################################################################
wxIMPLEMENT_DYNAMIC_CLASS(wxToggleButton, wxToggleButtonBase);
wxToggleButton::wxToggleButton()
{
}