Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WinCE build fixes.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36002 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-10-23 22:37:58 +00:00
parent 9f8b9d9cc1
commit 5ccb95f690
4 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/geometry.h
View File

@@ -4,7 +4,7 @@
// Author: Stefan Csomor // Author: Stefan Csomor
// Modified by: // Modified by:
// Created: 08/05/99 // Created: 08/05/99
// RCS-ID: // RCS-ID: $Id$
// Copyright: (c) 1999 Stefan Csomor // Copyright: (c) 1999 Stefan Csomor
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
@@ -20,7 +20,7 @@
#include "wx/gdicmn.h" #include "wx/gdicmn.h"
#include "wx/math.h" #include "wx/math.h"
#ifdef __WXMSW__ #if defined(__WXMSW__) && !defined(__WXWINCE__)
#define wxMulDivInt32( a , b , c ) ::MulDiv( a , b , c ) #define wxMulDivInt32( a , b , c ) ::MulDiv( a , b , c )
#elif defined( __WXMAC__ ) #elif defined( __WXMAC__ )
#define wxMulDivInt32( a , b , c ) ( (wxInt32) ( ( (wxInt64)(a) * (wxInt64)(b) ) / (wxInt64)(c) ) ) #define wxMulDivInt32( a , b , c ) ( (wxInt32) ( ( (wxInt64)(a) * (wxInt64)(b) ) / (wxInt64)(c) ) )

4
include/wx/utils.h
View File

@@ -211,12 +211,12 @@ WXDLLIMPEXP_BASE long wxExecute(const wxString& command,
wxArrayString& error, wxArrayString& error,
int flags = 0); int flags = 0);
#ifdef __WXMSW__ #if defined(__WXMSW__) && wxUSE_IPC
// ask a DDE server to execute the DDE request with given parameters // ask a DDE server to execute the DDE request with given parameters
WXDLLIMPEXP_BASE bool wxExecuteDDE(const wxString& ddeServer, WXDLLIMPEXP_BASE bool wxExecuteDDE(const wxString& ddeServer,
const wxString& ddeTopic, const wxString& ddeTopic,
const wxString& ddeCommand); const wxString& ddeCommand);
#endif // __WXMSW__ #endif // __WXMSW__ && wxUSE_IPC
enum wxSignal enum wxSignal
{ {

3
src/common/utilscmn.cpp
View File

@@ -526,6 +526,8 @@ bool wxLaunchDefaultBrowser(const wxString& urlOrig, int flags)
url.Prepend(wxT("http://")); url.Prepend(wxT("http://"));
#if defined(__WXMSW__) #if defined(__WXMSW__)
#if wxUSE_IPC
if ( flags & wxBROWSER_NEW_WINDOW ) if ( flags & wxBROWSER_NEW_WINDOW )
{ {
// ShellExecuteEx() opens the URL in an existing window by default so // 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; WinStruct<SHELLEXECUTEINFO> sei;
sei.lpFile = url.c_str(); sei.lpFile = url.c_str();

5
src/msw/ole/activex.cpp
View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: msw/ole/activex.cpp // Name: src/msw/ole/activex.cpp
// Purpose: wxActiveXContainer implementation // Purpose: wxActiveXContainer implementation
// Author: Ryan Norton <wxprojects@comcast.net>, Lindsay Mathieson <???> // Author: Ryan Norton <wxprojects@comcast.net>, Lindsay Mathieson <???>
// Modified by: // Modified by:
@@ -24,6 +24,7 @@
#endif #endif
#include "wx/dcclient.h" #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.cx = CONVERT(sz.cx, logX);
sz.cy = CONVERT(sz.cy, logY); sz.cy = CONVERT(sz.cy, logY);