applied patch 923858 (fixes crash in zlib streams)

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

diff --git a/src/mac/carbon/radiobox.cpp b/src/mac/carbon/radiobox.cpp
index bfc9b87637f4f078c4cbf824a18fe70dc97ba679..83bd0a1f78becc8db80425de6abf5e46e2402c27 100644 (file)
--- a/src/mac/carbon/radiobox.cpp
+++ b/src/mac/carbon/radiobox.cpp
@@ -19,6 +19,7 @@
 //-------------------------------------------------------------------------------------
 
 #include "wx/defs.h"
 //-------------------------------------------------------------------------------------
 
 #include "wx/defs.h"

+#include "wx/arrstr.h"

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


@@ -28,9 +29,6 @@
 IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl)
 #endif
 
 IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl)
 #endif
 

-#pragma mark -
-#pragma mark ### Constructors & destructor ###
-

 //-------------------------------------------------------------------------------------
 //         ¥ wxRadioBox()
 //-------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------
 //         ¥ wxRadioBox()
 //-------------------------------------------------------------------------------------


@@ -96,12 +94,26 @@ wxRadioBox::~wxRadioBox()
 //-------------------------------------------------------------------------------------
 // Create the radiobox for two-step construction
 
 //-------------------------------------------------------------------------------------
 // Create the radiobox for two-step construction
 

+bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
+                        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, label, pos, size, chs.GetCount(),
+                  chs.GetStrings(), majorDim, style, val, name);
+}
+

 bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
                         const wxPoint& pos, const wxSize& size,
                         int n, const wxString choices[],
                         int majorDim, long style,
                         const wxValidator& val, const wxString& name)
 {
 bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
                         const wxPoint& pos, const wxSize& size,
                         int n, const wxString choices[],
                         int majorDim, long style,
                         const wxValidator& val, const wxString& name)
 {

+    m_macIsUserPane = FALSE ;
+    

     if ( !wxControl::Create(parent, id, pos, size, style, val, name) )
         return false;
 
     if ( !wxControl::Create(parent, id, pos, size, style, val, name) )
         return false;
 


@@ -117,12 +129,15 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
         m_majorDim = majorDim ;
     
     
         m_majorDim = majorDim ;
     
     

-    Rect bounds ;
-    Str255 title ;
-    
-    MacPreControlCreate( parent , id ,  wxStripMenuCodes(label) , pos , size ,style, val , name , &bounds , title ) ;
-    
-    m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 0 , 1, 
+    m_label = label ;
+
+    Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
+    if( bounds.right <= bounds.left )
+        bounds.right = bounds.left + 100 ;
+    if ( bounds.bottom <= bounds.top )
+        bounds.bottom = bounds.top + 100 ;
+   
+    m_macControl = (WXWidget) ::NewControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , "\p" , true , 0 , 0 , 1, 

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


@@ -142,15 +157,12 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
     }
     
     SetSelection(0);
     }
     
     SetSelection(0);

-    MacPostControlCreate() ;
+    MacPostControlCreate(pos,size) ;

     
     return TRUE;
 }
 
 
     
     return TRUE;
 }
 
 

-#pragma mark -
-#pragma mark ### Specific functions (reference v2) ###
-

 //-------------------------------------------------------------------------------------
 //         ¥ Enable(bool)
 //-------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------
 //         ¥ Enable(bool)
 //-------------------------------------------------------------------------------------


@@ -349,9 +361,6 @@ void wxRadioBox::Show(int item, bool show)
     current->Show(show);
 }
 
     current->Show(show);
 }
 

-#pragma mark -
-#pragma mark ### Other external functions ###
-

 //-------------------------------------------------------------------------------------
 //         ¥ Command
 //-------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------
 //         ¥ Command
 //-------------------------------------------------------------------------------------


@@ -383,9 +392,6 @@ void wxRadioBox::SetFocus()
 }
 
 
 }
 
 

-#pragma mark -
-#pragma mark ### Internal functions ###
-

 //-------------------------------------------------------------------------------------
 //         ¥ DoSetSize
 //-------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------
 //         ¥ DoSetSize
 //-------------------------------------------------------------------------------------


@@ -420,8 +426,8 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
     int eachWidth[128],eachHeight[128];
     int totWidth,totHeight;
     
     int eachWidth[128],eachHeight[128];
     int totWidth,totHeight;
     

-    SetFont(GetParent()->GetFont());

     GetTextExtent(wxT("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"), &charWidth, &charHeight);
     GetTextExtent(wxT("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"), &charWidth, &charHeight);

+

     charWidth/=52;
     
     maxWidth=-1;
     charWidth/=52;
     
     maxWidth=-1;


@@ -435,14 +441,16 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
         if (maxHeight<eachHeight[i]) maxHeight = eachHeight[i];
           }
     
         if (maxHeight<eachHeight[i]) maxHeight = eachHeight[i];
           }
     

-    totHeight = GetRowCount() * (maxHeight + charHeight/2) + charHeight ;
-    totWidth  = GetColumnCount() * (maxWidth + charWidth) + charWidth;
+    totHeight = GetRowCount() * ( maxHeight ) ;
+    totWidth  = GetColumnCount() * (maxWidth + charWidth) ;
+
+    wxSize sz = DoGetSizeFromClientSize( wxSize( totWidth , totHeight ) ) ;

     
     // only change our width/height if asked for
     if ( width == -1 )
     {
         if ( sizeFlags & wxSIZE_AUTO_WIDTH )
     
     // only change our width/height if asked for
     if ( width == -1 )
     {
         if ( sizeFlags & wxSIZE_AUTO_WIDTH )

-            width = totWidth ;
+            width = sz.x ;

         else
             width = widthOld;
     }
         else
             width = widthOld;
     }


@@ -450,7 +458,7 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
     if ( height == -1 )
     {
         if ( sizeFlags & wxSIZE_AUTO_HEIGHT )
     if ( height == -1 )
     {
         if ( sizeFlags & wxSIZE_AUTO_HEIGHT )

-            height = totHeight ;
+            height = sz.y ;

         else
             height = heightOld;
     }
         else
             height = heightOld;
     }


@@ -462,8 +470,9 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
     int x_start,y_start;
     
     
     int x_start,y_start;
     
     

-    x_start = charWidth;
-    y_start = 15 ;
+    x_start = 0;
+    y_start = 0 ;
+

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


@@ -504,6 +513,7 @@ wxSize wxRadioBox::DoGetBestSize() const
     wxFont font = GetParent()->GetFont();
     GetTextExtent(wxT("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"),
         &charWidth, &charHeight, NULL, NULL, &font);
     wxFont font = GetParent()->GetFont();
     GetTextExtent(wxT("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"),
         &charWidth, &charHeight, NULL, NULL, &font);

+

     charWidth /= 52;
     
     maxWidth = -1;
     charWidth /= 52;
     
     maxWidth = -1;


@@ -511,15 +521,19 @@ wxSize wxRadioBox::DoGetBestSize() const
     
     for (int i = 0 ; i < m_noItems; i++)
     {
     
     for (int i = 0 ; i < m_noItems; i++)
     {

-        GetTextExtent(GetString(i), &eachWidth, &eachHeight);
+        GetTextExtent(GetString(i), &eachWidth, &eachHeight,NULL, NULL, &font);

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

-    totHeight = GetRowCount() * (maxHeight + charHeight/2) + charHeight ;
-    totWidth  = GetColumnCount() * (maxWidth + charWidth) + charWidth;
+    totHeight = GetRowCount() * (maxHeight ) ;
+    totWidth  = GetColumnCount() * (maxWidth + charWidth) ;
+    
+    wxSize sz = DoGetSizeFromClientSize( wxSize( totWidth , totHeight ) ) ;
+    totWidth = sz.x ;
+    totHeight = sz.y ;

     
     // handle radio box title as well
     GetTextExtent(GetTitle(), &eachWidth, NULL);
     
     // handle radio box title as well
     GetTextExtent(GetTitle(), &eachWidth, NULL);