backported crash fix for wxFrame::Iconize() from 2.2

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

diff --git a/src/mac/radiobox.cpp b/src/mac/radiobox.cpp
index d00911c8fd4347471c50f6d0b953ec8db95c24f7..f2651ba5945afca59b967d3a0a7e8fbdb4c7f438 100644 (file)
--- a/src/mac/radiobox.cpp
+++ b/src/mac/radiobox.cpp
@@ -14,11 +14,15 @@
 //-------------------------------------------------------------------------------------
 
 #ifdef __GNUG__
 //-------------------------------------------------------------------------------------
 
 #ifdef __GNUG__

-#pragma implementation "radiobox.h"
+  #pragma implementation "radioboxbase.h"
+  #pragma implementation "radiobox.h"

 #endif
 
 #endif
 

+#include "wx/defs.h"
+

 #include "wx/radiobox.h"
 #include "wx/radiobox.h"

-#include <wx/mac/uma.h>
+#include "wx/radiobut.h"
+#include "wx/mac/uma.h"

 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl)
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl)


@@ -31,6 +35,22 @@ IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl)
 //             ¥ wxRadioBox()
 //-------------------------------------------------------------------------------------
 // Default constructor
 //             ¥ wxRadioBox()
 //-------------------------------------------------------------------------------------
 // Default constructor

+BEGIN_EVENT_TABLE(wxRadioBox, wxControl)
+EVT_RADIOBUTTON( -1 , wxRadioBox::OnRadioButton )
+END_EVENT_TABLE()
+
+void wxRadioBox::OnRadioButton( wxCommandEvent &outer )
+{
+  if ( outer.IsChecked() )
+  {
+    wxCommandEvent event(wxEVT_COMMAND_RADIOBOX_SELECTED, m_windowId);
+    int i = GetSelection() ;
+    event.SetInt( i );
+    event.SetString( GetString( i ) );
+    event.SetEventObject( this );
+    ProcessCommand(event);
+  }
+}

 
 wxRadioBox::wxRadioBox()
 {
 
 wxRadioBox::wxRadioBox()
 {


@@ -95,17 +115,20 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
        Rect bounds ;
        Str255 title ;
        
        Rect bounds ;
        Str255 title ;
        

-       MacPreControlCreate( parent , id ,  label , pos , size ,style, *((wxValidator*)NULL) , name , &bounds , title ) ;
+       MacPreControlCreate( parent , id ,  label , pos , size ,style, val , name , &bounds , title ) ;

 
 

-       m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , true , 0 , 0 , 1, 
+       m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , false , 0 , 0 , 1, 

                kControlGroupBoxTextTitleProc , (long) this ) ;
        
        MacPostControlCreate() ;
 
     for (i = 0; i < n; i++)
     {
                kControlGroupBoxTextTitleProc , (long) this ) ;
        
        MacPostControlCreate() ;
 
     for (i = 0; i < n; i++)
     {

-        wxRadioButton *radBtn = new wxRadioButton(this, NewControlId(),choices[i],wxPoint(5,20*i+10));
-        m_radioButtonCycle=radBtn->AddInCycle(m_radioButtonCycle);
+        wxRadioButton *radBtn = new wxRadioButton(this, NewControlId(),choices[i],wxPoint(5,20*i+10),
+          wxDefaultSize , i == 0 ? wxRB_GROUP : 0 ) ;
+        if ( i == 0 )
+          m_radioButtonCycle = radBtn ;
+//        m_radioButtonCycle=radBtn->AddInCycle(m_radioButtonCycle);

     }
 
        SetSelection(0);
     }
 
        SetSelection(0);


@@ -123,18 +146,20 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
 //-------------------------------------------------------------------------------------
 // Enables or disables the entire radiobox
 
 //-------------------------------------------------------------------------------------
 // Enables or disables the entire radiobox
 

-void wxRadioBox::Enable(bool enable)
+bool wxRadioBox::Enable(bool enable)

 {
        int i;
     wxRadioButton *current;
     
 {
        int i;
     wxRadioButton *current;
     

-    wxControl::Enable(enable);
+    if (!wxControl::Enable(enable))
+       return (false);

 
     current=m_radioButtonCycle;
        for (i=0;i<m_noItems;i++) {
        current->Enable(enable);
        current=current->NextInCycle();
        }
 
     current=m_radioButtonCycle;
        for (i=0;i<m_noItems;i++) {
        current->Enable(enable);
        current=current->NextInCycle();
        }

+    return (true);

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


@@ -155,29 +180,6 @@ void wxRadioBox::Enable(int item, bool enable)
        i++;
        current=current->NextInCycle();
        }
        i++;
        current=current->NextInCycle();
        }

-    return current->Enable(enable);
-}
-
-
-//-------------------------------------------------------------------------------------
-//             ¥ FindString
-//-------------------------------------------------------------------------------------
-// Finds a button matching the given string, returning the position if found 
-// or -1 if not found
-
-int wxRadioBox::FindString(const wxString& s) const
-{
-    int i;
-    wxRadioButton *current;
-    
-    current=m_radioButtonCycle;
-    for (i = 0; i < m_noItems; i++)
-    {
-        if (s == current->GetLabel())
-            return i;
-       current=current->NextInCycle();
-    }
-    return -1;

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


@@ -195,7 +197,7 @@ wxString wxRadioBox::GetLabel() const
 //-------------------------------------------------------------------------------------
 // Returns the label for the given button
 
 //-------------------------------------------------------------------------------------
 // Returns the label for the given button
 

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

 {
        int i;
     wxRadioButton *current;
 {
        int i;
     wxRadioButton *current;


@@ -231,31 +233,6 @@ int wxRadioBox::GetSelection() const
     return i;
 }
 
     return i;
 }
 

-//-------------------------------------------------------------------------------------
-//             ¥ GetString
-//-------------------------------------------------------------------------------------
-// Find string for position
-
-wxString wxRadioBox::GetString(int item) const
-{
-
-    return GetLabel(item);
-}
-
-//-------------------------------------------------------------------------------------
-//             ¥ GetStringSelection
-//-------------------------------------------------------------------------------------
-// Returns the selected string
-
-wxString wxRadioBox::GetStringSelection () const
-{
-    int sel = GetSelection ();
-    if (sel > -1)
-        return this->GetString (sel);
-    else
-        return wxString("");
-}
-

 //-------------------------------------------------------------------------------------
 //             ¥ Number
 //-------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------
 //             ¥ Number
 //-------------------------------------------------------------------------------------


@@ -279,7 +256,7 @@ void wxRadioBox::SetLabel(const wxString& label)
 //-------------------------------------------------------------------------------------
 // Sets the label of a given button
 
 //-------------------------------------------------------------------------------------
 // Sets the label of a given button
 

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

 {
        int i;
     wxRadioButton *current;
 {
        int i;
     wxRadioButton *current;


@@ -318,24 +295,6 @@ void wxRadioBox::SetSelection(int item)
     
 }
 
     
 }
 

-//-------------------------------------------------------------------------------------
-//             ¥ SetStringSelection
-//-------------------------------------------------------------------------------------
-// Sets a button by passing the desired string. This does not cause 
-// wxEVT_COMMAND_RADIOBOX_SELECTED event to get emitted
-
-bool wxRadioBox::SetStringSelection (const wxString& s)
-{
-    int sel = FindString (s);
-    if (sel > -1)
-    {
-        SetSelection (sel);
-        return TRUE;
-    }
-    else
-        return FALSE;
-}
-

 //-------------------------------------------------------------------------------------
 //             ¥ Show(bool)
 //-------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------
 //             ¥ Show(bool)
 //-------------------------------------------------------------------------------------


@@ -419,7 +378,7 @@ void wxRadioBox::SetFocus()
 //-------------------------------------------------------------------------------------
 // Simulates the effect of the user issuing a command to the item
 
 //-------------------------------------------------------------------------------------
 // Simulates the effect of the user issuing a command to the item
 

-#define RADIO_SIZE 20
+#define RADIO_SIZE 40

 
 void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 {
 
 void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 {


@@ -430,13 +389,15 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 
        int x_current, y_current;
        int x_offset,y_offset;
 
        int x_current, y_current;
        int x_offset,y_offset;

+    int widthOld, heightOld;
+    GetSize(&widthOld, &heightOld);

 
        x_offset = x;
        y_offset = y;
        GetPosition(&x_current, &y_current);
 
        x_offset = x;
        y_offset = y;
        GetPosition(&x_current, &y_current);

-       if ((x == -1) || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+       if ((x == -1) && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))

                x_offset = x_current;
                x_offset = x_current;

-       if ((y == -1) || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+       if ((y == -1)&& !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))

                y_offset = y_current;
 
 // define size
                y_offset = y_current;
 
 // define size


@@ -454,17 +415,34 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
        maxHeight=-1;
        for (i = 0 ; i < m_noItems; i++)
                {
        maxHeight=-1;
        for (i = 0 ; i < m_noItems; i++)
                {

-               GetTextExtent(GetLabel(i), &eachWidth[i], &eachHeight[i]);
+               GetTextExtent(GetString(i), &eachWidth[i], &eachHeight[i]);

                eachWidth[i] = (int)(eachWidth[i] + RADIO_SIZE);
                eachHeight[i] = (int)((3*eachHeight[i])/2);
                if (maxWidth<eachWidth[i]) maxWidth = eachWidth[i];
                if (maxHeight<eachHeight[i]) maxHeight = eachHeight[i];
                }
 
                eachWidth[i] = (int)(eachWidth[i] + RADIO_SIZE);
                eachHeight[i] = (int)((3*eachHeight[i])/2);
                if (maxWidth<eachWidth[i]) maxWidth = eachWidth[i];
                if (maxHeight<eachHeight[i]) maxHeight = eachHeight[i];
                }
 

-       totHeight = GetNumVer() * (maxHeight + charHeight/2) + charHeight*3/2;
-       totWidth  = GetNumHor() * (maxWidth + charWidth) + charWidth;
+       totHeight = GetRowCount() * (maxHeight + charHeight/2) + charHeight*3/2;
+       totWidth  = GetColumnCount() * (maxWidth + charWidth) + charWidth;
+
+    // only change our width/height if asked for
+    if ( width == -1 )
+    {
+        if ( sizeFlags & wxSIZE_AUTO_WIDTH )
+            width = totWidth ;
+        else
+            width = widthOld;
+    }
+
+    if ( height == -1 )
+    {
+        if ( sizeFlags & wxSIZE_AUTO_HEIGHT )
+            height = totHeight ;
+        else
+            height = heightOld;
+    }

 
 

-       wxControl::DoSetSize(x_offset,y_offset,totWidth,totHeight);
+       wxControl::DoSetSize(x_offset,y_offset,width,height,wxSIZE_AUTO);

 
 // arrange radiobuttons
 
 
 // arrange radiobuttons
 


@@ -472,7 +450,7 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
        
        
        x_start = charWidth;
        
        
        x_start = charWidth;

-       y_start = charHeight*3/2;
+       y_start = 15 ;

        x_offset = x_start;
        y_offset = y_start;
        
        x_offset = x_start;
        y_offset = y_start;
        


@@ -489,7 +467,7 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
                else
                        {
                                x_offset = x_start;
                else
                        {
                                x_offset = x_start;

-                       y_offset += maxHeight + charHeight/2;
+                       y_offset += maxHeight ; /*+ charHeight/2;*/

                                }
                        }
 
                                }
                        }
 


@@ -497,7 +475,7 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
                current=current->NextInCycle();
                
                if (m_windowStyle & wxRA_SPECIFY_ROWS)
                current=current->NextInCycle();
                
                if (m_windowStyle & wxRA_SPECIFY_ROWS)

-                       y_offset += maxHeight + charHeight/2;
+                       y_offset += maxHeight ; /*+ charHeight/2;*/

                else
                        x_offset += maxWidth + charWidth;
                }
                else
                        x_offset += maxWidth + charWidth;
                }


@@ -508,7 +486,7 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 //-------------------------------------------------------------------------------------
 // return the number of buttons in the vertical direction
 
 //-------------------------------------------------------------------------------------
 // return the number of buttons in the vertical direction
 

-int wxRadioBox::GetNumVer() const
+int wxRadioBox::GetRowCount() const

 {
     if ( m_windowStyle & wxRA_SPECIFY_ROWS )
     {
 {
     if ( m_windowStyle & wxRA_SPECIFY_ROWS )
     {


@@ -525,7 +503,7 @@ int wxRadioBox::GetNumVer() const
 //-------------------------------------------------------------------------------------
 // return the number of buttons in the horizontal direction
 
 //-------------------------------------------------------------------------------------
 // return the number of buttons in the horizontal direction
 

-int wxRadioBox::GetNumHor() const
+int wxRadioBox::GetColumnCount() const

 {
     if ( m_windowStyle & wxRA_SPECIFY_ROWS )
     {
 {
     if ( m_windowStyle & wxRA_SPECIFY_ROWS )
     {