Fixed incorrect clipping region on wxGTK

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

diff --git a/src/mac/carbon/radiobox.cpp b/src/mac/carbon/radiobox.cpp
index cf279d567ba81d2069537a4805926b516a02f212..3695edf6cae5e335dd246735da2af9199da2664c 100644 (file)
--- a/src/mac/carbon/radiobox.cpp
+++ b/src/mac/carbon/radiobox.cpp
@@ -137,8 +137,10 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
     if ( bounds.bottom <= bounds.top )
         bounds.bottom = bounds.top + 100 ;
    
     if ( bounds.bottom <= bounds.top )
         bounds.bottom = bounds.top + 100 ;
    

+    m_peer = new wxMacControl() ;
+    

     verify_noerr(CreateGroupBoxControl(MAC_WXHWND(parent->MacGetTopLevelWindowRef()),&bounds, CFSTR("") , 
     verify_noerr(CreateGroupBoxControl(MAC_WXHWND(parent->MacGetTopLevelWindowRef()),&bounds, CFSTR("") , 

-        true /*primary*/ , (ControlRef*)&m_macControl ) ) ;  
+        true /*primary*/ , m_peer->GetControlRefAddr() ) ) ;  

     
     for (i = 0; i < n; i++)
     {
     
     for (i = 0; i < n; i++)
     {


@@ -481,7 +483,7 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
     {
         if (i&&((i%m_majorDim)==0)) // not to do for the zero button!
         {
     {
         if (i&&((i%m_majorDim)==0)) // not to do for the zero button!
         {

-            if (m_windowStyle & wxRA_VERTICAL)
+            if (m_windowStyle & wxRA_SPECIFY_ROWS)

             {
                 x_offset += maxWidth + charWidth;
                 y_offset = y_start;
             {
                 x_offset += maxWidth + charWidth;
                 y_offset = y_start;


@@ -510,7 +512,7 @@ wxSize wxRadioBox::DoGetBestSize() const
     int eachWidth, eachHeight;
     int totWidth, totHeight;
     
     int eachWidth, eachHeight;
     int totWidth, totHeight;
     

-    wxFont font = GetParent()->GetFont();
+    wxFont font = /*GetParent()->*/GetFont();

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