Fix compilation under dll builds. Wrap source files in wxUSE_WEB checks to allow...

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

diff --git a/src/msw/wince/tbarwce.cpp b/src/msw/wince/tbarwce.cpp
index 04a1efc20f1581202ae47c55249c60780065946a..90da7a1ebd109aa944c1644231428b4d0e5f4792 100644 (file)
--- a/src/msw/wince/tbarwce.cpp
+++ b/src/msw/wince/tbarwce.cpp
@@ -42,7 +42,7 @@
     #include "wx/control.h"
 #endif
 
     #include "wx/control.h"
 #endif
 

-#if !defined(__GNUWIN32__) && !defined(__SALFORDC__)
+#if !defined(__GNUWIN32__)

     #include "malloc.h"
 #endif
 
     #include "malloc.h"
 #endif
 


@@ -202,7 +202,7 @@ bool wxToolMenuBar::MSWCreateToolbar(const wxPoint& WXUNUSED(pos),
         m_menuBar->SetToolBar(this);
 
     HWND hwndParent = GetHwndOf(GetParent());
         m_menuBar->SetToolBar(this);
 
     HWND hwndParent = GetHwndOf(GetParent());

-    wxCHECK_MSG( hwndParent, false, _T("should have valid parent HWND") );
+    wxCHECK_MSG( hwndParent, false, wxT("should have valid parent HWND") );

 
 #if defined(WINCE_WITHOUT_COMMANDBAR)
     // create the menubar.
 
 #if defined(WINCE_WITHOUT_COMMANDBAR)
     // create the menubar.


@@ -214,7 +214,7 @@ bool wxToolMenuBar::MSWCreateToolbar(const wxPoint& WXUNUSED(pos),
 
     if ( !SHCreateMenuBar(&mbi) )
     {
 
     if ( !SHCreateMenuBar(&mbi) )
     {

-        wxFAIL_MSG( _T("SHCreateMenuBar failed") );
+        wxFAIL_MSG( wxT("SHCreateMenuBar failed") );

         return false;
     }
 
         return false;
     }
 


@@ -272,6 +272,10 @@ bool wxToolMenuBar::DoInsertTool(size_t WXUNUSED(pos), wxToolBarToolBase *tool)
 
 bool wxToolMenuBar::DoDeleteTool(size_t pos, wxToolBarToolBase *tool)
 {
 
 bool wxToolMenuBar::DoDeleteTool(size_t pos, wxToolBarToolBase *tool)
 {

+    // Skip over the menus
+    if (GetMenuBar())
+        pos += GetMenuBar()->GetMenuCount();
+

     // the main difficulty we have here is with the controls in the toolbars:
     // as we (sometimes) use several separators to cover up the space used by
     // them, the indices are not the same for us and the toolbar
     // the main difficulty we have here is with the controls in the toolbars:
     // as we (sometimes) use several separators to cover up the space used by
     // them, the indices are not the same for us and the toolbar


@@ -304,7 +308,7 @@ bool wxToolMenuBar::DoDeleteTool(size_t pos, wxToolBarToolBase *tool)
     RECT r;
     if ( !::SendMessage(GetHwnd(), TB_GETITEMRECT, pos, (LPARAM)&r) )
     {
     RECT r;
     if ( !::SendMessage(GetHwnd(), TB_GETITEMRECT, pos, (LPARAM)&r) )
     {

-        wxLogLastError(_T("TB_GETITEMRECT"));
+        wxLogLastError(wxT("TB_GETITEMRECT"));

     }
 
     int width = r.right - r.left;
     }
 
     int width = r.right - r.left;


@@ -462,7 +466,7 @@ bool wxToolMenuBar::Realize()
                         break;
 
                     default:
                         break;
 
                     default:

-                        wxFAIL_MSG( _T("unexpected toolbar button kind") );
+                        wxFAIL_MSG( wxT("unexpected toolbar button kind") );

                         // fall through
 
                     case wxITEM_NORMAL:
                         // fall through
 
                     case wxITEM_NORMAL:


@@ -482,9 +486,11 @@ bool wxToolMenuBar::Realize()
     return true;
 }
 
     return true;
 }
 

-bool wxToolMenuBar::MSWCommand(WXUINT WXUNUSED(cmd), WXWORD id)
+bool wxToolMenuBar::MSWCommand(WXUINT WXUNUSED(cmd), WXWORD id_)

 {
 {

-    wxToolBarToolBase *tool = FindById((int)id);
+    const int id = (signed short)id_;
+
+    wxToolBarToolBase *tool = FindById(id);

     if ( !tool )
     {
         bool checked = false;
     if ( !tool )
     {
         bool checked = false;


@@ -519,7 +525,7 @@ bool wxToolMenuBar::MSWCommand(WXUINT WXUNUSED(cmd), WXWORD id)
     if ( !tool->CanBeToggled() || tool->GetKind() != wxITEM_RADIO || toggled )
     {
         // OnLeftClick() can veto the button state change - for buttons which
     if ( !tool->CanBeToggled() || tool->GetKind() != wxITEM_RADIO || toggled )
     {
         // OnLeftClick() can veto the button state change - for buttons which

-        // may be toggled only, of couse
+        // may be toggled only, of course.

         if ( !OnLeftClick((int)id, toggled) && tool->CanBeToggled() )
         {
             // revert back
         if ( !OnLeftClick((int)id, toggled) && tool->CanBeToggled() )
         {
             // revert back


@@ -638,7 +644,7 @@ void wxToolBar::DoToggleTool(wxToolBarToolBase *WXUNUSED(tool), bool WXUNUSED(to
 
 void wxToolBar::DoSetToggle(wxToolBarToolBase *WXUNUSED(tool), bool WXUNUSED(toggle))
 {
 
 void wxToolBar::DoSetToggle(wxToolBarToolBase *WXUNUSED(tool), bool WXUNUSED(toggle))
 {

-    wxFAIL_MSG( _T("not implemented") );
+    wxFAIL_MSG( wxT("not implemented") );

 }
 
 #endif
 }
 
 #endif