Some WinCE fixes from ABX

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

diff --git a/include/wx/msw/wince/missing.h b/include/wx/msw/wince/missing.h
index 22df67f45dfaaf80f3c158de8a9fda20e24523ab..7c4ca560d0f020051bb6acd23df8e4c374caccf7 100644 (file)
--- a/include/wx/msw/wince/missing.h
+++ b/include/wx/msw/wince/missing.h
@@ -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>
 */
 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
 ////////////////////////////////////////////////////////
 
 // JACS: I've commented these out in order to start from


@@ -154,6 +163,7 @@ CallWindowProcW(
 #endif // !UNICODE
 
 #endif
 #endif // !UNICODE
 
 #endif

+ // 0

 
 ////////////////////////////////////////////////////////
 
 
 ////////////////////////////////////////////////////////
 

diff --git a/src/msw/evtloop.cpp b/src/msw/evtloop.cpp
index 23e9e93455b7145a82035ddc6e90bf647f62ac82..2a4da8b4463926bca94bedd999af3a6be80c47ca 100644 (file)
--- a/src/msw/evtloop.cpp
+++ b/src/msw/evtloop.cpp
@@ -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
     #include "wx/thread.h"
 
 #if wxUSE_THREADS
     #include "wx/thread.h"
 

diff --git a/src/msw/msgdlg.cpp b/src/msw/msgdlg.cpp
index c51438155da7b62f164d942eaa945057683be498..6ea59bcfddb6699e697080d8250d9294882e49b2 100644 (file)
--- a/src/msw/msgdlg.cpp
+++ b/src/msw/msgdlg.cpp
@@ -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)
 
 wxMessageDialog::wxMessageDialog(wxWindow *parent,
 IMPLEMENT_CLASS(wxMessageDialog, wxDialog)
 
 wxMessageDialog::wxMessageDialog(wxWindow *parent,


@@ -104,10 +109,8 @@ int wxMessageDialog::ShowModal()
 
     if (hWnd)
         msStyle |= MB_APPLMODAL;
 
     if (hWnd)
         msStyle |= MB_APPLMODAL;

-#ifndef __WXWINCE__

     else
         msStyle |= MB_TASKMODAL;
     else
         msStyle |= MB_TASKMODAL;

-#endif

 
     // do show the dialog
     int msAns = MessageBox(hWnd, m_message.c_str(), m_caption.c_str(), msStyle);
 
     // do show the dialog
     int msAns = MessageBox(hWnd, m_message.c_str(), m_caption.c_str(), msStyle);

diff --git a/src/msw/treectrl.cpp b/src/msw/treectrl.cpp
index 862196ca69509d0d71e94fbfaf34162b13fc5b91..26ba49eea1da9a195d8a79f00d94bf5a2766833f 100644 (file)
--- a/src/msw/treectrl.cpp
+++ b/src/msw/treectrl.cpp
@@ -674,8 +674,10 @@ bool wxTreeCtrl::Create(wxWindow *parent,
         wstyle |= TVS_CHECKBOXES;
 #endif // wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE
 
         wstyle |= TVS_CHECKBOXES;
 #endif // wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE
 

+#ifndef __WXWINCE__

     // Need so that TVN_GETINFOTIP messages will be sent
     wstyle |= TVS_INFOTIP;
     // Need so that TVN_GETINFOTIP messages will be sent
     wstyle |= TVS_INFOTIP;

+#endif

     
     // Create the tree control.
     if ( !MSWCreateControl(WC_TREEVIEW, wstyle) )
     
     // Create the tree control.
     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
         // not be processed each time the mouse is moved
         // and the tooltip will only ever update once.
         // 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;
             }
 
                 break;
             }

+#endif

         
         case TVN_GETDISPINFO:
             eventType = wxEVT_COMMAND_TREE_GET_INFO;
         
         case TVN_GETDISPINFO:
             eventType = wxEVT_COMMAND_TREE_GET_INFO;


@@ -2831,6 +2834,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
             DeleteTextCtrl();
             break;
 
             DeleteTextCtrl();
             break;
 

+#ifndef __WXWINCE__

          case TVN_GETINFOTIP:
             {
                 // If the user permitted a tooltip change, change it
          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;
                 }
             }
             break;

+#endif

         
         case TVN_SELCHANGING:
         case TVN_ITEMEXPANDING:
         
         case TVN_SELCHANGING:
         case TVN_ITEMEXPANDING: