process CBN_SELENDOK and not only CBN_SELCHANGE (patch 1083907)

[wxWidgets.git] / src / msw / wince / tbarwce.cpp

diff --git a/src/msw/wince/tbarwce.cpp b/src/msw/wince/tbarwce.cpp
index 844c422ab0419d26eafce53a2e4f65c917107ccd..2138b8ef6a868758e3ff4c46e2d5bee9e22a089e 100644 (file)
--- a/src/msw/wince/tbarwce.cpp
+++ b/src/msw/wince/tbarwce.cpp
@@ -226,24 +226,24 @@ bool wxToolBar::Create(wxWindow *parent,
 {
     // common initialisation
     if ( !CreateControl(parent, id, pos, size, style, wxDefaultValidator, name) )
 {
     // common initialisation
     if ( !CreateControl(parent, id, pos, size, style, wxDefaultValidator, name) )

-        return FALSE;
+        return false;

 
     // MSW-specific initialisation
     if ( !MSWCreateToolbar(pos, size, menuBar) )
 
     // MSW-specific initialisation
     if ( !MSWCreateToolbar(pos, size, menuBar) )

-        return FALSE;
+        return false;

 
     // set up the colors and fonts
     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_MENUBAR));
     SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
 
 
     // set up the colors and fonts
     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_MENUBAR));
     SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
 

-    return TRUE;
+    return true;

 }
 
 #ifndef TBSTYLE_NO_DROPDOWN_ARROW
 #define TBSTYLE_NO_DROPDOWN_ARROW 0x0080
 #endif
 
 }
 
 #ifndef TBSTYLE_NO_DROPDOWN_ARROW
 #define TBSTYLE_NO_DROPDOWN_ARROW 0x0080
 #endif
 

-bool wxToolBar::MSWCreateToolbar(const wxPoint& pos, const wxSize& size, wxMenuBar* menuBar)
+bool wxToolBar::MSWCreateToolbar(const wxPoint& WXUNUSED(pos), const wxSize& WXUNUSED(size), wxMenuBar* menuBar)

 {
     SetMenuBar(menuBar);
     if (m_menuBar)
 {
     SetMenuBar(menuBar);
     if (m_menuBar)


@@ -252,7 +252,7 @@ bool wxToolBar::MSWCreateToolbar(const wxPoint& pos, const wxSize& size, wxMenuB
 #if defined(WINCE_WITHOUT_COMMANDBAR)
     // Create the menubar.
     SHMENUBARINFO mbi;
 #if defined(WINCE_WITHOUT_COMMANDBAR)
     // Create the menubar.
     SHMENUBARINFO mbi;

-    
+

     memset (&mbi, 0, sizeof (SHMENUBARINFO));
     mbi.cbSize     = sizeof (SHMENUBARINFO);
     mbi.hwndParent = (HWND) GetParent()->GetHWND();
     memset (&mbi, 0, sizeof (SHMENUBARINFO));
     mbi.cbSize     = sizeof (SHMENUBARINFO);
     mbi.hwndParent = (HWND) GetParent()->GetHWND();


@@ -265,13 +265,13 @@ bool wxToolBar::MSWCreateToolbar(const wxPoint& pos, const wxSize& size, wxMenuB
     mbi.cBmpImages = 0;
     mbi.dwFlags = 0 ; // SHCMBF_EMPTYBAR;
     mbi.hInstRes = wxGetInstance();
     mbi.cBmpImages = 0;
     mbi.dwFlags = 0 ; // SHCMBF_EMPTYBAR;
     mbi.hInstRes = wxGetInstance();

-    
+

     if (!SHCreateMenuBar(&mbi))
     {
         wxFAIL_MSG( _T("SHCreateMenuBar failed") );
     if (!SHCreateMenuBar(&mbi))
     {
         wxFAIL_MSG( _T("SHCreateMenuBar failed") );

-        return FALSE;
+        return false;

     }
     }

-    
+

     SetHWND((WXHWND) mbi.hwndMB);
 #else
     HWND hWnd = CommandBar_Create(wxGetInstance(), (HWND) GetParent()->GetHWND(), GetId());
     SetHWND((WXHWND) mbi.hwndMB);
 #else
     HWND hWnd = CommandBar_Create(wxGetInstance(), (HWND) GetParent()->GetHWND(), GetId());


@@ -283,8 +283,8 @@ bool wxToolBar::MSWCreateToolbar(const wxPoint& pos, const wxSize& size, wxMenuB
 
     if (menuBar)
         menuBar->Create();
 
     if (menuBar)
         menuBar->Create();

-    
-    return TRUE;
+
+    return true;

 }
 
 void wxToolBar::Recreate()
 }
 
 void wxToolBar::Recreate()


@@ -437,7 +437,7 @@ bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos), wxToolBarToolBase *tool)
     // Realize() later
     tool->Attach(this);
 
     // Realize() later
     tool->Attach(this);
 

-    return TRUE;
+    return true;

 }
 
 bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *tool)
 }
 
 bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *tool)


@@ -494,7 +494,7 @@ bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *tool)
         {
             wxLogLastError(wxT("TB_DELETEBUTTON"));
 
         {
             wxLogLastError(wxT("TB_DELETEBUTTON"));
 

-            return FALSE;
+            return false;

         }
     }
 
         }
     }
 


@@ -510,11 +510,11 @@ bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *tool)
             int x;
             wxControl *control = tool2->GetControl();
             control->GetPosition(&x, NULL);
             int x;
             wxControl *control = tool2->GetControl();
             control->GetPosition(&x, NULL);

-            control->Move(x - width, -1);
+            control->Move(x - width, wxDefaultCoord);

         }
     }
 
         }
     }
 

-    return TRUE;
+    return true;

 }
 
 struct wxToolBarIdMapping
 }
 
 struct wxToolBarIdMapping


@@ -554,7 +554,7 @@ static wxToolBarIdMapping sm_ToolBarIdMappingArray[] =
 static int wxFindIdForwxWinId(int id)
 {
     int i = 0;
 static int wxFindIdForwxWinId(int id)
 {
     int i = 0;

-    while (TRUE)
+    while (true)

     {
         if (sm_ToolBarIdMappingArray[i].m_wxwinId == 0)
             return -1;
     {
         if (sm_ToolBarIdMappingArray[i].m_wxwinId == 0)
             return -1;


@@ -572,11 +572,9 @@ bool wxToolBar::Realize()
     if ( nTools == 0 )
     {
         // nothing to do
     if ( nTools == 0 )
     {
         // nothing to do

-        return TRUE;
+        return true;

     }
 
     }
 

-    const bool isVertical = HasFlag(wxTB_VERTICAL);
-

 #if 0
     // delete all old buttons, if any
     for ( size_t pos = 0; pos < m_nButtons; pos++ )
 #if 0
     // delete all old buttons, if any
     for ( size_t pos = 0; pos < m_nButtons; pos++ )


@@ -586,7 +584,7 @@ bool wxToolBar::Realize()
             wxLogDebug(wxT("TB_DELETEBUTTON failed"));
         }
     }
             wxLogDebug(wxT("TB_DELETEBUTTON failed"));
         }
     }

-#endif
+#endif // 0

 
     // add the buttons and separators
     // ------------------------------
 
     // add the buttons and separators
     // ------------------------------


@@ -600,20 +598,20 @@ bool wxToolBar::Realize()
     // this array will hold the indices of all controls in the toolbar
     wxArrayInt controlIds;
 
     // this array will hold the indices of all controls in the toolbar
     wxArrayInt controlIds;
 

-    bool lastWasRadio = FALSE;
+    bool lastWasRadio = false;

     int i = 0;
     wxToolBarToolsList::Node* node;
     for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
     {
         wxToolBarToolBase *tool = node->GetData();
 
     int i = 0;
     wxToolBarToolsList::Node* node;
     for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
     {
         wxToolBarToolBase *tool = node->GetData();
 

-        bool processedThis = TRUE;
+        bool processedThis = true;

 
         TBBUTTON& button = buttons[i];
 
         wxZeroMemory(button);
 
 
         TBBUTTON& button = buttons[i];
 
         wxZeroMemory(button);
 

-        bool isRadio = FALSE;
+        bool isRadio = false;

         switch ( tool->GetStyle() )
         {
             case wxTOOL_STYLE_CONTROL:
         switch ( tool->GetStyle() )
         {
             case wxTOOL_STYLE_CONTROL:


@@ -646,7 +644,7 @@ bool wxToolBar::Realize()
                     button.iBitmap = winceId;
                 }
                 else
                     button.iBitmap = winceId;
                 }
                 else

-                    processedThis = FALSE;
+                    processedThis = false;

 
                 if ( tool->IsEnabled() )
                     button.fsState |= TBSTATE_ENABLED;
 
                 if ( tool->IsEnabled() )
                     button.fsState |= TBSTATE_ENABLED;


@@ -665,10 +663,10 @@ bool wxToolBar::Realize()
                             // radio items
                             button.fsState |= TBSTATE_CHECKED;
 
                             // radio items
                             button.fsState |= TBSTATE_CHECKED;
 

-                            tool->Toggle(TRUE);
+                            tool->Toggle(true);

                         }
 
                         }
 

-                        isRadio = TRUE;
+                        isRadio = true;

                         break;
 
                     case wxITEM_CHECK:
                         break;
 
                     case wxITEM_CHECK:


@@ -702,6 +700,9 @@ bool wxToolBar::Realize()
     delete [] buttons;
 
 #if 0
     delete [] buttons;
 
 #if 0

+
+    const bool isVertical = HasFlag(wxTB_VERTICAL);
+

     // Deal with the controls finally
     // ------------------------------
 
     // Deal with the controls finally
     // ------------------------------
 


@@ -722,8 +723,8 @@ bool wxToolBar::Realize()
         // note that we use TB_GETITEMRECT and not TB_GETRECT because the
         // latter only appeared in v4.70 of comctl32.dll
         RECT r;
         // note that we use TB_GETITEMRECT and not TB_GETRECT because the
         // latter only appeared in v4.70 of comctl32.dll
         RECT r;

-        if ( !SendMessage(GetHwnd(), TB_GETITEMRECT,
-                          index, (LPARAM)(LPRECT)&r) )
+        if ( !::SendMessage(GetHwnd(), TB_GETITEMRECT,
+                            index, (LPARAM)(LPRECT)&r) )

         {
             wxLogLastError(wxT("TB_GETITEMRECT"));
         }
         {
             wxLogLastError(wxT("TB_GETITEMRECT"));
         }


@@ -755,8 +756,8 @@ bool wxToolBar::Realize()
             tbbi.cbSize = sizeof(tbbi);
             tbbi.dwMask = TBIF_SIZE;
             tbbi.cx = size.x;
             tbbi.cbSize = sizeof(tbbi);
             tbbi.dwMask = TBIF_SIZE;
             tbbi.cx = size.x;

-            if ( !SendMessage(GetHwnd(), TB_SETBUTTONINFO,
-                              tool->GetId(), (LPARAM)&tbbi) )
+            if ( !::SendMessage(GetHwnd(), TB_SETBUTTONINFO,
+                                tool->GetId(), (LPARAM)&tbbi) )

             {
                 // the id is probably invalid?
                 wxLogLastError(wxT("TB_SETBUTTONINFO"));
             {
                 // the id is probably invalid?
                 wxLogLastError(wxT("TB_SETBUTTONINFO"));


@@ -779,8 +780,8 @@ bool wxToolBar::Realize()
             size_t nSeparators = size.x / widthSep;
             for ( size_t nSep = 0; nSep < nSeparators; nSep++ )
             {
             size_t nSeparators = size.x / widthSep;
             for ( size_t nSep = 0; nSep < nSeparators; nSep++ )
             {

-                if ( !SendMessage(GetHwnd(), TB_INSERTBUTTON,
-                                  index, (LPARAM)&tbb) )
+                if ( !::SendMessage(GetHwnd(), TB_INSERTBUTTON,
+                                    index, (LPARAM)&tbb) )

                 {
                     wxLogLastError(wxT("TB_INSERTBUTTON"));
                 }
                 {
                     wxLogLastError(wxT("TB_INSERTBUTTON"));
                 }


@@ -793,7 +794,7 @@ bool wxToolBar::Realize()
             ((wxToolBarTool *)tool)->SetSeparatorsCount(nSeparators);
 
             // adjust the controls width to exactly cover the separators
             ((wxToolBarTool *)tool)->SetSeparatorsCount(nSeparators);
 
             // adjust the controls width to exactly cover the separators

-            control->SetSize((nSeparators + 1)*widthSep, -1);
+            control->SetSize((nSeparators + 1)*widthSep, wxDefaultCoord);

         }
 
         // position the control itself correctly vertically
         }
 
         // position the control itself correctly vertically


@@ -802,7 +803,7 @@ bool wxToolBar::Realize()
         if ( diff < 0 )
         {
             // the control is too high, resize to fit
         if ( diff < 0 )
         {
             // the control is too high, resize to fit

-            control->SetSize(-1, height - 2);
+            control->SetSize(wxDefaultCoord, height - 2);

 
             diff = 2;
         }
 
             diff = 2;
         }


@@ -846,9 +847,9 @@ bool wxToolBar::Realize()
             SetRows(m_nButtons);
         }
     }
             SetRows(m_nButtons);
         }
     }

-#endif
+#endif // 0

 
 

-    return TRUE;
+    return true;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -892,7 +893,7 @@ bool wxToolBar::MSWCommand(WXUINT WXUNUSED(cmd), WXWORD id)
         }
     }
 
         }
     }
 

-    return TRUE;
+    return true;

 }
 
 bool wxToolBar::MSWOnNotify(int WXUNUSED(idCtrl),
 }
 
 bool wxToolBar::MSWOnNotify(int WXUNUSED(idCtrl),


@@ -907,11 +908,11 @@ bool wxToolBar::MSWOnNotify(int WXUNUSED(idCtrl),
     // in an ANSI application - this seems to be a bug in comctl32.dll v5
     UINT code = hdr->code;
     if ( (code != (UINT) TTN_NEEDTEXTA) && (code != (UINT) TTN_NEEDTEXTW) )
     // in an ANSI application - this seems to be a bug in comctl32.dll v5
     UINT code = hdr->code;
     if ( (code != (UINT) TTN_NEEDTEXTA) && (code != (UINT) TTN_NEEDTEXTW) )

-        return FALSE;
+        return false;

 
     HWND toolTipWnd = (HWND)::SendMessage((HWND)GetHWND(), TB_GETTOOLTIPS, 0, 0);
     if ( toolTipWnd != hdr->hwndFrom )
 
     HWND toolTipWnd = (HWND)::SendMessage((HWND)GetHWND(), TB_GETTOOLTIPS, 0, 0);
     if ( toolTipWnd != hdr->hwndFrom )

-        return FALSE;
+        return false;

 
     LPTOOLTIPTEXT ttText = (LPTOOLTIPTEXT)lParam;
     int id = (int)ttText->hdr.idFrom;
 
     LPTOOLTIPTEXT ttText = (LPTOOLTIPTEXT)lParam;
     int id = (int)ttText->hdr.idFrom;


@@ -1031,7 +1032,7 @@ wxToolBarToolBase *wxToolBar::FindToolForPosition(wxCoord x, wxCoord y) const
 void wxToolBar::UpdateSize()
 {
     // the toolbar size changed
 void wxToolBar::UpdateSize()
 {
     // the toolbar size changed

-    SendMessage(GetHwnd(), TB_AUTOSIZE, 0, 0);
+    ::SendMessage(GetHwnd(), TB_AUTOSIZE, 0, 0);

 
     // we must also refresh the frame after the toolbar size (possibly) changed
     wxFrame *frame = wxDynamicCast(GetParent(), wxFrame);
 
     // we must also refresh the frame after the toolbar size (possibly) changed
     wxFrame *frame = wxDynamicCast(GetParent(), wxFrame);