Corrected wxScrolledWindow's OnSize behaviour.

[wxWidgets.git] / src / gtk1 / radiobox.cpp

diff --git a/src/gtk1/radiobox.cpp b/src/gtk1/radiobox.cpp
index fe7709a31dfc489de783265a334fc25dc364056f..64881d7cfc6ab1252c43d387104097a91f27290b 100644 (file)
--- a/src/gtk1/radiobox.cpp
+++ b/src/gtk1/radiobox.cpp
@@ -11,10 +11,12 @@
 #pragma implementation "radiobox.h"
 #endif
 
 #pragma implementation "radiobox.h"
 #endif
 

-#include "wx/radiobox.h"
+#include "wx/defs.h"

 
 #if wxUSE_RADIOBOX
 
 
 #if wxUSE_RADIOBOX
 

+#include "wx/radiobox.h"
+

 #include "wx/dialog.h"
 #include "wx/frame.h"
 #include "wx/log.h"
 #include "wx/dialog.h"
 #include "wx/frame.h"
 #include "wx/log.h"


@@ -187,7 +189,9 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
 
     m_widget = gtk_frame_new( title.mbc_str() );
 
 
     m_widget = gtk_frame_new( title.mbc_str() );
 

-    m_majorDim = majorDim;
+    // majorDim may be 0 if all trailing parameters were omitted, so don't
+    // assert here but just use the correct value for it
+    m_majorDim = majorDim == 0 ? n : majorDim;

 
     GtkRadioButton *m_radio = (GtkRadioButton*) NULL;
 
 
     GtkRadioButton *m_radio = (GtkRadioButton*) NULL;