Improve build and widget storage

There are no longer any qt headers included in wx/qt headers.
Applications do not need to link with qt librarys anymore, only wxqt libraries.
wxWindow and derived widgets only contain one pointer to their qtwidget, no longer
  carrying both base and derived pointers in parallel as was before.

include/wx/qt/accel.h

@@ -9,9 +9,6 @@
 #ifndef _WX_QT_ACCEL_H_
 #define _WX_QT_ACCEL_H_
 
-#include <QtCore/QList>
-#include <QtWidgets/QShortcut>
-
 /* wxQt accelerators implementation:
  *
  * Storing:
@@ -36,6 +33,9 @@
  * QShortcut. This handler will finally create and send the appropriate wx
  * event to the window. */
 
+class QShortcut;
+template < class T > class QList;
+
 class WXDLLIMPEXP_CORE wxAcceleratorTable : public wxObject
 {
 public:
@@ -43,7 +43,7 @@ public:
     wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]);
 
     // Implementation
-    QList< QShortcut* > ConvertShortcutTable( QWidget *parent ) const;
+    QList < QShortcut* > *ConvertShortcutTable( QWidget *parent ) const;
 
     bool Ok() const { return IsOk(); }
     bool IsOk() const;

include/wx/qt/anybutton.h

@@ -9,7 +9,7 @@
 #ifndef _WX_QT_ANYBUTTON_H_
 #define _WX_QT_ANYBUTTON_H_
 
-#include <QtWidgets/QPushButton>
+class QPushButton;
 
 //-----------------------------------------------------------------------------
 // wxAnyButton
@@ -28,7 +28,7 @@ public:
     virtual void SetLabel( const wxString &label );
     virtual void DoSetBitmap(const wxBitmap& bitmap, State which);
 
-    virtual QPushButton *GetHandle() const;
+    virtual QWidget *GetHandle() const;
 
 protected:
 

include/wx/qt/app.h

@@ -9,8 +9,7 @@
 #ifndef _WX_QT_APP_H_
 #define _WX_QT_APP_H_
 
-#include <QtWidgets/QApplication>
-
+class QApplication;
 class WXDLLIMPEXP_CORE wxApp : public wxAppBase
 {
 public:

include/wx/qt/brush.h

@@ -8,8 +8,6 @@
 #ifndef _WX_QT_BRUSH_H_
 #define _WX_QT_BRUSH_H_
 
-#include <QtCore/Qt>
-
 class QBrush;
 
 class WXDLLIMPEXP_CORE wxBrush : public wxBrushBase

include/wx/qt/calctrl.h

@@ -11,7 +11,7 @@
 #define _WX_QT_CALCTRL_H_
 
 #include "wx/calctrl.h"
-#include <QtWidgets/QCalendarWidget>
+class QCalendarWidget;
 
 class WXDLLIMPEXP_ADV wxCalendarCtrl : public wxCalendarCtrlBase
 {
@@ -70,7 +70,7 @@ public:
 
     using wxCalendarCtrlBase::GenerateAllChangeEvents;
 
-    virtual QCalendarWidget *GetHandle() const;
+    virtual QWidget *GetHandle() const;
 
 protected:
     virtual void RefreshHolidays();

include/wx/qt/checkbox.h

@@ -8,7 +8,7 @@
 #ifndef _WX_QT_CHECKBOX_H_
 #define _WX_QT_CHECKBOX_H_
 
-#include <QtWidgets/QCheckBox>
+class QCheckBox;
 
 class WXDLLIMPEXP_CORE wxCheckBox : public wxCheckBoxBase
 {
@@ -32,7 +32,7 @@ public:
     virtual void SetValue(bool value);
     virtual bool GetValue() const;
 
-    virtual QCheckBox *GetHandle() const;
+    virtual QWidget *GetHandle() const;
 
 protected:
     virtual void DoSet3StateValue(wxCheckBoxState state);

include/wx/qt/choice.h

@@ -8,7 +8,7 @@
 #ifndef _WX_QT_CHOICE_H_
 #define _WX_QT_CHOICE_H_
 
-#include <QtWidgets/QComboBox>
+class QComboBox;
 
 class WXDLLIMPEXP_CORE wxChoice : public wxChoiceBase
 {
@@ -56,7 +56,7 @@ public:
     virtual void SetSelection(int n);
     virtual int GetSelection() const;
 
-    virtual QComboBox *GetHandle() const;
+    virtual QWidget *GetHandle() const;
 
 protected:
     virtual int DoInsertItems(const wxArrayStringsAdapter & items,

include/wx/qt/colordlg.h

@@ -10,7 +10,7 @@
 
 #include "wx/dialog.h"
 
-#include <QtWidgets/QColorDialog>
+class QColorDialog;
 
 class WXDLLIMPEXP_CORE wxColourDialog : public wxDialog
 {
@@ -23,9 +23,8 @@ public:
 
     wxColourData &GetColourData();
 
-    QColorDialog *GetHandle() const { return static_cast<QColorDialog *>(m_qtWindow); }
-
 private:
+    QColorDialog *GetQColorDialog() const;
 
     wxColourData m_data;
 };

include/wx/qt/combobox.h

@@ -9,7 +9,7 @@
 #define _WX_QT_COMBOBOX_H_
 
 #include "wx/choice.h"
-#include <QtWidgets/QComboBox>
+class QComboBox;
 
 class WXDLLIMPEXP_CORE wxComboBox : public wxChoice, public wxTextEntry
 {

include/wx/qt/cursor.h

@@ -10,7 +10,7 @@
 
 #include "wx/image.h"
 
-#include <QtGui/QCursor>
+class QCursor;
 
 class WXDLLIMPEXP_CORE wxCursor : public wxCursorBase
 {
@@ -36,7 +36,8 @@ protected:
     void InitFromImage( const wxImage & image );
 #endif
 
-protected:
+private:
+    void Init();
     virtual wxGDIRefData *CreateGDIRefData() const;
     virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
 

include/wx/qt/dataform.h

@@ -8,6 +8,8 @@
 #ifndef _WX_QT_DATAFORM_H_
 #define _WX_QT_DATAFORM_H_
 
+class QString;
+
 class WXDLLIMPEXP_CORE wxDataFormat
 {
 public:
@@ -33,7 +35,7 @@ public:
     wxDataFormatId GetType() const;
     void SetType( wxDataFormatId type );
 
-    QString m_MimeType;
+    wxString m_MimeType;
 };
 
 #endif // _WX_QT_DATAFORM_H_

include/wx/qt/dataobj.h

@@ -8,12 +8,13 @@
 #ifndef _WX_QT_DATAOBJ_H_
 #define _WX_QT_DATAOBJ_H_
 
-#include <QMimeData>
+class QMimeData;
 
 class WXDLLIMPEXP_CORE wxDataObject : public wxDataObjectBase
 {
 public:
-    wxDataObject() {}
+    wxDataObject();
+    ~wxDataObject();
     
     virtual bool IsSupportedFormat(const wxDataFormat& format, Direction dir) const;
     virtual wxDataFormat GetPreferredFormat(Direction dir = Get) const;
@@ -24,7 +25,7 @@ public:
     virtual bool SetData(const wxDataFormat& format, size_t len, const void * buf);
 
 private:
-    QMimeData m_qtMimeData; // to handle formats that have no helper classes
+    QMimeData *m_qtMimeData; // to handle formats that have no helper classes
 };
 
 #endif // _WX_QT_DATAOBJ_H_

include/wx/qt/dc.h

@@ -8,8 +8,7 @@
 #ifndef _WX_QT_DC_H_
 #define _WX_QT_DC_H_
 
-#include <QtGui/QPainter>
-
+class QPainter;
 class QImage;
 
 class WXDLLIMPEXP_FWD_CORE wxRegion;
@@ -125,8 +124,8 @@ private:
         wxQtINVERT
     };
     wxQtRasterColourOp m_rasterColourOp;
-    QColor m_qtPenColor;
-    QColor m_qtBrushColor;
+    QColor *m_qtPenColor;
+    QColor *m_qtBrushColor;
     void ApplyRasterColourOp();
     
 };

include/wx/qt/dialog.h

@@ -9,7 +9,7 @@
 #define _WX_QT_DIALOG_H_
 
 #include "wx/dialog.h"
-#include <QtWidgets/QDialog>
+class QDialog;
 
 class WXDLLIMPEXP_CORE wxDialog : public wxDialogBase
 {
@@ -35,7 +35,7 @@ public:
     virtual void EndModal(int retCode);
     virtual bool IsModal() const;
 
-    virtual QDialog *GetHandle() const;
+    QDialog *GetDialogHandle() const;
 
 private:
 

include/wx/qt/dirdlg.h

@@ -8,7 +8,7 @@
 #ifndef _WX_QT_DIRDLG_H_
 #define _WX_QT_DIRDLG_H_
 
-#include <QtWidgets/QFileDialog>
+class QFileDialog;
 
 class WXDLLIMPEXP_CORE wxDirDialog : public wxDirDialogBase
 {
@@ -36,10 +36,10 @@ public:     // overrides from wxGenericDirDialog
     wxString GetPath() const wxOVERRIDE;
     void SetPath(const wxString& path) wxOVERRIDE;
 
-    virtual QFileDialog *GetHandle() const;
-
 private:
 
+    virtual QFileDialog *GetQFileDialog() const;
+
     wxDECLARE_DYNAMIC_CLASS(wxDirDialog);
 };
 

include/wx/qt/evtloop.h

@@ -8,7 +8,7 @@
 #ifndef _WX_QT_EVTLOOP_H_
 #define _WX_QT_EVTLOOP_H_
 
-#include <QtCore/QTimer>
+class QTimer;
 
 class WXDLLIMPEXP_BASE wxQtEventLoopBase : public wxEventLoopBase
 {
@@ -58,21 +58,4 @@ public:
 
 #endif // wxUSE_GUI
 
-
-class wxQtEventLoopBase;
-
-class wxQtIdleTimer : public QTimer
-{
-
-public:
-    wxQtIdleTimer( wxQtEventLoopBase *eventLoop );
-    virtual bool eventFilter( QObject * watched, QEvent * event  );
-
-private:
-    void idle();
-
-private:
-    wxQtEventLoopBase *m_eventLoop;
-};
-
 #endif // _WX_QT_EVTLOOP_H_

include/wx/qt/filedlg.h

@@ -8,7 +8,7 @@
 #ifndef _WX_QT_FILEDLG_H_
 #define _WX_QT_FILEDLG_H_
 
-#include <QtWidgets/QFileDialog>
+class QFileDialog;
 
 class WXDLLIMPEXP_CORE wxFileDialog : public wxFileDialogBase
 {
@@ -48,7 +48,7 @@ public:
 
     virtual bool SupportsExtraControl() const wxOVERRIDE { return true; }
 
-    virtual QFileDialog *GetHandle() const;
+    virtual QFileDialog *GetQFileDialog() const;
 
 private:
 

include/wx/qt/fontdlg.h

@@ -8,7 +8,7 @@
 #ifndef _WX_QT_FONTDLG_H_
 #define _WX_QT_FONTDLG_H_
 
-#include <QtWidgets/QFontDialog>
+class QFontDialog;
 
 class WXDLLIMPEXP_CORE wxFontDialog : public wxFontDialogBase
 {
@@ -17,8 +17,6 @@ public:
     wxFontDialog(wxWindow *parent) { Create(parent); }
     wxFontDialog(wxWindow *parent, const wxFontData& data) { Create(parent, data); }
     
-    virtual QFontDialog *GetHandle() const { return static_cast<QFontDialog *>(m_qtWindow); }
-
 protected:
     bool DoCreate(wxWindow *parent);
     

include/wx/qt/frame.h

@@ -12,8 +12,9 @@
 #define _WX_QT_FRAME_H_
 
 #include "wx/frame.h"
-#include <QtWidgets/QMainWindow>
-#include <QtWidgets/QScrollArea>
+
+class QMainWindow;
+class QScrollArea;
 
 class WXDLLIMPEXP_CORE wxFrame : public wxFrameBase
 {
@@ -45,12 +46,8 @@ public:
     virtual void AddChild( wxWindowBase *child );
     virtual void RemoveChild( wxWindowBase *child );
 
-    virtual QMainWindow *GetHandle() const
-    {
-        return static_cast<QMainWindow*>(m_qtWindow);
-    }
-
-    virtual QAbstractScrollArea *QtGetScrollBarsContainer() const;
+    QMainWindow *GetQMainWindow() const;
+    virtual QScrollArea *QtGetScrollBarsContainer() const;
 
 protected:
     virtual void DoGetClientSize(int *width, int *height) const;

include/wx/qt/gauge.h

@@ -8,7 +8,7 @@
 #ifndef _WX_QT_GAUGE_H_
 #define _WX_QT_GAUGE_H_
 
-#include <QtWidgets/QProgressBar>
+class QProgressBar;
 
 class WXDLLIMPEXP_CORE wxGauge : public wxGaugeBase
 {
@@ -33,7 +33,7 @@ public:
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxGaugeNameStr);
 
-    virtual QProgressBar *GetHandle() const;
+    virtual QWidget *GetHandle() const;
 
     // set/get the control range
     virtual void SetRange(int range);

include/wx/qt/glcanvas.h

@@ -8,7 +8,11 @@
 #ifndef _WX_GLCANVAS_H_
 #define _WX_GLCANVAS_H_
 
-#include <QtOpenGL/QGLWidget>
+#include <GL/gl.h>
+
+class QGLWidget;
+class QGLContext;
+class QGLFormat;
 
 class WXDLLIMPEXP_GL wxGLContext : public wxGLContextBase
 {
@@ -54,8 +58,6 @@ public:
 
     static bool ConvertWXAttrsToQtGL(const int *wxattrs, QGLFormat &format);
 
-    virtual QGLWidget *GetHandle() const { return static_cast<QGLWidget *>(m_qtWindow); }
-
 private:
 
 //    wxDECLARE_EVENT_TABLE();

include/wx/qt/listbox.h

@@ -8,7 +8,9 @@
 #ifndef _WX_QT_LISTBOX_H_
 #define _WX_QT_LISTBOX_H_
 
-#include <QtWidgets/QListWidget>
+class QListWidget;
+class QModelIndex;
+class QScrollArea;
 
 class WXDLLIMPEXP_CORE wxListBox : public wxListBoxBase
 {
@@ -57,7 +59,7 @@ public:
     virtual void SetSelection(int n);
     virtual int GetSelection() const;
 
-    virtual QListWidget *GetHandle() const;
+    virtual QWidget *GetHandle() const;
 
     void QtSendEvent(wxEventType evtType, const QModelIndex &index, bool selected);
 

include/wx/qt/listctrl.h

@@ -9,7 +9,9 @@
 #define _WX_QT_LISTCTRL_H_
 
 #include "wx/textctrl.h"
-#include <QtWidgets/QTreeWidget>
+
+class QTreeWidget;
+class QTreeWidgetItem;
 
 class WXDLLIMPEXP_FWD_CORE wxImageList;
 
@@ -284,7 +286,7 @@ public:
         return OnGetItemAttr(item);
     }
 
-    virtual QTreeWidget *GetHandle() const;
+    virtual QWidget *GetHandle() const;
 
 protected:
     void Init();

include/wx/qt/menu.h

@@ -8,8 +8,8 @@
 #ifndef _WX_QT_MENU_H_
 #define _WX_QT_MENU_H_
 
-#include <QtWidgets/QMenu>
-#include <QtWidgets/QMenuBar>
+class QMenu;
+class QMenuBar;
 
 class WXDLLIMPEXP_CORE wxMenu : public wxMenuBase
 {
@@ -48,7 +48,8 @@ public:
     virtual void SetMenuLabel(size_t pos, const wxString& label);
     virtual wxString GetMenuLabel(size_t pos) const;
 
-    virtual QMenuBar *GetHandle() const;
+    QMenuBar *GetQMenuBar() const { return m_qtMenuBar; }
+    virtual QWidget *GetHandle() const;
 
     virtual void Attach(wxFrame *frame);
     virtual void Detach();

include/wx/qt/menuitem.h

@@ -9,7 +9,7 @@
 #define _WX_QT_MENUITEM_H_
 
 #include "wx/menuitem.h"
-#include <QtWidgets/QAction>
+class QAction;
 
 class WXDLLIMPEXP_FWD_CORE wxBitmap;
 class WXDLLIMPEXP_FWD_CORE wxMenu;

include/wx/qt/msgdlg.h

@@ -10,7 +10,7 @@
 
 #include "wx/msgdlg.h"
 
-#include <QtWidgets/QMessageBox>
+class QMessageBox;
 
 class WXDLLIMPEXP_CORE wxMessageDialog : public wxMessageDialogBase
 {
@@ -23,9 +23,6 @@ public:
 
     // Reimplemented to translate return codes from Qt to wx
     virtual int ShowModal();
-    
-    virtual QMessageBox *GetHandle() const;
-
 };
 
 #endif // _WX_QT_MSGDLG_H_

include/wx/qt/notebook.h

@@ -8,7 +8,7 @@
 #ifndef _WX_QT_NOTEBOOK_H_
 #define _WX_QT_NOTEBOOK_H_
 
-#include <QtWidgets/QTabWidget>
+class QTabWidget;
 
 class WXDLLIMPEXP_CORE wxNotebook : public wxNotebookBase
 {
@@ -45,7 +45,7 @@ public:
     int SetSelection(size_t nPage) { return DoSetSelection(nPage, SetSelection_SendEvent); }
     int ChangeSelection(size_t nPage) { return DoSetSelection(nPage); }
 
-    virtual QTabWidget *GetHandle() const;
+    virtual QWidget *GetHandle() const;
 
 protected:
     virtual wxWindow *DoRemovePage(size_t page);

include/wx/qt/pen.h

@@ -8,8 +8,6 @@
 #ifndef _WX_QT_PEN_H_
 #define _WX_QT_PEN_H_
 
-#include <QtCore/Qt>
-
 class QPen;
 
 class WXDLLIMPEXP_CORE wxPen : public wxPenBase

include/wx/qt/private/timer.h

@@ -10,14 +10,14 @@
 
 #if wxUSE_TIMER
 
-#include "wx/private/timer.h"
-
 #include <QtCore/QObject>
+#include "wx/private/timer.h"
 
 //-----------------------------------------------------------------------------
 // wxTimer
 //-----------------------------------------------------------------------------
 
+class QTimerEvent;
 class WXDLLIMPEXP_CORE wxQtTimerImpl : public wxTimerImpl, QObject
 {
 public:

include/wx/qt/private/winevent.h

@@ -11,13 +11,15 @@
 #ifndef _WX_QT_EVENTSIGNALFORWARDER_H_
 #define _WX_QT_EVENTSIGNALFORWARDER_H_
 
+#include <QtCore/QEvent>
+#include <QtGui/QCloseEvent>
+
 #include "wx/log.h"
 #include "wx/window.h"
 #include "wx/qt/private/converter.h"
 #include "wx/qt/private/utils.h"
 
-#include <QtCore/QEvent>
-#include <QtGui/QPaintEvent>
+class QPaintEvent;
 
 template< typename Handler >
 class wxQtSignalHandler

include/wx/qt/radiobox.h

@@ -8,9 +8,9 @@
 #ifndef _WX_QT_RADIOBOX_H_
 #define _WX_QT_RADIOBOX_H_
 
-#include <QtWidgets/QGroupBox>
-#include <QtWidgets/QButtonGroup>
-#include <QtWidgets/QVBoxLayout>
+class QGroupBox;
+class QButtonGroup;
+class QBoxLayout;
 
 class WXDLLIMPEXP_CORE wxRadioBox : public wxControl, public wxRadioBoxBase
 {
@@ -77,7 +77,7 @@ public:
     virtual void SetSelection(int n);
     virtual int GetSelection() const;
 
-    virtual QGroupBox *GetHandle() const;
+    virtual QWidget *GetHandle() const;
 
 private:
     // The 'visual' group box:

include/wx/qt/radiobut.h

@@ -8,7 +8,7 @@
 #ifndef _WX_QT_RADIOBUT_H_
 #define _WX_QT_RADIOBUT_H_
 
-#include <QtWidgets/QRadioButton>
+class QRadioButton;
 
 class WXDLLIMPEXP_CORE wxRadioButton : public wxControl
 {
@@ -35,7 +35,7 @@ public:
     virtual void SetValue(bool value);
     virtual bool GetValue() const;
 
-    virtual QRadioButton *GetHandle() const;
+    virtual QWidget *GetHandle() const;
 
 protected:
 

include/wx/qt/region.h

@@ -9,7 +9,9 @@
 #ifndef _WX_QT_REGION_H_
 #define _WX_QT_REGION_H_
 
-#include <QtGui/QRegion>
+class QRegion;
+class QRect;
+template<class T> class QVector;
 
 class WXDLLIMPEXP_CORE wxRegion : public wxRegionBase
 {
@@ -25,7 +27,7 @@ public:
     virtual bool IsEmpty() const;
     virtual void Clear();
 
-    virtual QRegion GetHandle() const;
+    virtual const QRegion &GetHandle() const;
     virtual void QtSetRegion(QRegion region); // Hangs on to this region
 
 protected:
@@ -45,8 +47,6 @@ protected:
     virtual bool DoIntersect(const wxRegion& region);
     virtual bool DoSubtract(const wxRegion& region);
     virtual bool DoXor(const wxRegion& region);
-    
-private:
 };
 
 
@@ -79,7 +79,7 @@ public:
     wxRect GetRect() const;
     
 private:
-    QVector< QRect > *m_qtRects;
+    QVector < QRect > *m_qtRects;
     int m_pos;
 };
 

include/wx/qt/scrolbar.h

@@ -10,7 +10,7 @@
 
 #include "wx/scrolbar.h"
 
-#include <QtWidgets/QScrollBar>
+class QScrollBar;
 
 class WXDLLIMPEXP_FWD_CORE wxQtScrollBar;
 
@@ -42,7 +42,8 @@ public:
                               int range, int pageSize,
                               bool refresh = true);
 
-    virtual QScrollBar* GetHandle() const;
+    QScrollBar *GetQScrollBar() const { return m_qtScrollBar; }
+    QWidget *GetHandle() const;
 
 private:
     QScrollBar *m_qtScrollBar;

include/wx/qt/slider.h

@@ -8,7 +8,7 @@
 #ifndef _WX_QT_SLIDER_H_
 #define _WX_QT_SLIDER_H_
 
-#include <QtWidgets/QSlider>
+class QSlider;
 
 class WXDLLIMPEXP_CORE wxSlider : public wxSliderBase
 {
@@ -50,7 +50,7 @@ public:
     virtual void SetThumbLength(int lenPixels);
     virtual int GetThumbLength() const;
 
-    virtual QSlider *GetHandle() const;
+    virtual QWidget *GetHandle() const;
 
 private:
     QSlider *m_qtSlider;

include/wx/qt/spinbutt.h

@@ -9,7 +9,7 @@
 #define _WX_QT_SPINBUTT_H_
 
 #include "wx/spinbutt.h"
-#include <QtWidgets/QSpinBox>
+class QSpinBox;
 
 class WXDLLIMPEXP_CORE wxSpinButton : public wxSpinButtonBase
 {
@@ -32,7 +32,7 @@ public:
     virtual int GetValue() const;
     virtual void SetValue(int val);
 
-    virtual QSpinBox *GetHandle() const;
+    virtual QWidget *GetHandle() const;
 
 private:
     QSpinBox *m_qtSpinBox;

include/wx/qt/spinctrl.h

@@ -8,8 +8,8 @@
 #ifndef _WX_QT_SPINCTRL_H_
 #define _WX_QT_SPINCTRL_H_
 
-#include <QtWidgets/QSpinBox>
-#include <QtWidgets/QDoubleSpinBox>
+class QSpinBox;
+class QDoubleSpinBox;
 
 // Take advantage of the Qt compile time polymorphy and use a template to avoid
 // copy&paste code for the usage of QSpinBox/QDoubleSpinBox.
@@ -45,7 +45,7 @@ public:
     T GetMax() const;
     T GetIncrement() const;
 
-    virtual Widget *GetHandle() const;
+    virtual QWidget *GetHandle() const;
 
 protected:
     Widget *m_qtSpinBox;

include/wx/qt/statbmp.h

@@ -8,7 +8,7 @@
 #ifndef _WX_QT_STATBMP_H_
 #define _WX_QT_STATBMP_H_
 
-#include <QtWidgets/QLabel>
+class QLabel;
 
 class WXDLLIMPEXP_CORE wxStaticBitmap : public wxStaticBitmapBase
 {
@@ -35,7 +35,7 @@ public:
     virtual wxBitmap GetBitmap() const;
     virtual wxIcon GetIcon() const;
 
-    virtual QLabel *GetHandle() const;
+    virtual QWidget *GetHandle() const;
 protected:
 
 private:

include/wx/qt/statbox.h

@@ -8,7 +8,7 @@
 #ifndef _WX_QT_STATBOX_H_
 #define _WX_QT_STATBOX_H_
 
-#include <QtWidgets/QGroupBox>
+class QGroupBox;
 
 class WXDLLIMPEXP_CORE wxStaticBox : public wxStaticBoxBase
 {
@@ -31,7 +31,7 @@ public:
 
     virtual void GetBordersForSizer(int *borderTop, int *borderOther) const;
 
-    virtual QGroupBox *GetHandle() const;
+    virtual QWidget *GetHandle() const;
 
 protected:
 

include/wx/qt/statline.h

@@ -8,7 +8,7 @@
 #ifndef _WX_QT_STATLINE_H_
 #define _WX_QT_STATLINE_H_
 
-#include <QtWidgets/QFrame>
+class QFrame;
 
 class WXDLLIMPEXP_CORE wxStaticLine : public wxStaticLineBase
 {
@@ -29,7 +29,7 @@ public:
                  long style = wxLI_HORIZONTAL,
                  const wxString &name = wxStaticLineNameStr );
 
-    virtual QFrame *GetHandle() const;
+    virtual QWidget *GetHandle() const;
 
 private:
     QFrame *m_qtFrame;

include/wx/qt/stattext.h

@@ -8,7 +8,7 @@
 #ifndef _WX_QT_STATTEXT_H_
 #define _WX_QT_STATTEXT_H_
 
-#include <QtWidgets/QLabel>
+class QLabel;
 
 class WXDLLIMPEXP_CORE wxStaticText : public wxStaticTextBase
 {
@@ -32,7 +32,8 @@ public:
 
     void SetLabel(const wxString& label);
 
-    QLabel *GetHandle() const;
+    virtual QWidget *GetHandle() const;
+
 private:
     QLabel *m_qtLabel;
 

include/wx/qt/statusbar.h

@@ -10,13 +10,15 @@
 
 #include "wx/statusbr.h"
 
-#include <QtWidgets/QLabel>
-#include <QtWidgets/QStatusBar>
+class QLabel;
+class QStatusBar;
+
+template < class T > class QList;
 
 class WXDLLIMPEXP_CORE wxStatusBar : public wxStatusBarBase
 {
 public:
-    wxStatusBar() {}
+    wxStatusBar();
     wxStatusBar(wxWindow *parent, wxWindowID winid = wxID_ANY,
                 long style = wxSTB_DEFAULT_STYLE,
                 const wxString& name = wxStatusBarNameStr);
@@ -32,8 +34,9 @@ public:
     virtual void Refresh( bool eraseBackground = true,
                           const wxRect *rect = (const wxRect *) NULL );
 
-    virtual QStatusBar *GetHandle() const;
-
+    QStatusBar *GetQStatusBar() const { return m_qtStatusBar; }
+    QWidget *GetHandle() const;
+    
 protected:
     virtual void DoUpdateStatusText(int number);
 
@@ -42,7 +45,7 @@ private:
     void UpdateFields();
 
     QStatusBar *m_qtStatusBar;
-    QList< QLabel* > m_qtPanes;
+    QList< QLabel* > *m_qtPanes;
 
     wxDECLARE_DYNAMIC_CLASS(wxStatusBar);
 };

include/wx/qt/taskbar.h

@@ -8,12 +8,13 @@
 #ifndef _WX_QT_TASKBAR_H_
 #define _WX_QT_TASKBAR_H_
 
-#include <QtWidgets/QSystemTrayIcon>
+class QSystemTrayIcon;
 
 class WXDLLIMPEXP_CORE wxTaskBarIcon : public wxTaskBarIconBase
 {
 public:
     wxTaskBarIcon(wxTaskBarIconType iconType = wxTBI_DEFAULT_TYPE);
+    virtual ~wxTaskBarIcon();
 
     // Accessors
     bool IsOk() const { return false; }
@@ -26,7 +27,7 @@ public:
     virtual bool PopupMenu(wxMenu *menu);
 
 private:
-    QSystemTrayIcon m_qtSystemTrayIcon;
+    QSystemTrayIcon *m_qtSystemTrayIcon;
 
     wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxTaskBarIcon);
 };

include/wx/qt/textctrl.h

@@ -8,8 +8,9 @@
 #ifndef _WX_QT_TEXTCTRL_H_
 #define _WX_QT_TEXTCTRL_H_
 
-#include <QtWidgets/QLineEdit>
-#include <QtWidgets/QTextEdit>
+class QLineEdit;
+class QTextEdit;
+class QScrollArea;
 
 class WXDLLIMPEXP_CORE wxTextCtrl : public wxTextCtrlBase
 {

include/wx/qt/tglbtn.h

@@ -36,7 +36,7 @@ public:
     virtual void SetValue(bool state);
     virtual bool GetValue() const;
 
-    virtual QPushButton *GetHandle() const;
+    virtual QWidget *GetHandle() const;
 
 private:
     wxDECLARE_DYNAMIC_CLASS(wxBitmapToggleButton);
@@ -69,7 +69,7 @@ public:
     virtual void SetValue(bool state);
     virtual bool GetValue() const;
 
-    virtual QPushButton *GetHandle() const;
+    virtual QWidget *GetHandle() const;
 
 private:
 

include/wx/qt/toolbar.h

@@ -5,7 +5,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#include <QtWidgets/QToolBar>
+class QToolBar;
 
 #ifndef _WX_QT_TOOLBAR_H_
 #define _WX_QT_TOOLBAR_H_
@@ -41,7 +41,7 @@ public:
                 const wxString& name = wxToolBarNameStr);
 
     virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const;
-    virtual QToolBar *GetHandle() const;
+    virtual QToolBar *GetQToolBar() const { return m_qtToolBar; }
 
     virtual void SetWindowStyleFlag( long style );
     virtual bool Realize() wxOVERRIDE;
@@ -57,7 +57,8 @@ public:
 
     virtual wxToolBarToolBase *CreateTool(wxControl *control,
                                           const wxString& label);
-
+    QWidget *GetHandle() const;
+    
 protected:
 
     QActionGroup* GetActionGroup(size_t pos);
@@ -68,7 +69,7 @@ protected:
     virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle);
 
 private:
-    Qt::ToolButtonStyle GetButtonStyle();
+    long GetButtonStyle();
 
     QToolBar *m_qtToolBar;
 

include/wx/qt/treectrl.h

@@ -8,7 +8,7 @@
 #ifndef _WX_QT_TREECTRL_H_
 #define _WX_QT_TREECTRL_H_
 
-#include <QtWidgets/QTreeWidget>
+class QTreeWidget;
 
 class WXDLLIMPEXP_CORE wxTreeCtrl : public wxTreeCtrlBase
 {
@@ -112,7 +112,7 @@ public:
 
     virtual bool GetBoundingRect(const wxTreeItemId& item, wxRect& rect, bool textOnly = false) const;
 
-    virtual QTreeWidget *GetHandle() const;
+    virtual QWidget *GetHandle() const;
 
 protected:
     virtual int DoGetItemState(const wxTreeItemId& item) const;

include/wx/qt/window.h

@@ -9,8 +9,27 @@
 #ifndef _WX_QT_WINDOW_H_
 #define _WX_QT_WINDOW_H_
 
-#include <QtWidgets/QWidget>
-#include <QtWidgets/QScrollArea>
+#include <list>
+
+class QWidget;
+class QScrollWindow;
+class QAbstractScrollArea;
+class QScrollArea;
+class QPicture;
+class QPainter;
+
+class QPaintEvent;
+class QResizeEvent;
+class QWheelEvent;
+class QKeyEvent;
+class QMouseEvent;
+class QEvent;
+class QMoveEvent;
+class QEvent;
+class QEvent;
+class QCloseEvent;
+class QContextMenuEvent;
+class QFocusEvent;
 
 class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 class WXDLLIMPEXP_FWD_CORE wxQtShortcutHandler;
@@ -112,7 +131,7 @@ public:
     virtual bool SetTransparent(wxByte alpha);
     virtual bool CanSetTransparent() { return true; }
 
-    virtual WXWidget GetHandle() const;
+    QWidget *GetHandle() const;
 
     virtual void SetDropTarget( wxDropTarget *dropTarget );
     
@@ -148,7 +167,7 @@ public:
     virtual void QtHandleShortcut ( int command );
 #endif // wxUSE_ACCEL
 
-    virtual QAbstractScrollArea *QtGetScrollBarsContainer() const;
+    virtual QScrollArea *QtGetScrollBarsContainer() const;
 
 protected:
     virtual void DoGetTextExtent(const wxString& string,
@@ -206,7 +225,7 @@ private:
     bool m_mouseInside;
 
 #if wxUSE_ACCEL
-    QList< QShortcut* > m_qtShortcuts;
+    QList< QShortcut* > *m_qtShortcuts;
     wxQtShortcutHandler *m_qtShortcutHandler;
     bool m_processingShortcut;
 #endif // wxUSE_ACCEL