SWIGged updates for wxMac

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

diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp
index e0c800a45ad8dfb9664160b3c04333e6880c0fa1..004af499a59c84bc5b2f6316ed7ea246df30af20 100644 (file)
--- a/src/msw/tbar95.cpp
+++ b/src/msw/tbar95.cpp
@@ -101,6 +101,10 @@
     #define TBSTYLE_TRANSPARENT     0x8000
 #endif
 
     #define TBSTYLE_TRANSPARENT     0x8000
 #endif
 

+#ifndef TBSTYLE_TOOLTIPS
+    #define TBSTYLE_TOOLTIPS        0x0100
+#endif
+

 // Messages
 #ifndef TB_GETSTYLE
     #define TB_SETSTYLE             (WM_USER + 56)
 // Messages
 #ifndef TB_GETSTYLE
     #define TB_SETSTYLE             (WM_USER + 56)


@@ -138,14 +142,15 @@ class wxToolBarTool : public wxToolBarToolBase
 public:
     wxToolBarTool(wxToolBar *tbar,
                   int id,
 public:
     wxToolBarTool(wxToolBar *tbar,
                   int id,

-                  const wxBitmap& bitmap1,
-                  const wxBitmap& bitmap2,
-                  bool toggle,
+                  const wxString& label,
+                  const wxBitmap& bmpNormal,
+                  const wxBitmap& bmpDisabled,
+                  wxItemKind kind,

                   wxObject *clientData,
                   wxObject *clientData,

-                  const wxString& shortHelpString,
-                  const wxString& longHelpString)
-        : wxToolBarToolBase(tbar, id, bitmap1, bitmap2, toggle,
-                            clientData, shortHelpString, longHelpString)
+                  const wxString& shortHelp,
+                  const wxString& longHelp)
+        : wxToolBarToolBase(tbar, id, label, bmpNormal, bmpDisabled, kind,
+                            clientData, shortHelp, longHelp)

     {
         m_nSepCount = 0;
     }
     {
         m_nSepCount = 0;
     }


@@ -156,6 +161,19 @@ public:
         m_nSepCount = 1;
     }
 
         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; }
     // 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; }


@@ -175,15 +193,16 @@ private:
 // ----------------------------------------------------------------------------
 
 wxToolBarToolBase *wxToolBar::CreateTool(int id,
 // ----------------------------------------------------------------------------
 
 wxToolBarToolBase *wxToolBar::CreateTool(int id,

-                                         const wxBitmap& bitmap1,
-                                         const wxBitmap& bitmap2,
-                                         bool toggle,
+                                         const wxString& label,
+                                         const wxBitmap& bmpNormal,
+                                         const wxBitmap& bmpDisabled,
+                                         wxItemKind kind,

                                          wxObject *clientData,
                                          wxObject *clientData,

-                                         const wxString& shortHelpString,
-                                         const wxString& longHelpString)
+                                         const wxString& shortHelp,
+                                         const wxString& longHelp)

 {
 {

-    return new wxToolBarTool(this, id, bitmap1, bitmap2, toggle,
-                             clientData, shortHelpString, longHelpString);
+    return new wxToolBarTool(this, id, label, bmpNormal, bmpDisabled, kind,
+                             clientData, shortHelp, longHelp);

 }
 
 wxToolBarToolBase *wxToolBar::CreateTool(wxControl *control)
 }
 
 wxToolBarToolBase *wxToolBar::CreateTool(wxControl *control)


@@ -224,16 +243,12 @@ bool wxToolBar::Create(wxWindow *parent,
         return FALSE;
 
     // prepare flags
         return FALSE;
 
     // prepare flags

-    DWORD msflags = 0;      // WS_VISIBLE | WS_CHILD always included
+    DWORD msflags = TBSTYLE_TOOLTIPS;  // WS_VISIBLE | WS_CHILD always included

 
    if ( style & wxCLIP_SIBLINGS )
         msflags |= WS_CLIPSIBLINGS;
 
 
    if ( style & wxCLIP_SIBLINGS )
         msflags |= WS_CLIPSIBLINGS;
 

-#ifdef TBSTYLE_TOOLTIPS
-    msflags |= TBSTYLE_TOOLTIPS;
-#endif
-
-    if (style & wxTB_FLAT)
+    if ( style & wxTB_FLAT )

     {
         // static as it doesn't change during the program lifetime
         static int s_verComCtl = wxTheApp->GetComCtl32Version();
     {
         // static as it doesn't change during the program lifetime
         static int s_verComCtl = wxTheApp->GetComCtl32Version();


@@ -541,7 +556,6 @@ bool wxToolBar::Realize()
                 wxLogDebug(wxT("TB_DELETEBUTTON failed"));
             }
         }
                 wxLogDebug(wxT("TB_DELETEBUTTON failed"));
             }
         }

-

     }
 
     if ( addBitmap ) // no old bitmap or we can't replace it
     }
 
     if ( addBitmap ) // no old bitmap or we can't replace it


@@ -564,6 +578,7 @@ 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;

     int i = 0;
     for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
     {
     int i = 0;
     for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
     {


@@ -577,6 +592,7 @@ bool wxToolBar::Realize()
 
         wxZeroMemory(button);
 
 
         wxZeroMemory(button);
 

+        bool isRadio = FALSE;

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


@@ -590,6 +606,12 @@ bool wxToolBar::Realize()
 
             case wxTOOL_STYLE_BUTTON:
                 button.iBitmap = bitmapId;
 
             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() )
                 button.idCommand = tool->GetId();
 
                 if ( tool->IsEnabled() )


@@ -597,18 +619,46 @@ bool wxToolBar::Realize()
                 if ( tool->IsToggled() )
                     button.fsState |= TBSTATE_CHECKED;
 
                 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;
         }
 
 
                 bitmapId++;
                 break;
         }
 

+        lastWasRadio = isRadio;
+

         i++;
     }
 
         i++;
     }
 

-    if ( !::SendMessage(GetHwnd(), TB_ADDBUTTONS,
-                        (WPARAM)i, (LPARAM)buttons) )
+    if ( !::SendMessage(GetHwnd(), TB_ADDBUTTONS, (WPARAM)i, (LPARAM)buttons) )

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


@@ -781,15 +831,20 @@ bool wxToolBar::MSWCommand(WXUINT WXUNUSED(cmd), WXWORD id)
 
     bool toggled = tool->IsToggled();
 
 
     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;
     }
 
     return TRUE;


@@ -980,6 +1035,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
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // tool state
 // ----------------------------------------------------------------------------


@@ -1061,7 +1177,10 @@ bool wxToolBar::HandleSize(WXWPARAM wParam, WXLPARAM lParam)
         else
         {
             w = LOWORD(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...
             if ( m_maxRows )
             {
                 // FIXME: 6 is hardcoded separator line height...


@@ -1136,8 +1255,6 @@ bool wxToolBar::HandlePaint(WXWPARAM wParam, WXLPARAM lParam)
             // get the control rect in our client coords
             wxControl *control = tool->GetControl();
             wxRect rectCtrl = control->GetRect();
             // get the control rect in our client coords
             wxControl *control = tool->GetControl();
             wxRect rectCtrl = control->GetRect();

-            control->ClientToScreen(&rectCtrl.x, &rectCtrl.y);
-            ScreenToClient(&rectCtrl.x, &rectCtrl.y);

 
             // iterate over all buttons
             TBBUTTON tbb;
 
             // iterate over all buttons
             TBBUTTON tbb;