Initialized m_startint in the constructor to avoid cloning of uninitialized value

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

diff --git a/src/gtk1/radiobox.cpp b/src/gtk1/radiobox.cpp
index 9ad17a94fe582e4899105635a6135e28c9aeca01..9030add731f2610d36027d5fccb7d48a7cc12bb9 100644 (file)
--- a/src/gtk1/radiobox.cpp
+++ b/src/gtk1/radiobox.cpp
@@ -17,6 +17,7 @@
 
 #include "wx/dialog.h"
 #include "wx/frame.h"
 
 #include "wx/dialog.h"
 #include "wx/frame.h"

+#include "wx/log.h"

 
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>


@@ -142,7 +143,10 @@ static gint gtk_radiobutton_focus_out( GtkWidget *widget,
                                        GdkEvent *WXUNUSED(event),
                                        wxRadioBox *win )
 {
                                        GdkEvent *WXUNUSED(event),
                                        wxRadioBox *win )
 {

-    wxASSERT_MSG( win->m_hasFocus, _T("got focus out without any focus in?") );
+  //    wxASSERT_MSG( win->m_hasFocus, _T("got focus out without any focus in?") );
+  // Replace with a warning, else we dump core a lot!
+  //  if (!win->m_hasFocus)
+  //      wxLogWarning(_T("Radiobox got focus out without any focus in.") );

 
     // we might have lost the focus, but may be not - it may have just gone to
     // another button in the same radiobox, so we'll check for it in the next
 
     // we might have lost the focus, but may be not - it may have just gone to
     // another button in the same radiobox, so we'll check for it in the next


@@ -183,7 +187,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;