wxPython needs wxRTTI info for wxToolBarToolBase in order to return

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

diff --git a/src/univ/radiobox.cpp b/src/univ/radiobox.cpp
index 342374f9d28710befe6fe18f2521ac98c16f137a..c758abf74bae56eb5703cde99aa240051ed55315 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
 


@@ -36,6 +36,8 @@
     #include "wx/validate.h"
 #endif
 
     #include "wx/validate.h"
 #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"


@@ -151,6 +153,11 @@ 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);
 


@@ -303,12 +310,32 @@ void wxRadioBox::Show(int n, bool show)
 
 bool wxRadioBox::Enable(bool enable)
 {
 
 bool wxRadioBox::Enable(bool enable)
 {

-    return wxStaticBox::Enable(enable);
+    if ( !wxStaticBox::Enable(enable) )
+        return FALSE;
+
+    // also enable/disable the buttons
+    size_t count = m_buttons.GetCount();
+    for ( size_t n = 0; n < count; n++ )
+    {
+        Enable(n, enable);
+    }
+
+    return TRUE;

 }
 
 bool wxRadioBox::Show(bool show)
 {
 }
 
 bool wxRadioBox::Show(bool show)
 {

-    return wxStaticBox::Show(show);
+    if ( !wxStaticBox::Show(show) )
+        return FALSE;
+
+    // also show/hide the buttons
+    size_t count = m_buttons.GetCount();
+    for ( size_t n = 0; n < count; n++ )
+    {
+        Show(n, show);
+    }
+
+    return TRUE;

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


@@ -321,6 +348,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
 // ----------------------------------------------------------------------------


@@ -369,9 +413,10 @@ void wxRadioBox::DoMoveWindow(int x0, int y0, int width, int height)
 
     wxSize sizeBtn = GetMaxButtonSize();
     wxPoint ptOrigin = GetBoxAreaOrigin();
 
     wxSize sizeBtn = GetMaxButtonSize();
     wxPoint ptOrigin = GetBoxAreaOrigin();

+    wxPoint clientOrigin = GetParent() ? GetParent()->GetClientAreaOrigin() : wxPoint(0,0);

 
 

-    x0 += ptOrigin.x + BOX_BORDER_X;
-    y0 += ptOrigin.y + BOX_BORDER_Y;
+    x0 += ptOrigin.x + BOX_BORDER_X - clientOrigin.x;
+    y0 += ptOrigin.y + BOX_BORDER_Y - clientOrigin.y;

 
     int x = x0,
         y = y0;
 
     int x = x0,
         y = y0;