better spacing

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19929 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/carbon/radiobox.cpp b/src/mac/carbon/radiobox.cpp
index 141c7971fc8de595f621af88daed12047547229b..fbf840fc8d5cbd537a63274ab086cd8d5594a25c 100644 (file)
--- a/src/mac/carbon/radiobox.cpp
+++ b/src/mac/carbon/radiobox.cpp
@@ -379,7 +379,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 40
+#define RADIO_SIZE 20

 
 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)
 {


@@ -423,7 +423,7 @@ 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*3/2;
+    totHeight = GetRowCount() * (maxHeight + charHeight/2) + charHeight ;

     totWidth  = GetColumnCount() * (maxWidth + charWidth) + charWidth;
     
     // only change our width/height if asked for
     totWidth  = GetColumnCount() * (maxWidth + charWidth) + charWidth;
     
     // only change our width/height if asked for


@@ -506,7 +506,7 @@ wxSize wxRadioBox::DoGetBestSize() const
         if (maxHeight < eachHeight)   maxHeight = eachHeight;
     }
     
         if (maxHeight < eachHeight)   maxHeight = eachHeight;
     }
     

-    totHeight = GetRowCount() * (maxHeight + charHeight/2) + charHeight * 3/2;
+    totHeight = GetRowCount() * (maxHeight + charHeight/2) + charHeight ;

     totWidth  = GetColumnCount() * (maxWidth + charWidth) + charWidth;
     
     // handle radio box title as well
     totWidth  = GetColumnCount() * (maxWidth + charWidth) + charWidth;
     
     // handle radio box title as well

diff --git a/src/mac/radiobox.cpp b/src/mac/radiobox.cpp
index 141c7971fc8de595f621af88daed12047547229b..fbf840fc8d5cbd537a63274ab086cd8d5594a25c 100644 (file)
--- a/src/mac/radiobox.cpp
+++ b/src/mac/radiobox.cpp
@@ -379,7 +379,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 40
+#define RADIO_SIZE 20

 
 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)
 {


@@ -423,7 +423,7 @@ 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*3/2;
+    totHeight = GetRowCount() * (maxHeight + charHeight/2) + charHeight ;

     totWidth  = GetColumnCount() * (maxWidth + charWidth) + charWidth;
     
     // only change our width/height if asked for
     totWidth  = GetColumnCount() * (maxWidth + charWidth) + charWidth;
     
     // only change our width/height if asked for


@@ -506,7 +506,7 @@ wxSize wxRadioBox::DoGetBestSize() const
         if (maxHeight < eachHeight)   maxHeight = eachHeight;
     }
     
         if (maxHeight < eachHeight)   maxHeight = eachHeight;
     }
     

-    totHeight = GetRowCount() * (maxHeight + charHeight/2) + charHeight * 3/2;
+    totHeight = GetRowCount() * (maxHeight + charHeight/2) + charHeight ;

     totWidth  = GetColumnCount() * (maxWidth + charWidth) + charWidth;
     
     // handle radio box title as well
     totWidth  = GetColumnCount() * (maxWidth + charWidth) + charWidth;
     
     // handle radio box title as well