Skip to content

Instantly share code, notes, and snippets.

@tondrej
Last active April 2, 2018 08:00
Show Gist options
  • Save tondrej/ec90707b76c7e86741f001a3b759f95c to your computer and use it in GitHub Desktop.
Save tondrej/ec90707b76c7e86741f001a3b759f95c to your computer and use it in GitHub Desktop.
Patch for Lazarus 1.8.2 Qt5 interface bindings to compile with Visual Studio 2015
Index: pascalbind.h
===================================================================
--- pascalbind.h (revision 57427)
+++ pascalbind.h (working copy)
@@ -27,13 +27,13 @@
#include "chandles.h"
-#if defined(__WIN32__)
+#if defined(__WIN32__) || defined(_WIN32)
#define C_EXPORT extern "C" __declspec( dllexport )
#else
#define C_EXPORT extern "C"
#endif
-#ifdef __WIN32__
+#if defined(__WIN32__) || defined(_WIN32)
#include <windows.h>
#endif
Index: qbackingstore_c.cpp
===================================================================
--- qbackingstore_c.cpp (revision 57427)
+++ qbackingstore_c.cpp (working copy)
@@ -48,7 +48,7 @@
bool QBackingStore_scroll(QBackingStoreH handle, const QRegionH area, int dx, int dy)
{
- ((QBackingStore *)handle)->scroll(*(const QRegion*)area, dx, dy);
+ return ((QBackingStore *)handle)->scroll(*(const QRegion*)area, dx, dy);
}
void QBackingStore_beginPaint(QBackingStoreH handle, const QRegionH AnonParam1)
Index: qwindow_c.cpp
===================================================================
--- qwindow_c.cpp (revision 57427)
+++ qwindow_c.cpp (working copy)
@@ -391,12 +391,12 @@
bool QWindow_setKeyboardGrabEnabled(QWindowH handle, bool grab)
{
- ((QWindow *)handle)->setKeyboardGrabEnabled(grab);
+ return ((QWindow *)handle)->setKeyboardGrabEnabled(grab);
}
bool QWindow_setMouseGrabEnabled(QWindowH handle, bool grab)
{
- ((QWindow *)handle)->setMouseGrabEnabled(grab);
+ return ((QWindow *)handle)->setMouseGrabEnabled(grab);
}
void QWindow_mapToGlobal(QWindowH handle, PQtPoint retval, const QPointH AnonParam1)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment