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

Some WinCE fixes from ABX

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24971 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart 2003-12-23 09:18:16 +00:00
parent 6ed8156e8a
commit 676d655065
4 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/wx/msw/wince/missing.h
View File

@ -31,6 +31,15 @@ inline BOOL IsIconic( HWND hWnd )
Most of these are in MSVC++6.0 <wx\wince\winuser.h>
see also <wx\msw\gnuwin32\winresrc.h>
*/
// ----------------------------------------------------------------------------
// Used in msgdlg.cpp, evtloop.cpp
// ----------------------------------------------------------------------------
#ifndef MB_TASKMODAL
#define MB_TASKMODAL 0x2000
#endif
////////////////////////////////////////////////////////
// JACS: I've commented these out in order to start from
@ -154,6 +163,7 @@ CallWindowProcW(
#endif // !UNICODE
#endif
// 0
////////////////////////////////////////////////////////

5
src/msw/evtloop.cpp
View File

@ -41,6 +41,11 @@
#include "wx/msw/private.h"
// For MB_TASKMODAL
#ifdef __WXWINCE__
#include "wx/msw/wince/missing.h"
#endif
#if wxUSE_THREADS
#include "wx/thread.h"

7
src/msw/msgdlg.cpp
View File

@ -30,6 +30,11 @@
#include "wx/msw/private.h"
// For MB_TASKMODAL
#ifdef __WXWINCE__
#include "wx/msw/wince/missing.h"
#endif
IMPLEMENT_CLASS(wxMessageDialog, wxDialog)
wxMessageDialog::wxMessageDialog(wxWindow *parent,
@ -104,10 +109,8 @@ int wxMessageDialog::ShowModal()
if (hWnd)
msStyle |= MB_APPLMODAL;
#ifndef __WXWINCE__
else
msStyle |= MB_TASKMODAL;
#endif
// do show the dialog
int msAns = MessageBox(hWnd, m_message.c_str(), m_caption.c_str(), msStyle);

7
src/msw/treectrl.cpp
View File

@ -674,8 +674,10 @@ bool wxTreeCtrl::Create(wxWindow *parent,
wstyle |= TVS_CHECKBOXES;
#endif // wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE
#ifndef __WXWINCE__
// Need so that TVN_GETINFOTIP messages will be sent
wstyle |= TVS_INFOTIP;
#endif
// Create the tree control.
if ( !MSWCreateControl(WC_TREEVIEW, wstyle) )
@ -2462,7 +2464,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
break;
}
#ifndef __WXWINCE__
// These *must* not be removed or TVN_GETINFOTIP will
// not be processed each time the mouse is moved
// and the tooltip will only ever update once.
@ -2484,6 +2486,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
break;
}
#endif
case TVN_GETDISPINFO:
eventType = wxEVT_COMMAND_TREE_GET_INFO;
@ -2831,6 +2834,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
DeleteTextCtrl();
break;
#ifndef __WXWINCE__
case TVN_GETINFOTIP:
{
// If the user permitted a tooltip change, change it
@ -2840,6 +2844,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
}
}
break;
#endif
case TVN_SELCHANGING:
case TVN_ITEMEXPANDING: