Minor parts from FM's wxDataViewCtrl patch.

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

diff --git a/src/msw/radiobox.cpp b/src/msw/radiobox.cpp
index d8f693b08973ba954730395bdbf90e84d6caa228..45424eb27e37cde7784ba9935b21ff6ddcde787d 100644 (file)
--- a/src/msw/radiobox.cpp
+++ b/src/msw/radiobox.cpp
@@ -26,10 +26,11 @@
 
 #if wxUSE_RADIOBOX
 
 
 #if wxUSE_RADIOBOX
 

+#include "wx/radiobox.h"
+

 #ifndef WX_PRECOMP
     #include "wx/bitmap.h"
     #include "wx/brush.h"
 #ifndef WX_PRECOMP
     #include "wx/bitmap.h"
     #include "wx/brush.h"

-    #include "wx/radiobox.h"

     #include "wx/settings.h"
     #include "wx/log.h"
 #endif
     #include "wx/settings.h"
     #include "wx/log.h"
 #endif


@@ -37,9 +38,6 @@
 #include "wx/msw/subwin.h"
 
 #if wxUSE_TOOLTIPS
 #include "wx/msw/subwin.h"
 
 #if wxUSE_TOOLTIPS

-    #if !defined(__GNUWIN32_OLD__) || defined(__CYGWIN10__)
-        #include <commctrl.h>
-    #endif

     #include "wx/tooltip.h"
 #endif // wxUSE_TOOLTIPS
 
     #include "wx/tooltip.h"
 #endif // wxUSE_TOOLTIPS
 


@@ -213,7 +211,7 @@ bool wxRadioBox::Create(wxWindow *parent,
     SetSize(pos.x, pos.y, size.x, size.y);
 
     // Now that we have items determine what is the best size and set it.
     SetSize(pos.x, pos.y, size.x, size.y);
 
     // Now that we have items determine what is the best size and set it.

-    SetBestSize(size);
+    SetInitialSize(size);

 
     return true;
 }
 
     return true;
 }


@@ -269,8 +267,8 @@ bool wxRadioBox::MSWCommand(WXUINT cmd, WXWORD id)
 
         int selectedButton = wxNOT_FOUND;
 
 
         int selectedButton = wxNOT_FOUND;
 

-        const size_t count = GetCount();
-        for ( size_t i = 0; i < count; i++ )
+        const unsigned int count = GetCount();
+        for ( unsigned int i = 0; i < count; i++ )

         {
             if ( id == wxGetWindowId((*m_radioButtons)[i]) )
             {
         {
             if ( id == wxGetWindowId((*m_radioButtons)[i]) )
             {


@@ -314,7 +312,7 @@ void wxRadioBox::SendNotificationEvent()
 {
     wxCommandEvent event(wxEVT_COMMAND_RADIOBOX_SELECTED, m_windowId);
     event.SetInt( m_selectedButton );
 {
     wxCommandEvent event(wxEVT_COMMAND_RADIOBOX_SELECTED, m_windowId);
     event.SetInt( m_selectedButton );

-    event.SetString( GetString(m_selectedButton) );
+    event.SetString(GetString(m_selectedButton));

     event.SetEventObject( this );
     ProcessCommand(event);
 }
     event.SetEventObject( this );
     ProcessCommand(event);
 }


@@ -323,12 +321,12 @@ void wxRadioBox::SendNotificationEvent()
 // simple accessors
 // ----------------------------------------------------------------------------
 
 // simple accessors
 // ----------------------------------------------------------------------------
 

-size_t wxRadioBox::GetCount() const
+unsigned int wxRadioBox::GetCount() const

 {
 {

-    return m_radioButtons->GetCount();
+    return m_radioButtons ? m_radioButtons->GetCount() : 0u;

 }
 
 }
 

-void wxRadioBox::SetString(int item, const wxString& label)
+void wxRadioBox::SetString(unsigned int item, const wxString& label)

 {
     wxCHECK_RET( IsValid(item), wxT("invalid radiobox index") );
 
 {
     wxCHECK_RET( IsValid(item), wxT("invalid radiobox index") );
 


@@ -355,7 +353,7 @@ void wxRadioBox::SetSelection(int N)
 }
 
 // Find string for position
 }
 
 // Find string for position

-wxString wxRadioBox::GetString(int item) const
+wxString wxRadioBox::GetString(unsigned int item) const

 {
     wxCHECK_MSG( IsValid(item), wxEmptyString,
                  wxT("invalid radiobox index") );
 {
     wxCHECK_MSG( IsValid(item), wxEmptyString,
                  wxT("invalid radiobox index") );


@@ -374,7 +372,7 @@ void wxRadioBox::SetFocus()
 }
 
 // Enable a specific button
 }
 
 // Enable a specific button

-bool wxRadioBox::Enable(int item, bool enable)
+bool wxRadioBox::Enable(unsigned int item, bool enable)

 {
     wxCHECK_MSG( IsValid(item), false,
                  wxT("invalid item in wxRadioBox::Enable()") );
 {
     wxCHECK_MSG( IsValid(item), false,
                  wxT("invalid item in wxRadioBox::Enable()") );


@@ -384,7 +382,7 @@ bool wxRadioBox::Enable(int item, bool enable)
     return (ret == 0) != enable;
 }
 
     return (ret == 0) != enable;
 }
 

-bool wxRadioBox::IsItemEnabled(int item) const
+bool wxRadioBox::IsItemEnabled(unsigned int item) const

 {
     wxCHECK_MSG( IsValid(item), false,
                  wxT("invalid item in wxRadioBox::IsItemEnabled()") );
 {
     wxCHECK_MSG( IsValid(item), false,
                  wxT("invalid item in wxRadioBox::IsItemEnabled()") );


@@ -393,7 +391,7 @@ bool wxRadioBox::IsItemEnabled(int item) const
 }
 
 // Show a specific button
 }
 
 // Show a specific button

-bool wxRadioBox::Show(int item, bool show)
+bool wxRadioBox::Show(unsigned int item, bool show)

 {
     wxCHECK_MSG( IsValid(item), false,
                  wxT("invalid item in wxRadioBox::Show()") );
 {
     wxCHECK_MSG( IsValid(item), false,
                  wxT("invalid item in wxRadioBox::Show()") );


@@ -409,7 +407,7 @@ bool wxRadioBox::Show(int item, bool show)
     return changed;
 }
 
     return changed;
 }
 

-bool wxRadioBox::IsItemShown(int item) const
+bool wxRadioBox::IsItemShown(unsigned int item) const

 {
     wxCHECK_MSG( IsValid(item), false,
                  wxT("invalid item in wxRadioBox::IsItemShown()") );
 {
     wxCHECK_MSG( IsValid(item), false,
                  wxT("invalid item in wxRadioBox::IsItemShown()") );


@@ -421,6 +419,25 @@ bool wxRadioBox::IsItemShown(int item) const
                             GWL_STYLE) & WS_VISIBLE) != 0;
 }
 
                             GWL_STYLE) & WS_VISIBLE) != 0;
 }
 

+#if wxUSE_TOOLTIPS
+
+bool wxRadioBox::HasToolTips() const
+{
+    return wxStaticBox::HasToolTips() || wxRadioBoxBase::HasItemToolTips();
+}
+
+void wxRadioBox::DoSetItemToolTip(unsigned int item, wxToolTip *tooltip)
+{
+    // we have already checked for the item to be valid in wxRadioBoxBase
+    const HWND hwndRbtn = (*m_radioButtons)[item];
+    if ( tooltip != NULL )
+        tooltip->Add(hwndRbtn);
+    else // unset the tooltip
+        wxToolTip::Remove(hwndRbtn);
+}
+
+#endif // wxUSE_TOOLTIPS
+

 WX_FORWARD_STD_METHODS_TO_SUBWINDOWS(wxRadioBox, wxStaticBox, m_radioButtons)
 
 // ----------------------------------------------------------------------------
 WX_FORWARD_STD_METHODS_TO_SUBWINDOWS(wxRadioBox, wxStaticBox, m_radioButtons)
 
 // ----------------------------------------------------------------------------


@@ -432,8 +449,8 @@ wxSize wxRadioBox::GetMaxButtonSize() const
     // calculate the max button size
     int widthMax = 0,
         heightMax = 0;
     // calculate the max button size
     int widthMax = 0,
         heightMax = 0;

-    const size_t count = GetCount();
-    for ( size_t i = 0 ; i < count; i++ )
+    const unsigned int count = GetCount();
+    for ( unsigned int i = 0 ; i < count; i++ )

     {
         int width, height;
         if ( m_radioWidth[i] < 0 )
     {
         int width, height;
         if ( m_radioWidth[i] < 0 )


@@ -478,7 +495,7 @@ wxSize wxRadioBox::GetTotalButtonSize(const wxSize& sizeBtn) const
 
     // and also wide enough for its label
     int widthLabel;
 
     // and also wide enough for its label
     int widthLabel;

-    GetTextExtent(wxStripMenuCodes(GetLabel()), &widthLabel, NULL);
+    GetTextExtent(GetLabelText(), &widthLabel, NULL);

     widthLabel += RADIO_SIZE; // FIXME this is bogus too
     if ( widthLabel > width )
         width = widthLabel;
     widthLabel += RADIO_SIZE; // FIXME this is bogus too
     if ( widthLabel > width )
         width = widthLabel;


@@ -488,6 +505,13 @@ wxSize wxRadioBox::GetTotalButtonSize(const wxSize& sizeBtn) const
 
 wxSize wxRadioBox::DoGetBestSize() const
 {
 
 wxSize wxRadioBox::DoGetBestSize() const
 {

+    if ( !m_radioButtons )
+    {
+        // if we're not fully initialized yet, we can't meaningfully compute
+        // our best size, we'll do it later
+        return wxSize(1, 1);
+    }
+

     wxSize best = GetTotalButtonSize(GetMaxButtonSize());
     CacheBestSize(best);
     return best;
     wxSize best = GetTotalButtonSize(GetMaxButtonSize());
     CacheBestSize(best);
     return best;


@@ -565,8 +589,8 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
     int startX = x_offset;
     int startY = y_offset;
 
     int startX = x_offset;
     int startY = y_offset;
 

-    const size_t count = GetCount();
-    for ( size_t i = 0; i < count; i++ )
+    const unsigned int count = GetCount();
+    for (unsigned int i = 0; i < count; i++)

     {
         // the last button in the row may be wider than the other ones as the
         // radiobox may be wider than the sum of the button widths (as it
     {
         // the last button in the row may be wider than the other ones as the
         // radiobox may be wider than the sum of the button widths (as it


@@ -576,7 +600,7 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
         {
             // item is the last in its row if it is a multiple of the number of
             // columns or if it is just the last item
         {
             // item is the last in its row if it is a multiple of the number of
             // columns or if it is just the last item

-            size_t n = i + 1;
+            unsigned int n = i + 1;

             isLastInTheRow = ((n % GetMajorDim()) == 0) || (n == count);
         }
         else // wxRA_SPECIFY_ROWS
             isLastInTheRow = ((n % GetMajorDim()) == 0) || (n == count);
         }
         else // wxRA_SPECIFY_ROWS


@@ -639,6 +663,23 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
     }
 }
 
     }
 }
 

+int wxRadioBox::GetItemFromPoint(const wxPoint& pt) const
+{
+    const unsigned int count = GetCount();
+    for ( unsigned int i = 0; i < count; i++ )
+    {
+        RECT rect = wxGetWindowRect((*m_radioButtons)[i]);
+
+        if ( rect.left <= pt.x && pt.x < rect.right &&
+                rect.top  <= pt.y && pt.y < rect.bottom )
+        {
+            return i;
+        }
+    }
+
+    return wxNOT_FOUND;
+}
+

 // ----------------------------------------------------------------------------
 // radio box drawing
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // radio box drawing
 // ----------------------------------------------------------------------------


@@ -651,8 +692,8 @@ WXHRGN wxRadioBox::MSWGetRegionWithoutChildren()
     ::GetWindowRect(GetHwnd(), &rc);
     HRGN hrgn = ::CreateRectRgn(rc.left, rc.top, rc.right + 1, rc.bottom + 1);
 
     ::GetWindowRect(GetHwnd(), &rc);
     HRGN hrgn = ::CreateRectRgn(rc.left, rc.top, rc.right + 1, rc.bottom + 1);
 

-    const size_t count = GetCount();
-    for ( size_t i = 0; i < count; ++i )
+    const unsigned int count = GetCount();
+    for ( unsigned int i = 0; i < count; ++i )

     {
         // don't clip out hidden children
         if ( !IsItemShown(i) )
     {
         // don't clip out hidden children
         if ( !IsItemShown(i) )


@@ -690,32 +731,6 @@ LRESULT APIENTRY _EXPORT wxRadioBtnWndProc(HWND hwnd,
                 return lDlgCode | DLGC_WANTARROWS;
             }
 
                 return lDlgCode | DLGC_WANTARROWS;
             }
 

-#if wxUSE_TOOLTIPS
-        case WM_NOTIFY:
-            {
-                NMHDR* hdr = (NMHDR *)lParam;
-                if ( hdr->code == TTN_NEEDTEXT )
-                {
-                    wxRadioBox *
-                        radiobox = (wxRadioBox *)wxGetWindowUserData(hwnd);
-
-                    wxCHECK_MSG( radiobox, 0,
-                                 wxT("radio button without radio box?") );
-
-                    wxToolTip *tooltip = radiobox->GetToolTip();
-                    if ( tooltip )
-                    {
-                        TOOLTIPTEXT *ttt = (TOOLTIPTEXT *)lParam;
-                        ttt->lpszText = (wxChar *)tooltip->GetTip().c_str();
-                    }
-
-                    // processed
-                    return 0;
-                }
-            }
-            break;
-#endif // wxUSE_TOOLTIPS
-

         case WM_KEYDOWN:
             {
                 wxRadioBox *radiobox = (wxRadioBox *)wxGetWindowUserData(hwnd);
         case WM_KEYDOWN:
             {
                 wxRadioBox *radiobox = (wxRadioBox *)wxGetWindowUserData(hwnd);