Some change logs

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

diff --git a/src/univ/radiobox.cpp b/src/univ/radiobox.cpp
index 249fba0b252985e37445d3eed54f367c1842e2bd..bb6aa6eda12af41d954e51e2b39cacf99f81c21a 100644 (file)
--- a/src/univ/radiobox.cpp
+++ b/src/univ/radiobox.cpp
@@ -6,7 +6,7 @@
 // Created:     11.09.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
 // Created:     11.09.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "univradiobox.h"
 #endif
 
     #pragma implementation "univradiobox.h"
 #endif
 


@@ -34,8 +34,11 @@
     #include "wx/radiobox.h"
     #include "wx/radiobut.h"
     #include "wx/validate.h"
     #include "wx/radiobox.h"
     #include "wx/radiobut.h"
     #include "wx/validate.h"

+    #include "wx/arrstr.h"

 #endif
 
 #endif
 

+#include "wx/tooltip.h"
+

 #include "wx/univ/theme.h"
 #include "wx/univ/renderer.h"
 #include "wx/univ/inphand.h"
 #include "wx/univ/theme.h"
 #include "wx/univ/renderer.h"
 #include "wx/univ/inphand.h"


@@ -71,7 +74,7 @@ public:
         {
             if ( m_radio->OnKeyDown((wxKeyEvent &)event) )
             {
         {
             if ( m_radio->OnKeyDown((wxKeyEvent &)event) )
             {

-                return TRUE;
+                return true;

             }
         }
 
             }
         }
 


@@ -99,6 +102,37 @@ void wxRadioBox::Init()
     m_majorDim = 0;
 }
 
     m_majorDim = 0;
 }
 

+wxRadioBox::wxRadioBox(wxWindow *parent, wxWindowID id, const wxString& title,
+                       const wxPoint& pos, const wxSize& size,
+                       const wxArrayString& choices,
+                       int majorDim, long style,
+                       const wxValidator& val, const wxString& name)
+{
+    wxCArrayString chs(choices);
+
+    Init();
+
+    (void)Create(parent, id, title, pos, size, chs.GetCount(),
+                 chs.GetStrings(), majorDim, style, val, name);
+}
+
+bool wxRadioBox::Create(wxWindow *parent,
+                        wxWindowID id,
+                        const wxString& title,
+                        const wxPoint& pos,
+                        const wxSize& size,
+                        const wxArrayString& choices,
+                        int majorDim,
+                        long style,
+                        const wxValidator& val,
+                        const wxString& name)
+{
+    wxCArrayString chs(choices);
+
+    return Create(parent, id, title, pos, size, chs.GetCount(),
+                  chs.GetStrings(), majorDim, style, val, name);
+}
+

 bool wxRadioBox::Create(wxWindow *parent,
                         wxWindowID id,
                         const wxString& title,
 bool wxRadioBox::Create(wxWindow *parent,
                         wxWindowID id,
                         const wxString& title,


@@ -108,7 +142,7 @@ bool wxRadioBox::Create(wxWindow *parent,
                         const wxString *choices,
                         int majorDim,
                         long style,
                         const wxString *choices,
                         int majorDim,
                         long style,

-                        const wxValidator& val,
+                        const wxValidator& wxVALIDATOR_PARAM(val),

                         const wxString& name)
 {
     // for compatibility with the other ports which don't handle (yet?)
                         const wxString& name)
 {
     // for compatibility with the other ports which don't handle (yet?)


@@ -135,7 +169,7 @@ bool wxRadioBox::Create(wxWindow *parent,
     }
 
     if ( !wxStaticBox::Create(parent, id, title, pos, size, style, name) )
     }
 
     if ( !wxStaticBox::Create(parent, id, title, pos, size, style, name) )

-        return FALSE;
+        return false;

 
 #if wxUSE_VALIDATORS
     SetValidator(val);
 
 #if wxUSE_VALIDATORS
     SetValidator(val);


@@ -151,10 +185,15 @@ bool wxRadioBox::Create(wxWindow *parent,
         SetClientSize(DoGetBestClientSize());
     }
 
         SetClientSize(DoGetBestClientSize());
     }
 

+    // Need to move the radiobox in order to move the radio buttons
+    wxPoint actualPos = GetPosition();
+    wxSize actualSize = GetSize();
+    DoMoveWindow(actualPos.x, actualPos.y, actualSize.x, actualSize.y);
+

     // radiobox should already have selection so select at least one item
     SetSelection(0);
 
     // radiobox should already have selection so select at least one item
     SetSelection(0);
 

-    return TRUE;
+    return true;

 }
 
 wxRadioBox::~wxRadioBox()
 }
 
 wxRadioBox::~wxRadioBox()


@@ -166,7 +205,7 @@ wxRadioBox::~wxRadioBox()
     size_t count = m_buttons.GetCount();
     for ( size_t n = 0; n < count; n++ )
     {
     size_t count = m_buttons.GetCount();
     for ( size_t n = 0; n < count; n++ )
     {

-        m_buttons[n]->PopEventHandler(TRUE /* delete it */);
+        m_buttons[n]->PopEventHandler(true /* delete it */);

 
         delete m_buttons[n];
     }
 
         delete m_buttons[n];
     }


@@ -207,7 +246,7 @@ void wxRadioBox::Append(int count, const wxString *choices)
     {
         // make the first button in the box the start of new group by giving it
         // wxRB_GROUP style
     {
         // make the first button in the box the start of new group by giving it
         // wxRB_GROUP style

-        wxRadioButton *btn = new wxRadioButton(parent, -1, choices[n],
+        wxRadioButton *btn = new wxRadioButton(parent, wxID_ANY, choices[n],

                                                wxDefaultPosition,
                                                wxDefaultSize,
                                                n == 0 ? wxRB_GROUP : 0);
                                                wxDefaultPosition,
                                                wxDefaultSize,
                                                n == 0 ? wxRB_GROUP : 0);


@@ -234,7 +273,7 @@ void wxRadioBox::SetSelection(int n)
     btn->SetFocus();
 
     // this will also unselect the previously selected button in our group
     btn->SetFocus();
 
     // this will also unselect the previously selected button in our group

-    btn->SetValue(TRUE);
+    btn->SetValue(true);

 }
 
 int wxRadioBox::GetSelection() const
 }
 
 int wxRadioBox::GetSelection() const


@@ -270,7 +309,7 @@ void wxRadioBox::OnRadioButton(wxEvent& event)
 
 wxString wxRadioBox::GetString(int n) const
 {
 
 wxString wxRadioBox::GetString(int n) const
 {

-    wxCHECK_MSG( IsValid(n), _T(""),
+    wxCHECK_MSG( IsValid(n), wxEmptyString,

                  _T("invalid index in wxRadioBox::GetString") );
 
     return m_buttons[n]->GetLabel();
                  _T("invalid index in wxRadioBox::GetString") );
 
     return m_buttons[n]->GetLabel();


@@ -283,18 +322,18 @@ void wxRadioBox::SetString(int n, const wxString& label)
     m_buttons[n]->SetLabel(label);
 }
 
     m_buttons[n]->SetLabel(label);
 }
 

-void wxRadioBox::Enable(int n, bool enable)
+bool wxRadioBox::Enable(int n, bool enable)

 {
 {

-    wxCHECK_RET( IsValid(n), _T("invalid index in wxRadioBox::Enable") );
+    wxCHECK_MSG( IsValid(n), false, _T("invalid index in wxRadioBox::Enable") );

 
 

-    m_buttons[n]->Enable(enable);
+    return m_buttons[n]->Enable(enable);

 }
 
 }
 

-void wxRadioBox::Show(int n, bool show)
+bool wxRadioBox::Show(int n, bool show)

 {
 {

-    wxCHECK_RET( IsValid(n), _T("invalid index in wxRadioBox::Show") );
+    wxCHECK_MSG( IsValid(n), false, _T("invalid index in wxRadioBox::Show") );

 
 

-    m_buttons[n]->Show(show);
+    return m_buttons[n]->Show(show);

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


@@ -304,7 +343,7 @@ void wxRadioBox::Show(int n, bool show)
 bool wxRadioBox::Enable(bool enable)
 {
     if ( !wxStaticBox::Enable(enable) )
 bool wxRadioBox::Enable(bool enable)
 {
     if ( !wxStaticBox::Enable(enable) )

-        return FALSE;
+        return false;

 
     // also enable/disable the buttons
     size_t count = m_buttons.GetCount();
 
     // also enable/disable the buttons
     size_t count = m_buttons.GetCount();


@@ -313,13 +352,13 @@ bool wxRadioBox::Enable(bool enable)
         Enable(n, enable);
     }
 
         Enable(n, enable);
     }
 

-    return TRUE;
+    return true;

 }
 
 bool wxRadioBox::Show(bool show)
 {
     if ( !wxStaticBox::Show(show) )
 }
 
 bool wxRadioBox::Show(bool show)
 {
     if ( !wxStaticBox::Show(show) )

-        return FALSE;
+        return false;

 
     // also show/hide the buttons
     size_t count = m_buttons.GetCount();
 
     // also show/hide the buttons
     size_t count = m_buttons.GetCount();


@@ -328,7 +367,7 @@ bool wxRadioBox::Show(bool show)
         Show(n, show);
     }
 
         Show(n, show);
     }
 

-    return TRUE;
+    return true;

 }
 
 wxString wxRadioBox::GetLabel() const
 }
 
 wxString wxRadioBox::GetLabel() const


@@ -341,6 +380,23 @@ void wxRadioBox::SetLabel(const wxString& label)
     wxStaticBox::SetLabel(label);
 }
 
     wxStaticBox::SetLabel(label);
 }
 

+#if wxUSE_TOOLTIPS
+void wxRadioBox::DoSetToolTip(wxToolTip *tooltip)
+{
+    wxControl::DoSetToolTip(tooltip);
+
+    // Also set them for all Radio Buttons
+    size_t count = m_buttons.GetCount();
+    for ( size_t n = 0; n < count; n++ )
+    {
+        if (tooltip)
+            m_buttons[n]->SetToolTip(tooltip->GetTip());
+        else
+            m_buttons[n]->SetToolTip(NULL);
+    }
+}
+#endif // wxUSE_TOOLTIPS
+

 // ----------------------------------------------------------------------------
 // buttons positioning
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // buttons positioning
 // ----------------------------------------------------------------------------


@@ -461,7 +517,7 @@ bool wxRadioBox::OnKeyDown(wxKeyEvent& event)
             break;
 
         default:
             break;
 
         default:

-            return FALSE;
+            return false;

     }
 
     int selOld = GetSelection();
     }
 
     int selOld = GetSelection();


@@ -474,7 +530,7 @@ bool wxRadioBox::OnKeyDown(wxKeyEvent& event)
         SendRadioEvent();
     }
 
         SendRadioEvent();
     }
 

-    return TRUE;
+    return true;

 }
 
 #endif // wxUSE_RADIOBOX
 }
 
 #endif // wxUSE_RADIOBOX