wiring OnInit on osx to a later point in event processing

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

diff --git a/src/osx/radiobox_osx.cpp b/src/osx/radiobox_osx.cpp
index ae1526b0a5f067ba48497a6d15a762e834711311..e4ebe931bedc3ebbbc7c5515febec3231dfa5a83 100644 (file)
--- a/src/osx/radiobox_osx.cpp
+++ b/src/osx/radiobox_osx.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        src/osx/radiobox.cpp
+// Name:        src/osx/radiobox_osx.cpp

 // Purpose:     wxRadioBox
 // Author:      Stefan Csomor
 // Modified by: JS Lair (99/11/15) first implementation
 // Purpose:     wxRadioBox
 // Author:      Stefan Csomor
 // Modified by: JS Lair (99/11/15) first implementation


@@ -38,7 +38,7 @@ void wxRadioBox::OnRadioButton( wxCommandEvent &outer )
 {
     if ( outer.IsChecked() )
     {
 {
     if ( outer.IsChecked() )
     {

-        wxCommandEvent event( wxEVT_COMMAND_RADIOBOX_SELECTED, m_windowId );
+        wxCommandEvent event( wxEVT_RADIOBOX, m_windowId );

         int i = GetSelection() ;
         event.SetInt(i);
         event.SetString(GetString(i));
         int i = GetSelection() ;
         event.SetInt(i);
         event.SetString(GetString(i));


@@ -97,15 +97,14 @@ bool wxRadioBox::Create( wxWindow *parent,
     int n, const wxString choices[],
     int majorDim, long style,
     const wxValidator& val, const wxString& name )
     int n, const wxString choices[],
     int majorDim, long style,
     const wxValidator& val, const wxString& name )

-{
-    m_macIsUserPane = false ;
-
+{    
+    DontCreatePeer();
+    

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

-    int i;
-
-    m_noItems = (unsigned int)n;
+    // during construction we must keep this at 0, otherwise GetBestSize fails
+    m_noItems = 0;

     m_noRowsOrCols = majorDim;
     m_radioButtonCycle = NULL;
 
     m_noRowsOrCols = majorDim;
     m_radioButtonCycle = NULL;
 


@@ -115,7 +114,7 @@ bool wxRadioBox::Create( wxWindow *parent,
 
     SetPeer(wxWidgetImpl::CreateGroupBox( this, parent, id, label, pos, size, style, GetExtraStyle() ));
 
 
     SetPeer(wxWidgetImpl::CreateGroupBox( this, parent, id, label, pos, size, style, GetExtraStyle() ));
 

-    for (i = 0; i < n; i++)
+    for (int i = 0; i < n; i++)

     {
         wxRadioButton *radBtn = new wxRadioButton(
             this,
     {
         wxRadioButton *radBtn = new wxRadioButton(
             this,


@@ -130,7 +129,13 @@ bool wxRadioBox::Create( wxWindow *parent,
 //        m_radioButtonCycle = radBtn->AddInCycle( m_radioButtonCycle );
     }
 
 //        m_radioButtonCycle = radBtn->AddInCycle( m_radioButtonCycle );
     }
 

+    // as all radiobuttons have been set-up, set the correct dimensions
+    m_noItems = (unsigned int)n;
+    SetMajorDim( majorDim == 0 ? n : majorDim, style );
+

     SetSelection( 0 );
     SetSelection( 0 );

+    InvalidateBestSize();
+    SetInitialSize( size );

     MacPostControlCreate( pos, size );
 
     return true;
     MacPostControlCreate( pos, size );
 
     return true;


@@ -260,7 +265,7 @@ void wxRadioBox::SetString(unsigned int item,const wxString& label)
 }
 
 // Sets a button by passing the desired position. This does not cause
 }
 
 // Sets a button by passing the desired position. This does not cause

-// wxEVT_COMMAND_RADIOBOX_SELECTED event to get emitted
+// wxEVT_RADIOBOX event to get emitted

 //
 void wxRadioBox::SetSelection(int item)
 {
 //
 void wxRadioBox::SetSelection(int item)
 {