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

Improve build and widget storage

Browse Source 
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.
This commit is contained in:
Sean D'Epagnier
2016-08-25 11:56:00 -04:00
committed by Vadim Zeitlin
parent 88e134ef81
commit 35bc8f449b
102 changed files with 446 additions and 305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/wx/qt/toolbar.h
View File

@@ -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;