[Libreoffice-commits] .: 4 commits - vcl/Library_vcl.mk vcl/win

[Tor Lillqvist]

 vcl/Library_vcl.mk                 |    4 ++--
 vcl/win/source/gdi/winlayout.cxx   |    6 +++---
 vcl/win/source/window/salframe.cxx |    3 +++
 3 files changed, 8 insertions(+), 5 deletions(-)

New commits:
commit d4f6f8e5f8b1202851fcf9b258a77070aa0265fc
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Jul 14 21:31:28 2011 +0300

    The MinGW winuser.h doesn't have WM_MOUSEHWHEEL yet

diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index 7ae5cca..f9db19b 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -114,6 +114,9 @@ using namespace ::com::sun::star::beans;
 #ifndef SPI_SETWHEELSCROLLCHARS
 # define SPI_SETWHEELSCROLLCHARS   0x006D
 #endif
+#ifndef WM_MOUSEHWHEEL
+# define WM_MOUSEHWHEEL 0x020E
+#endif
 
 #if OSL_DEBUG_LEVEL > 1
 void MyOutputDebugString( char *s) { OutputDebugString( s ); }
commit 4996501d9b1e6ca72b5c6b0425cd07feb1f126b5
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Jul 14 21:07:07 2011 +0300

    Fix WNTGCC compilation error

diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index 673aa0f..1356ee7 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -2807,7 +2807,7 @@ private:
     grutils::GrFeatureParser * mpFeatures;
     mutable GraphiteLayoutWinImpl maImpl;
 public:
-    GraphiteWinLayout(HDC hDC, const ImplWinFontData& rWFD, ImplWinFontEntry& rWFE);
+    GraphiteWinLayout(HDC hDC, const ImplWinFontData& rWFD, ImplWinFontEntry& rWFE) throw();
 
     // used by upper layers
     virtual bool  LayoutText( ImplLayoutArgs& );    // first step of layout
commit 105719b92332ce94f6b1f374f60346bfca69d475
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Jul 14 21:03:48 2011 +0300

    Relocated the headers we need from Wine

diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index b6d7ba6..977facc 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -43,7 +43,7 @@ $(eval $(call gb_Library_add_package_headers,vcl,vcl_inc))
 $(eval $(call gb_Library_add_package_headers,vcl,vcl_afmhash))
 
 ifeq ($(OS)$(COM),WNTGCC)
-GDIPLUSINCLUDE=-I$(OUTDIR)/inc/external/gdiplus
+WINEINCLUDE=-I$(OUTDIR)/inc/external/wine
 endif
 
 $(eval $(call gb_Library_set_include,vcl,\
@@ -52,7 +52,7 @@ $(eval $(call gb_Library_set_include,vcl,\
     -I$(realpath $(SRCDIR)/vcl/inc/pch) \
     -I$(SRCDIR)/solenv/inc \
     -I$(OUTDIR)/inc \
-    $(GDIPLUSINCLUDE) \
+    $(WINEINCLUDE) \
     -I$(WORKDIR)/CustomTarget/vcl/unx/generic/fontmanager \
 ))
 ifeq ($(GUIBASE),unx)
commit bbeaf5abb3b06384e86a5ac3860ce87daa7df3ce
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Jul 14 21:02:30 2011 +0300

    Use all-lowercase header names

diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index 2b12352..673aa0f 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -57,8 +57,8 @@
 
 #define USE_UNISCRIBE
 #ifdef USE_UNISCRIBE
-#include <Usp10.h>
-#include <ShLwApi.h>
+#include <usp10.h>
+#include <shlwapi.h>
 #include <winver.h>
 #endif // USE_UNISCRIBE