Upgrading to iup 3.1

3 files changed, 16 insertions, 1 deletions

diff --git a/iup/srcole/config.mak b/iup/srcole/config.mak
index af0ef50..b1f223e 100755
--- a/iup/srcole/config.mak
+++ b/iup/srcole/config.mak
@@ -15,3 +15,8 @@ SRC = iup_olecontrol.cpp \
 			tOleHandler.cpp \
 			tOleInPlaceFrame.cpp \
 			tOleInPlaceSite.cpp
+
+
+ifneq ($(findstring cygw, $(TEC_UNAME)), )
+  LIBS += uuid ole32 gdi32 oleaut32
+endif
diff --git a/iup/srcole/tLegacy.h b/iup/srcole/tLegacy.h
index 3294e20..1cd9cfc 100755
--- a/iup/srcole/tLegacy.h
+++ b/iup/srcole/tLegacy.h
@@ -53,7 +53,7 @@
 #endif
 
 #ifdef WIN32
-#include <tchar.h>
+//#include <tchar.h>
 #ifdef UNICODE
 #include <wchar.h>
 #endif
diff --git a/iup/srcole/tOleInPlaceSite.cpp b/iup/srcole/tOleInPlaceSite.cpp
index 977777c..de55653 100755
--- a/iup/srcole/tOleInPlaceSite.cpp
+++ b/iup/srcole/tOleInPlaceSite.cpp
@@ -477,7 +477,17 @@ STDMETHODIMP tOleInPlaceSite::Scroll(SIZE sz)
 STDMETHODIMP tOleInPlaceSite::OnPosRectChange(LPCRECT prcPos)
     {
     if (NULL!=prcPos)
+        {
+        // This change was necessary because some controls were not working, and being positioned in a wrong place.
+        // Contribution by Kommit
+        LPRECT pPos = (LPRECT)prcPos; // convert the const pointer to non-const pointer to modify it's member values.
+        pPos->right -= pPos->left;
+        pPos->bottom -= pPos->top;
+        pPos->left = 0;
+        pPos->top = 0;
+
         m_pTen->m_rcPos=*prcPos;
+        }
 
     m_pTen->UpdateInPlaceObjectRects(prcPos, FALSE);
     return NOERROR;