added support for wxCAL_SHOW_WEEK_NUMBERS to generic version of wxCalendarCtrl (...

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

diff --git a/src/osx/radiobox_osx.cpp b/src/osx/radiobox_osx.cpp
index dec4feb9a1f24f7b050ba2812be5ce462c372ef2..4ba2abf0193eb5d43041369849709ccf4d25e9f1 100644 (file)
--- a/src/osx/radiobox_osx.cpp
+++ b/src/osx/radiobox_osx.cpp
@@ -52,7 +52,7 @@ wxRadioBox::wxRadioBox()
 
 wxRadioBox::~wxRadioBox()
 {
 
 wxRadioBox::~wxRadioBox()
 {

-    m_isBeingDeleted = true;
+    SendDestroyEvent();

 
     wxRadioButton *next, *current;
 
 
     wxRadioButton *next, *current;
 


@@ -411,7 +411,7 @@ void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
     totWidth  = GetColumnCount() * (maxWidth + charWidth);
 
     wxSize sz = DoGetSizeFromClientSize( wxSize( totWidth, totHeight ) ) ;
     totWidth  = GetColumnCount() * (maxWidth + charWidth);
 
     wxSize sz = DoGetSizeFromClientSize( wxSize( totWidth, totHeight ) ) ;

-    
+

     // change the width / height only when specified
     if ( width == wxDefaultCoord )
     {
     // change the width / height only when specified
     if ( width == wxDefaultCoord )
     {


@@ -502,7 +502,7 @@ wxSize wxRadioBox::DoGetBestSize() const
     wxSize sz = DoGetSizeFromClientSize( wxSize( totWidth, totHeight ) );
     totWidth = sz.x;
     totHeight = sz.y;
     wxSize sz = DoGetSizeFromClientSize( wxSize( totWidth, totHeight ) );
     totWidth = sz.x;
     totHeight = sz.y;

-    
+

     // optimum size is an additional 5 pt border to all sides
     totWidth += 10;
     totHeight += 10;
     // optimum size is an additional 5 pt border to all sides
     totWidth += 10;
     totHeight += 10;


@@ -516,4 +516,13 @@ wxSize wxRadioBox::DoGetBestSize() const
     return wxSize( totWidth, totHeight );
 }
 
     return wxSize( totWidth, totHeight );
 }
 

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

 #endif // wxUSE_RADIOBOX
 #endif // wxUSE_RADIOBOX