don't call SelectObject() twice in SetBrush() nor SetFont() neither

[wxWidgets.git] / src / msw / treectrl.cpp

diff --git a/src/msw/treectrl.cpp b/src/msw/treectrl.cpp
index a7c06e728e49e0f53c774d17d0d23ad730428a7c..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.


@@ -2480,10 +2482,11 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                 NMTVGETINFOTIP *info = (NMTVGETINFOTIP*)lParam;
 
                 // Which item are we trying to get a tooltip for?
                 NMTVGETINFOTIP *info = (NMTVGETINFOTIP*)lParam;
 
                 // Which item are we trying to get a tooltip for?

-                event.m_item = (WXHTREEITEM) info->hItem;
+                event.m_item = info->hItem;

 
                 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: