supporting more key equivalents for display, fixing setHidden: method warning

[wxWidgets.git] / src / osx / radiobox_osx.cpp

diff --git a/src/osx/radiobox_osx.cpp b/src/osx/radiobox_osx.cpp
index 3b1b220205b9601872fc6b5844e42b2d9595f164..874381292c73f137ec41597c11a3c6e706812f31 100644 (file)
--- a/src/osx/radiobox_osx.cpp
+++ b/src/osx/radiobox_osx.cpp
@@ -407,7 +407,7 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
     wxSize bestSizeRadio ;
     if ( m_radioButtonCycle )
         bestSizeRadio = m_radioButtonCycle->GetBestSize();
     wxSize bestSizeRadio ;
     if ( m_radioButtonCycle )
         bestSizeRadio = m_radioButtonCycle->GetBestSize();

-        
+

     for (unsigned int i = 0 ; i < m_noItems; i++)
     {
         GetTextExtent(GetString(i), &eachWidth[i], &eachHeight[i] );
     for (unsigned int i = 0 ; i < m_noItems; i++)
     {
         GetTextExtent(GetString(i), &eachWidth[i], &eachHeight[i] );


@@ -421,10 +421,10 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
     }
 
     // according to HIG (official space - 3 Pixels Diff between Frame and Layout size)
     }
 
     // according to HIG (official space - 3 Pixels Diff between Frame and Layout size)

-    int space = 3; 
+    int space = 3;

     if ( GetWindowVariant() == wxWINDOW_VARIANT_MINI )
         space = 2;
     if ( GetWindowVariant() == wxWINDOW_VARIANT_MINI )
         space = 2;

-        
+

     totHeight = GetRowCount() * maxHeight + (GetRowCount() - 1) * space;
     totWidth  = GetColumnCount() * (maxWidth + charWidth);
 
     totHeight = GetRowCount() * maxHeight + (GetRowCount() - 1) * space;
     totWidth  = GetColumnCount() * (maxWidth + charWidth);
 


@@ -480,7 +480,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 + space; 
+            y_offset += maxHeight + space;

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


@@ -519,10 +519,10 @@ wxSize wxRadioBox::DoGetBestSize() const
     }
 
     // according to HIG (official space - 3 Pixels Diff between Frame and Layout size)
     }
 
     // according to HIG (official space - 3 Pixels Diff between Frame and Layout size)

-    int space = 3; 
+    int space = 3;

     if ( GetWindowVariant() == wxWINDOW_VARIANT_MINI )
         space = 2;
     if ( GetWindowVariant() == wxWINDOW_VARIANT_MINI )
         space = 2;

-        
+

     totHeight = GetRowCount() * maxHeight + (GetRowCount() - 1) * space;
     totWidth  = GetColumnCount() * (maxWidth + charWidth);
 
     totHeight = GetRowCount() * maxHeight + (GetRowCount() - 1) * space;
     totWidth  = GetColumnCount() * (maxWidth + charWidth);
 


@@ -548,7 +548,7 @@ bool wxRadioBox::SetFont(const wxFont& font)
     bool retval = wxWindowBase::SetFont( font );
 
     // dont' update the native control, it has its own small font
     bool retval = wxWindowBase::SetFont( font );
 
     // dont' update the native control, it has its own small font

-    
+

     // should we iterate over the children ?
 
     return retval;
     // should we iterate over the children ?
 
     return retval;