kotatogram/lib_ui
1
0
Fork 0
Code Issues Activity

Use plain windows.h now it doesn't define small.

Browse source
This commit is contained in:
John Preston 2023-11-13 18:59:56 +04:00
parent f9b24c7551
commit fee301f941
4 changed files with 5 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ui/platform/win/ui_utility_win.cpp
View file

@ -6,13 +6,13 @@
// //
#include "ui/platform/win/ui_utility_win.h" #include "ui/platform/win/ui_utility_win.h"
#include "base/platform/win/base_windows_h.h"
#include "ui/widgets/popup_menu.h" #include "ui/widgets/popup_menu.h"
#include <QtWidgets/QApplication> #include <QtWidgets/QApplication>
#include <QtGui/QWindow> #include <QtGui/QWindow>
#include <QtCore/QAbstractNativeEventFilter> #include <QtCore/QAbstractNativeEventFilter>
#include <windows.h>
#include <wrl/client.h> #include <wrl/client.h>
#include <Shobjidl.h> #include <Shobjidl.h>

13
ui/platform/win/ui_window_shadow_win.h
View file

@ -6,19 +6,10 @@
// //
#pragma once #pragma once
#include "base/platform/win/base_windows_h.h" #include "base/platform/win/base_windows_rpcndr_h.h"
#include "base/platform/win/base_windows_gdiplus_h.h"
#include "base/flags.h" #include "base/flags.h"
#include <rpc.h>
#include <rpcndr.h>
#include <Unknwn.h>
#define min(a, b) ((a) < (b) ? (a) : (b))
#define max(a, b) ((a) < (b) ? (b) : (a))
#include <gdiplus.h>
#undef min
#undef max
class QColor; class QColor;
namespace Ui { namespace Ui {

2
ui/platform/win/ui_windows_direct_manipulation.h
View file

@ -7,11 +7,11 @@
#pragma once #pragma once
#include "base/platform/win/base_windows_winrt.h" #include "base/platform/win/base_windows_winrt.h"
#include "base/platform/win/base_windows_h.h"
#include "ui/effects/animations.h" #include "ui/effects/animations.h"
#include <QtCore/QPoint> #include <QtCore/QPoint>
#include <windows.h>
#include <directmanipulation.h> #include <directmanipulation.h>
namespace Ui { namespace Ui {

2
ui/widgets/fields/input_field.cpp
View file

@ -32,7 +32,7 @@
#include <QtWidgets/QTextEdit> #include <QtWidgets/QTextEdit>
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
#include "base/platform/win/base_windows_h.h" #include <windows.h>
#include <WinUser.h> #include <WinUser.h>
#elif !defined DESKTOP_APP_DISABLE_X11_INTEGRATION // Q_OS_WIN #elif !defined DESKTOP_APP_DISABLE_X11_INTEGRATION // Q_OS_WIN
#include "base/platform/linux/base_linux_xcb_utilities.h" #include "base/platform/linux/base_linux_xcb_utilities.h"