no changes, just resolving conflict with Julian's change which was almost exactly the same as mine

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

include/wx/radiobox.h

@@ -95,9 +95,9 @@ public:
 protected:
     wxRadioBoxBase()
     {
+        m_numCols =
+        m_numRows =
         m_majorDim = 0;
-        m_numCols = 0;
-        m_numRows = 0;
 
 #if wxUSE_TOOLTIPS
         m_itemsTooltips = NULL;