Merge in from trunk r64802 - r68625

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

diff --git a/src/palmos/radiobox.cpp b/src/palmos/radiobox.cpp
index 91febb54859f37335a654ed43f649adb0ff95685..2b5f2ce2562fcfb8e1639234dc3a7020d59fcd2d 100644 (file)
--- a/src/palmos/radiobox.cpp
+++ b/src/palmos/radiobox.cpp
@@ -17,10 +17,6 @@
 // headers
 // ---------------------------------------------------------------------------
 
 // headers
 // ---------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "radiobox.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -30,20 +26,20 @@
 
 #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"
     #include "wx/settings.h"
     #include "wx/log.h"

+    #include "wx/radiobut.h"

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

-#include "wx/radiobut.h"
-

 // TODO: wxCONSTRUCTOR
 #if 0 // wxUSE_EXTENDED_RTTI
 WX_DEFINE_FLAGS( wxRadioBoxStyle )
 // TODO: wxCONSTRUCTOR
 #if 0 // wxUSE_EXTENDED_RTTI
 WX_DEFINE_FLAGS( wxRadioBoxStyle )


@@ -77,10 +73,7 @@ wxBEGIN_FLAGS( wxRadioBoxStyle )
     wxFLAGS_MEMBER(wxHSCROLL)
 
     wxFLAGS_MEMBER(wxRA_SPECIFY_COLS)
     wxFLAGS_MEMBER(wxHSCROLL)
 
     wxFLAGS_MEMBER(wxRA_SPECIFY_COLS)

-    wxFLAGS_MEMBER(wxRA_HORIZONTAL)

     wxFLAGS_MEMBER(wxRA_SPECIFY_ROWS)
     wxFLAGS_MEMBER(wxRA_SPECIFY_ROWS)

-    wxFLAGS_MEMBER(wxRA_VERTICAL)
-

 wxEND_FLAGS( wxRadioBoxStyle )
 
 IMPLEMENT_DYNAMIC_CLASS_XTI(wxRadioBox, wxControl,"wx/radiobox.h")
 wxEND_FLAGS( wxRadioBoxStyle )
 
 IMPLEMENT_DYNAMIC_CLASS_XTI(wxRadioBox, wxControl,"wx/radiobox.h")


@@ -116,33 +109,11 @@ void wxRadioBox::Init()
     m_size = wxSize(0,0);
 }
 
     m_size = wxSize(0,0);
 }
 

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

 {
     return m_radios.GetCount();
 }
 
 {
     return m_radios.GetCount();
 }
 

-int wxRadioBox::GetColumnCount() const
-{
-    return 0;
-}
-
-int wxRadioBox::GetRowCount() const
-{
-    return 0;
-}
-
-// returns the number of rows
-int wxRadioBox::GetNumVer() const
-{
-    return 0;
-}
-
-// returns the number of columns
-int wxRadioBox::GetNumHor() const
-{
-    return 0;
-}
-

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


@@ -156,8 +127,10 @@ bool wxRadioBox::Create(wxWindow *parent,
                         const wxString& name)
 {
     // initialize members
                         const wxString& name)
 {
     // initialize members

-    m_majorDim = majorDim == 0 ? n : wxMin(majorDim, n);
-    if(m_majorDim==0 || n==0) return false;
+    SetMajorDim(majorDim == 0 ? n : majorDim, style);
+
+    if ( GetMajorDim() == 0 || n == 0 )
+        return false;

 
     // subtype of the native palmOS radio: checkbox or push button?
     const bool use_checkbox = style & wxRA_USE_CHECKBOX;
 
     // subtype of the native palmOS radio: checkbox or push button?
     const bool use_checkbox = style & wxRA_USE_CHECKBOX;


@@ -166,12 +139,13 @@ bool wxRadioBox::Create(wxWindow *parent,
     // get default size and position for the initial placement
     m_size = size;
     m_pos = pos;
     // get default size and position for the initial placement
     m_size = size;
     m_pos = pos;

-    int minor = n / m_majorDim;
-    if(n % m_majorDim > 0) minor++;
+    int minor = n / GetMajorDim();
+    if(n % GetMajorDim() > 0)
+        minor++;

     if(m_size.x==wxDefaultCoord)
     if(m_size.x==wxDefaultCoord)

-        m_size.x=36*(use_cols?m_majorDim:minor);
+        m_size.x=36*(use_cols?GetMajorDim():minor);

     if(m_size.y==wxDefaultCoord)
     if(m_size.y==wxDefaultCoord)

-        m_size.y=12*(use_cols?minor:m_majorDim);
+        m_size.y=12*(use_cols?minor:GetMajorDim());

     if(m_pos.x==wxDefaultCoord)
         m_pos.x=0;
     if(m_pos.y==wxDefaultCoord)
     if(m_pos.x==wxDefaultCoord)
         m_pos.x=0;
     if(m_pos.y==wxDefaultCoord)


@@ -183,17 +157,17 @@ bool wxRadioBox::Create(wxWindow *parent,
         return false;
 
     int i = 0;
         return false;
 
     int i = 0;

-    for ( int j = 0; j < minor; j++ )
+    for ( unsigned int j = 0; j < minor; j++ )

     {
     {

-        for ( int k = 0; k < m_majorDim; k++ )
+        for ( unsigned int k = 0; k < GetMajorDim(); k++ )

         {
             if(i<n)
             {
                 wxPoint start, end;
         {
             if(i<n)
             {
                 wxPoint start, end;

-                start.x = (use_cols ? (k*m_size.x)/m_majorDim : (j*m_size.x)/minor);
-                start.y = (use_cols ? (j*m_size.y)/minor : (k*m_size.y)/m_majorDim);
-                end.x = (use_cols ? ((k+1)*m_size.x)/m_majorDim : ((j+1)*m_size.x)/minor);
-                end.y = (use_cols ? ((j+1)*m_size.y)/minor : ((k+1)*m_size.y)/m_majorDim);
+                start.x = (use_cols ? (k*m_size.x)/GetMajorDim() : (j*m_size.x)/minor);
+                start.y = (use_cols ? (j*m_size.y)/minor : (k*m_size.y)/GetMajorDim());
+                end.x = (use_cols ? ((k+1)*m_size.x)/GetMajorDim() : ((j+1)*m_size.x)/minor);
+                end.y = (use_cols ? ((j+1)*m_size.y)/minor : ((k+1)*m_size.y)/GetMajorDim());

                 wxRadioButton* rb = new wxRadioButton();
                 rb->SetGroup( id );
                 rb->Create(
                 wxRadioButton* rb = new wxRadioButton();
                 rb->SetGroup( id );
                 rb->Create(


@@ -233,7 +207,7 @@ wxRadioBox::~wxRadioBox()
 {
 }
 
 {
 }
 

-wxRadioButton *wxRadioBox::GetRadioButton(int i)
+wxRadioButton *wxRadioBox::GetRadioButton(int i) const

 {
     return (wxRadioButton *)m_radios.Get(i);
 }
 {
     return (wxRadioButton *)m_radios.Get(i);
 }


@@ -252,27 +226,32 @@ void wxRadioBox::DoGetSize( int *width, int *height ) const
 
 void wxRadioBox::DoMoveWindow(int x, int y, int width, int height)
 {
 
 void wxRadioBox::DoMoveWindow(int x, int y, int width, int height)
 {

+    wxRect oldRect = GetRect();
+
+    m_pos.x = x;
+    m_pos.y = y;

     m_size.x = width;
     m_size.y = height;
 
     const bool use_cols = HasFlag(wxRA_SPECIFY_COLS);
 
     m_size.x = width;
     m_size.y = height;
 
     const bool use_cols = HasFlag(wxRA_SPECIFY_COLS);
 

-    const int n = GetCount();
-    int minor = n / m_majorDim;
-    if(n % m_majorDim > 0) minor++;
+    const unsigned int n = GetCount();
+    unsigned int minor = n / GetMajorDim();
+    if(n % GetMajorDim() > 0)
+        minor++;

 
 

-    int i = 0;
-    for ( int j = 0; j < minor; j++ )
+    unsigned int i = 0;
+    for ( unsigned int j = 0; j < minor; j++ )

     {
     {

-        for ( int k = 0; k < m_majorDim; k++ )
+        for ( unsigned int k = 0; k < GetMajorDim(); k++ )

         {
             if(i<n)
             {
                 wxPoint start, end;
         {
             if(i<n)
             {
                 wxPoint start, end;

-                start.x = (use_cols ? (k*m_size.x)/m_majorDim : (j*m_size.x)/minor);
-                start.y = (use_cols ? (j*m_size.y)/minor : (k*m_size.y)/m_majorDim);
-                end.x = (use_cols ? ((k+1)*m_size.x)/m_majorDim : ((j+1)*m_size.x)/minor);
-                end.y = (use_cols ? ((j+1)*m_size.y)/minor : ((k+1)*m_size.y)/m_majorDim);
+                start.x = (use_cols ? (k*m_size.x)/GetMajorDim() : (j*m_size.x)/minor);
+                start.y = (use_cols ? (j*m_size.y)/minor : (k*m_size.y)/GetMajorDim());
+                end.x = (use_cols ? ((k+1)*m_size.x)/GetMajorDim() : ((j+1)*m_size.x)/minor);
+                end.y = (use_cols ? ((j+1)*m_size.y)/minor : ((k+1)*m_size.y)/GetMajorDim());

                 wxRadioButton* rb = GetRadioButton(i);
                 if(rb)
                 {
                 wxRadioButton* rb = GetRadioButton(i);
                 if(rb)
                 {


@@ -282,16 +261,22 @@ void wxRadioBox::DoMoveWindow(int x, int y, int width, int height)
             }
         }
     }
             }
         }
     }

+
+    // refresh old and new area
+    GetParent()->RefreshRect(oldRect.Union(GetRect()));

 }
 
 // get the origin of the client area in the client coordinates
 wxPoint wxRadioBox::GetClientAreaOrigin() const
 {
 }
 
 // get the origin of the client area in the client coordinates
 wxPoint wxRadioBox::GetClientAreaOrigin() const
 {

-    return GetParent()->GetClientAreaOrigin() + GetPosition();
+    return GetPosition();

 }
 
 }
 

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

 {
 {

+    wxRadioButton *btn = GetRadioButton(item);
+    if(btn)
+        btn->SetLabel(label);

 }
 
 void wxRadioBox::SetSelection(int N)
 }
 
 void wxRadioBox::SetSelection(int N)


@@ -305,11 +290,12 @@ int wxRadioBox::GetSelection() const
 }
 
 // Find string for position
 }
 
 // Find string for position

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

 {
 {

-    wxString ret;
-
-    return ret;
+    wxRadioButton *btn = GetRadioButton(item);
+    if(btn)
+        return btn->GetLabel();
+    return wxEmptyString;

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


@@ -338,13 +324,13 @@ void wxRadioBox::SetFocus()
 // Enable all subcontrols
 bool wxRadioBox::Enable(bool enable)
 {
 // Enable all subcontrols
 bool wxRadioBox::Enable(bool enable)
 {

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

         Enable(i, enable);
     return true;
 }
 
 // Enable a specific button
         Enable(i, enable);
     return true;
 }
 
 // Enable a specific button

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

 {
     wxRadioButton *btn = GetRadioButton(item);
     if(btn)
 {
     wxRadioButton *btn = GetRadioButton(item);
     if(btn)


@@ -354,14 +340,21 @@ bool wxRadioBox::Enable(int item, bool enable)
 
 bool wxRadioBox::Show(bool show)
 {
 
 bool wxRadioBox::Show(bool show)
 {

-    // TODO
-    return false;
+    for(unsigned int i=0; i<GetCount(); i++)
+        Show(i, show);
+    return true;

 }
 
 // Show a specific button
 }
 
 // Show a specific button

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

 {
 {

-    // TODO
+    wxRadioButton *btn = GetRadioButton(item);
+    if(btn)
+    {
+        bool ret = btn->Show(show);
+        RefreshRect(btn->GetRect());
+        return ret;
+    }

     return false;
 }
 
     return false;
 }
 


@@ -385,7 +378,7 @@ void wxRadioBox::Refresh(bool eraseBack, const wxRect *rect)
         area.SetSize(rect->GetSize());
     }
 
         area.SetSize(rect->GetSize());
     }
 

-    GetParent()->Refresh( eraseBack , &area );
+    GetParent()->RefreshRect(area);

 }
 
 void wxRadioBox::Command(wxCommandEvent & event)
 }
 
 void wxRadioBox::Command(wxCommandEvent & event)