WinCE build fixes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36002 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/geometry.h b/include/wx/geometry.h
index 92c2bcbc0d2ea5a1b07f19a4f836865ea96a48fd..4c1e5ad871c70a879c7292e3de9485c47a33f97b 100644 (file)
--- a/include/wx/geometry.h
+++ b/include/wx/geometry.h
@@ -4,7 +4,7 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     08/05/99
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     08/05/99

-// RCS-ID:
+// RCS-ID:      $Id$

 // Copyright:   (c) 1999 Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 1999 Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -20,7 +20,7 @@
 #include "wx/gdicmn.h"
 #include "wx/math.h"
 
 #include "wx/gdicmn.h"
 #include "wx/math.h"
 

-#ifdef __WXMSW__
+#if defined(__WXMSW__) && !defined(__WXWINCE__)

     #define wxMulDivInt32( a , b , c ) ::MulDiv( a , b , c )
 #elif defined( __WXMAC__ )
     #define wxMulDivInt32( a , b , c ) ( (wxInt32) ( ( (wxInt64)(a) * (wxInt64)(b) ) / (wxInt64)(c) ) )
     #define wxMulDivInt32( a , b , c ) ::MulDiv( a , b , c )
 #elif defined( __WXMAC__ )
     #define wxMulDivInt32( a , b , c ) ( (wxInt32) ( ( (wxInt64)(a) * (wxInt64)(b) ) / (wxInt64)(c) ) )

diff --git a/include/wx/utils.h b/include/wx/utils.h
index 234f130670191585b3be2c5e9cb717dab1341dc8..ed432b85826b83d4825b2dea8b0c0ec93b709707 100644 (file)
--- a/include/wx/utils.h
+++ b/include/wx/utils.h
@@ -211,12 +211,12 @@ WXDLLIMPEXP_BASE long wxExecute(const wxString& command,
                                 wxArrayString& error,
                                 int flags = 0);
 
                                 wxArrayString& error,
                                 int flags = 0);
 

-#ifdef __WXMSW__
+#if defined(__WXMSW__) && wxUSE_IPC

 // ask a DDE server to execute the DDE request with given parameters
 WXDLLIMPEXP_BASE bool wxExecuteDDE(const wxString& ddeServer,
                                    const wxString& ddeTopic,
                                    const wxString& ddeCommand);
 // ask a DDE server to execute the DDE request with given parameters
 WXDLLIMPEXP_BASE bool wxExecuteDDE(const wxString& ddeServer,
                                    const wxString& ddeTopic,
                                    const wxString& ddeCommand);

-#endif // __WXMSW__
+#endif // __WXMSW__ && wxUSE_IPC

 
 enum wxSignal
 {
 
 enum wxSignal
 {

diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index 0831170f371290b0121b9a049055229219317f66..b048ccd3c6e617ebffabefdb593d7a95d3b15872 100644 (file)
--- a/src/common/utilscmn.cpp
+++ b/src/common/utilscmn.cpp
@@ -526,6 +526,8 @@ bool wxLaunchDefaultBrowser(const wxString& urlOrig, int flags)
         url.Prepend(wxT("http://"));
 
 #if defined(__WXMSW__)
         url.Prepend(wxT("http://"));
 
 #if defined(__WXMSW__)

+
+#if wxUSE_IPC

     if ( flags & wxBROWSER_NEW_WINDOW )
     {
         // ShellExecuteEx() opens the URL in an existing window by default so
     if ( flags & wxBROWSER_NEW_WINDOW )
     {
         // ShellExecuteEx() opens the URL in an existing window by default so


@@ -583,6 +585,7 @@ bool wxLaunchDefaultBrowser(const wxString& urlOrig, int flags)
             }
         }
     }
             }
         }
     }

+#endif // wxUSE_IPC

 
     WinStruct<SHELLEXECUTEINFO> sei;
     sei.lpFile = url.c_str();
 
     WinStruct<SHELLEXECUTEINFO> sei;
     sei.lpFile = url.c_str();

diff --git a/src/msw/ole/activex.cpp b/src/msw/ole/activex.cpp
index 0463a8843a656ff3175a2746eeee799efc1edbf7..41c5756c1d6f319871f945a24189b03162410d1f 100644 (file)
--- a/src/msw/ole/activex.cpp
+++ b/src/msw/ole/activex.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        msw/ole/activex.cpp
+// Name:        src/msw/ole/activex.cpp

 // Purpose:     wxActiveXContainer implementation
 // Author:      Ryan Norton <wxprojects@comcast.net>, Lindsay Mathieson <???>
 // Modified by:
 // Purpose:     wxActiveXContainer implementation
 // Author:      Ryan Norton <wxprojects@comcast.net>, Lindsay Mathieson <???>
 // Modified by:


@@ -24,6 +24,7 @@
 #endif
 
 #include "wx/dcclient.h"
 #endif
 
 #include "wx/dcclient.h"

+#include "wx/geometry.h"

 #include "wx/msw/ole/activex.h"
 
 
 #include "wx/msw/ole/activex.h"
 
 


@@ -741,7 +742,7 @@ static void PixelsToHimetric(SIZEL &sz)
     };
 
 #define HIMETRIC_INCH   2540
     };
 
 #define HIMETRIC_INCH   2540

-#define CONVERT(x, logpixels)   MulDiv(HIMETRIC_INCH, (x), (logpixels))
+#define CONVERT(x, logpixels)   wxMulDivInt32(HIMETRIC_INCH, (x), (logpixels))

 
     sz.cx = CONVERT(sz.cx, logX);
     sz.cy = CONVERT(sz.cy, logY);
 
     sz.cx = CONVERT(sz.cx, logX);
     sz.cy = CONVERT(sz.cy, logY);