AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

WinCE compilation fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34662 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2005-06-15 22:04:53 +00:00
parent 3a2f2e31bc
commit 858cab30be
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/common/msgout.cpp
View File

@ -92,6 +92,21 @@ wxMessageOutput* wxMessageOutput::Set(wxMessageOutput* msgout)
// wxMessageOutputBest
// ----------------------------------------------------------------------------
#ifdef __WINDOWS__
// check if we're running in a console under Windows
static inline bool IsInConsole()
{
#ifdef __WXWINCE__
return false;
#else // !__WXWINCE__
HANDLE hStdErr = ::GetStdHandle(STD_ERROR_HANDLE);
return hStdErr && hStdErr != INVALID_HANDLE_VALUE;
#endif // __WXWINCE__/!__WXWINCE__
}
#endif // __WINDOWS__
void wxMessageOutputBest::Printf(const wxChar* format, ...)
{
va_list args;
@ -102,9 +117,7 @@ void wxMessageOutputBest::Printf(const wxChar* format, ...)
va_end(args);
#ifdef __WINDOWS__
// check if we're running in a console
HANDLE hStdErr = ::GetStdHandle(STD_ERROR_HANDLE);
if ( !hStdErr || hStdErr == INVALID_HANDLE_VALUE )
if ( !IsInConsole() )
{
::MessageBox(NULL, out, _T("wxWidgets"), MB_ICONINFORMATION | MB_OK);
}

2
src/msw/menu.cpp
View File

@ -386,7 +386,7 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
if ( pos == (size_t)-1 )
{
// append at the end
pos = ::GetMenuItemCount(GetHmenu());
pos = GetMenuItemCount();
}
BOOL ok = false;