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

Fixes for wxQt build under Cygwin

Browse Source 
Include the missing headers, notable QtGui/QFont from wx/fontutil.h which uses
a QFont object.

Closes #16750.
This commit is contained in:
Tim Stahlhut
2015-10-25 18:00:05 +01:00
committed by Vadim Zeitlin
parent db966da330
commit fb5d1a002c
23 changed files with 195 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/qt/window.cpp
View File

@@ -8,14 +8,9 @@
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#include "wx/window.h"
#include "wx/log.h"
#include "wx/menu.h"
#include "wx/tooltip.h"
#include "wx/scrolbar.h"
#include "wx/qt/private/utils.h"
#include "wx/qt/private/converter.h"
#include "wx/qt/private/winevent.h"
#ifdef __BORLANDC__
#pragma hdrstop
#endif
#include <QtGui/QPicture>
#include <QtGui/QPainter>
@@ -24,6 +19,20 @@
#include <QtWidgets/QWidget>
#include <QtWidgets/QScrollArea>
#ifndef WX_PRECOMP
#include "wx/dcclient.h"
#include "wx/frame.h"
#include "wx/log.h"
#include "wx/menu.h"
#include "wx/scrolbar.h"
#endif // WX_PRECOMP
#include "wx/window.h"
#include "wx/tooltip.h"
#include "wx/qt/private/utils.h"
#include "wx/qt/private/converter.h"
#include "wx/qt/private/winevent.h"
#define VERT_SCROLLBAR_POSITION 0, 1
#define HORZ_SCROLLBAR_POSITION 1, 0