Some WinCE fixes from ABX
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24971 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -31,6 +31,15 @@ inline BOOL IsIconic( HWND hWnd )
|
|||||||
Most of these are in MSVC++6.0 <wx\wince\winuser.h>
|
Most of these are in MSVC++6.0 <wx\wince\winuser.h>
|
||||||
see also <wx\msw\gnuwin32\winresrc.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
|
// JACS: I've commented these out in order to start from
|
||||||
@@ -154,6 +163,7 @@ CallWindowProcW(
|
|||||||
#endif // !UNICODE
|
#endif // !UNICODE
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
// 0
|
||||||
|
|
||||||
////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
@@ -41,6 +41,11 @@
|
|||||||
|
|
||||||
#include "wx/msw/private.h"
|
#include "wx/msw/private.h"
|
||||||
|
|
||||||
|
// For MB_TASKMODAL
|
||||||
|
#ifdef __WXWINCE__
|
||||||
|
#include "wx/msw/wince/missing.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
#if wxUSE_THREADS
|
#if wxUSE_THREADS
|
||||||
#include "wx/thread.h"
|
#include "wx/thread.h"
|
||||||
|
|
||||||
|
@@ -30,6 +30,11 @@
|
|||||||
|
|
||||||
#include "wx/msw/private.h"
|
#include "wx/msw/private.h"
|
||||||
|
|
||||||
|
// For MB_TASKMODAL
|
||||||
|
#ifdef __WXWINCE__
|
||||||
|
#include "wx/msw/wince/missing.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
IMPLEMENT_CLASS(wxMessageDialog, wxDialog)
|
IMPLEMENT_CLASS(wxMessageDialog, wxDialog)
|
||||||
|
|
||||||
wxMessageDialog::wxMessageDialog(wxWindow *parent,
|
wxMessageDialog::wxMessageDialog(wxWindow *parent,
|
||||||
@@ -104,10 +109,8 @@ int wxMessageDialog::ShowModal()
|
|||||||
|
|
||||||
if (hWnd)
|
if (hWnd)
|
||||||
msStyle |= MB_APPLMODAL;
|
msStyle |= MB_APPLMODAL;
|
||||||
#ifndef __WXWINCE__
|
|
||||||
else
|
else
|
||||||
msStyle |= MB_TASKMODAL;
|
msStyle |= MB_TASKMODAL;
|
||||||
#endif
|
|
||||||
|
|
||||||
// do show the dialog
|
// do show the dialog
|
||||||
int msAns = MessageBox(hWnd, m_message.c_str(), m_caption.c_str(), msStyle);
|
int msAns = MessageBox(hWnd, m_message.c_str(), m_caption.c_str(), msStyle);
|
||||||
|
@@ -674,8 +674,10 @@ bool wxTreeCtrl::Create(wxWindow *parent,
|
|||||||
wstyle |= TVS_CHECKBOXES;
|
wstyle |= TVS_CHECKBOXES;
|
||||||
#endif // wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE
|
#endif // wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE
|
||||||
|
|
||||||
|
#ifndef __WXWINCE__
|
||||||
// Need so that TVN_GETINFOTIP messages will be sent
|
// Need so that TVN_GETINFOTIP messages will be sent
|
||||||
wstyle |= TVS_INFOTIP;
|
wstyle |= TVS_INFOTIP;
|
||||||
|
#endif
|
||||||
|
|
||||||
// Create the tree control.
|
// Create the tree control.
|
||||||
if ( !MSWCreateControl(WC_TREEVIEW, wstyle) )
|
if ( !MSWCreateControl(WC_TREEVIEW, wstyle) )
|
||||||
@@ -2462,7 +2464,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifndef __WXWINCE__
|
||||||
// These *must* not be removed or TVN_GETINFOTIP will
|
// These *must* not be removed or TVN_GETINFOTIP will
|
||||||
// not be processed each time the mouse is moved
|
// not be processed each time the mouse is moved
|
||||||
// and the tooltip will only ever update once.
|
// and the tooltip will only ever update once.
|
||||||
@@ -2484,6 +2486,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
|
|||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
case TVN_GETDISPINFO:
|
case TVN_GETDISPINFO:
|
||||||
eventType = wxEVT_COMMAND_TREE_GET_INFO;
|
eventType = wxEVT_COMMAND_TREE_GET_INFO;
|
||||||
@@ -2831,6 +2834,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
|
|||||||
DeleteTextCtrl();
|
DeleteTextCtrl();
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
#ifndef __WXWINCE__
|
||||||
case TVN_GETINFOTIP:
|
case TVN_GETINFOTIP:
|
||||||
{
|
{
|
||||||
// If the user permitted a tooltip change, change it
|
// If the user permitted a tooltip change, change it
|
||||||
@@ -2840,6 +2844,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
#endif
|
||||||
|
|
||||||
case TVN_SELCHANGING:
|
case TVN_SELCHANGING:
|
||||||
case TVN_ITEMEXPANDING:
|
case TVN_ITEMEXPANDING:
|
||||||
|
Reference in New Issue
Block a user