1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove global GDI helpers qt_win_display_dc and qt_region_from_HRGN

Browse Source 
They were no longer used anyway.

Change-Id: I565480cf39d2d8a27735afe56ac6537bc62fbd4a
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
This commit is contained in:
Volker Hilsheimer 2020-04-08 14:12:12 +02:00
parent aad8d17f74
commit 0651a4c274
2 changed files with 0 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/styles/windowsvista/qwindowsxpstyle.cpp
View File

@ -97,10 +97,6 @@ static const int windowsItemVMargin = 0; // menu item ver text margin
static const int windowsArrowHMargin = 6; // arrow horizontal margin static const int windowsArrowHMargin = 6; // arrow horizontal margin
static const int windowsRightBorder = 12; // right border on windows static const int windowsRightBorder = 12; // right border on windows
// External function calls
extern Q_WIDGETS_EXPORT HDC qt_win_display_dc();
extern QRegion qt_region_from_HRGN(HRGN rgn);
// Theme names matching the QWindowsXPStylePrivate::Theme enumeration. // Theme names matching the QWindowsXPStylePrivate::Theme enumeration.
static const wchar_t *themeNames[QWindowsXPStylePrivate::NThemes] = static const wchar_t *themeNames[QWindowsXPStylePrivate::NThemes] =
{ {

27
src/widgets/kernel/qapplication.cpp
View File

@ -102,10 +102,6 @@
#include "private/qgesturemanager_p.h" #include "private/qgesturemanager_p.h"
#include <qpa/qplatformfontdatabase.h> #include <qpa/qplatformfontdatabase.h>
#ifdef Q_OS_WIN
#include <QtCore/qt_windows.h> // for qt_win_display_dc()
#endif
#include "qdatetime.h" #include "qdatetime.h"
#include <qpa/qplatformwindow.h> #include <qpa/qplatformwindow.h>
@ -755,35 +751,12 @@ QApplication::~QApplication()
#endif #endif
} }
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
#if defined(Q_OS_WIN) && !defined(Q_OS_WINRT)
// #fixme: Remove.
static HDC displayDC = 0; // display device context
Q_WIDGETS_EXPORT HDC qt_win_display_dc() // get display DC
{
Q_ASSERT(qApp && qApp->thread() == QThread::currentThread());
if (!displayDC)
displayDC = GetDC(0);
return displayDC;
}
#endif
#endif
void qt_cleanup() void qt_cleanup()
{ {
QPixmapCache::clear(); QPixmapCache::clear();
QColormap::cleanup(); QColormap::cleanup();
QApplicationPrivate::active_window = nullptr; //### this should not be necessary QApplicationPrivate::active_window = nullptr; //### this should not be necessary
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
#if defined(Q_OS_WIN) && !defined(Q_OS_WINRT)
if (displayDC) {
ReleaseDC(0, displayDC);
displayDC = 0;
}
#endif
#endif
} }
/*! /*!