some wxArtProv docs

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

diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp
index 0efea2ffc0a2c95a50c1eed216fe81bbf2f78004..7c6515ff121ade578094738c8e1286391acfa22e 100644 (file)
--- a/src/msw/tbar95.cpp
+++ b/src/msw/tbar95.cpp
@@ -161,6 +161,19 @@ public:
         m_nSepCount = 1;
     }
 
+    virtual void SetLabel(const wxString& label)
+    {
+        if ( label == m_label )
+            return;
+
+        wxToolBarToolBase::SetLabel(label);
+
+        // we need to update the label shown in the toolbar because it has a
+        // pointer to the internal buffer of the old label
+        //
+        // TODO: use TB_SETBUTTONINFO
+    }
+
     // set/get the number of separators which we use to cover the space used by
     // a control in the toolbar
     void SetSeparatorsCount(size_t count) { m_nSepCount = count; }
@@ -249,6 +262,10 @@ bool wxToolBar::Create(wxWindow *parent,
             msflags |= TBSTYLE_FLAT | TBSTYLE_TRANSPARENT;
         }
     }
+    if (style & wxTB_NODIVIDER)
+        msflags |= CCS_NODIVIDER;
+    if (style & wxTB_NOALIGN)
+        msflags |= CCS_NOPARENTALIGN;
 
     // MSW-specific initialisation
     if ( !wxControl::MSWCreateControl(TOOLBARCLASSNAME, msflags) )
@@ -543,7 +560,6 @@ bool wxToolBar::Realize()
                 wxLogDebug(wxT("TB_DELETEBUTTON failed"));
             }
         }
-
     }
 
     if ( addBitmap ) // no old bitmap or we can't replace it
@@ -566,6 +582,7 @@ bool wxToolBar::Realize()
     // this array will hold the indices of all controls in the toolbar
     wxArrayInt controlIds;
 
+    bool lastWasRadio = FALSE;
     int i = 0;
     for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
     {
@@ -579,6 +596,7 @@ bool wxToolBar::Realize()
 
         wxZeroMemory(button);
 
+        bool isRadio = FALSE;
         switch ( tool->GetStyle() )
         {
             case wxTOOL_STYLE_CONTROL:
@@ -592,6 +610,12 @@ bool wxToolBar::Realize()
 
             case wxTOOL_STYLE_BUTTON:
                 button.iBitmap = bitmapId;
+
+                if ( HasFlag(wxTB_TEXT) && !tool->GetLabel().empty() )
+                {
+                    button.iString = (int)tool->GetLabel().c_str();
+                }
+
                 button.idCommand = tool->GetId();
 
                 if ( tool->IsEnabled() )
@@ -599,13 +623,42 @@ bool wxToolBar::Realize()
                 if ( tool->IsToggled() )
                     button.fsState |= TBSTATE_CHECKED;
 
-                button.fsStyle = tool->CanBeToggled() ? TBSTYLE_CHECK
-                                                      : TBSTYLE_BUTTON;
+                switch ( tool->GetKind() )
+                {
+                    case wxITEM_RADIO:
+                        button.fsStyle = TBSTYLE_CHECKGROUP;
+
+                        if ( !lastWasRadio )
+                        {
+                            // the first item in the radio group is checked by
+                            // default to be consistent with wxGTK and the menu
+                            // radio items
+                            button.fsState |= TBSTATE_CHECKED;
+
+                            tool->Toggle(TRUE);
+                        }
+
+                        isRadio = TRUE;
+                        break;
+
+                    case wxITEM_CHECK:
+                        button.fsStyle = TBSTYLE_CHECK;
+                        break;
+
+                    default:
+                        wxFAIL_MSG( _T("unexpected toolbar button kind") );
+                        // fall through
+
+                    case wxITEM_NORMAL:
+                        button.fsStyle = TBSTYLE_BUTTON;
+                }
 
                 bitmapId++;
                 break;
         }
 
+        lastWasRadio = isRadio;
+
         i++;
     }
 
@@ -782,15 +835,20 @@ bool wxToolBar::MSWCommand(WXUINT WXUNUSED(cmd), WXWORD id)
 
     bool toggled = tool->IsToggled();
 
-    // OnLeftClick() can veto the button state change - for buttons which may
-    // be toggled only, of couse
-    if ( !OnLeftClick((int)id, toggled) && tool->CanBeToggled() )
+    // avoid sending the event when a radio button is released, this is not
+    // interesting
+    if ( !tool->CanBeToggled() || tool->GetKind() != wxITEM_RADIO || toggled )
     {
-        // revert back
-        toggled = !toggled;
-        tool->SetToggle(toggled);
+        // OnLeftClick() can veto the button state change - for buttons which
+        // may be toggled only, of couse
+        if ( !OnLeftClick((int)id, toggled) && tool->CanBeToggled() )
+        {
+            // revert back
+            toggled = !toggled;
+            tool->SetToggle(toggled);
 
-        ::SendMessage(GetHwnd(), TB_CHECKBUTTON, id, MAKELONG(toggled, 0));
+            ::SendMessage(GetHwnd(), TB_CHECKBUTTON, id, MAKELONG(toggled, 0));
+        }
     }
 
     return TRUE;
@@ -981,6 +1039,67 @@ void wxToolBar::UpdateSize()
     }
 }
 
+// ----------------------------------------------------------------------------
+// toolbar styles
+// ---------------------------------------------------------------------------
+
+void wxToolBar::SetWindowStyleFlag(long style)
+{
+    // there doesn't seem to be any reasonably simple way to prevent the
+    // toolbar from showing the icons so for now we don't honour wxTB_NOICONS
+    if ( (style & wxTB_TEXT) != (GetWindowStyle() & wxTB_TEXT) )
+    {
+        // update the strings of all toolbar buttons
+        //
+        // NB: we can only do it using TB_SETBUTTONINFO which is available
+        //     in comctl32.dll >= 4.71 only
+#if defined(_WIN32_IE) && (_WIN32_IE >= 0x400 )
+        if ( wxTheApp->GetComCtl32Version() >= 471 )
+        {
+            // set the (underlying) separators width to be that of the
+            // control
+            TBBUTTONINFO tbbi;
+            tbbi.cbSize = sizeof(tbbi);
+            tbbi.dwMask = TBIF_TEXT;
+            if ( !(style & wxTB_TEXT) )
+            {
+                // don't show the text - remove the labels
+                tbbi.pszText = NULL;
+            }
+
+            for ( wxToolBarToolsList::Node *node = m_tools.GetFirst();
+                  node;
+                  node = node->GetNext() )
+            {
+                wxToolBarToolBase *tool = node->GetData();
+                if ( !tool->IsButton() )
+                {
+                    continue;
+                }
+
+                if ( style & wxTB_TEXT )
+                {
+                    // cast is harmless
+                    tbbi.pszText = (wxChar *)tool->GetLabel().c_str();
+                }
+
+                if ( !SendMessage(GetHwnd(), TB_SETBUTTONINFO,
+                                  tool->GetId(), (LPARAM)&tbbi) )
+                {
+                    // the id is probably invalid?
+                    wxLogLastError(wxT("TB_SETBUTTONINFO"));
+                }
+            }
+
+            UpdateSize();
+            Refresh();
+        }
+#endif // comctl32.dll 4.71
+    }
+
+    wxToolBarBase::SetWindowStyleFlag(style);
+}
+
 // ----------------------------------------------------------------------------
 // tool state
 // ----------------------------------------------------------------------------
@@ -1062,11 +1181,18 @@ bool wxToolBar::HandleSize(WXWPARAM wParam, WXLPARAM lParam)
         else
         {
             w = LOWORD(lParam);
-            h = r.bottom - r.top;
+            if (HasFlag( wxTB_FLAT ))
+                h = r.bottom - r.top - 3;
+            else
+                h = r.bottom - r.top;
             if ( m_maxRows )
             {
                 // FIXME: 6 is hardcoded separator line height...
-                h += 6;
+                //h += 6;
+                if (HasFlag(wxTB_NODIVIDER))
+                    h += 3;
+                else
+                    h += 6;
                 h *= m_maxRows;
             }
         }