wxEVT_COMMAND_CHOICE_SELECTED => wxEVT_COMMAND_COMBOBOX_SELECTED

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

diff --git a/src/msw/radiobox.cpp b/src/msw/radiobox.cpp
index 87a1f95af00c9c066626e210f55000b7a122d1cd..2120279d45cf938ee7b3cc522477e5c724429683 100644 (file)
--- a/src/msw/radiobox.cpp
+++ b/src/msw/radiobox.cpp
@@ -10,65 +10,65 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__

-#pragma implementation "radiobox.h"
+    #pragma implementation "radiobox.h"

 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-#include <stdio.h>
-#include "wx/setup.h"
-#include "wx/bitmap.h"
-#include "wx/brush.h"
-#include "wx/radiobox.h"
+    #include <stdio.h>
+    #include "wx/setup.h"
+    #include "wx/bitmap.h"
+    #include "wx/brush.h"
+    #include "wx/radiobox.h"

 #endif
 
 #include "wx/msw/private.h"
 
 #if !USE_SHARED_LIBRARY
 #endif
 
 #include "wx/msw/private.h"
 
 #if !USE_SHARED_LIBRARY

-IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl)
+    IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl)

 #endif
 
 bool wxRadioBox::MSWCommand(WXUINT param, WXWORD id)
 {
 #endif
 
 bool wxRadioBox::MSWCommand(WXUINT param, WXWORD id)
 {

-  if (param == BN_CLICKED)
-  {
+    if (param == BN_CLICKED)
+    {

 #ifdef __WIN32__
 #ifdef __WIN32__

-    int i;
-    for (i = 0; i < m_noItems; i++)
-      if (id == GetWindowLong((HWND) m_radioButtons[i], GWL_ID))
-        m_selectedButton = i;
+        int i;
+        for (i = 0; i < m_noItems; i++)
+            if (id == GetWindowLong((HWND) m_radioButtons[i], GWL_ID))
+                m_selectedButton = i;

 #else
 #else

-    int i;
-    for (i = 0; i < m_noItems; i++)
-      if (id == GetWindowWord((HWND) m_radioButtons[i], GWW_ID))
-        m_selectedButton = i;
+        int i;
+        for (i = 0; i < m_noItems; i++)
+            if (id == GetWindowWord((HWND) m_radioButtons[i], GWW_ID))
+                m_selectedButton = i;

 #endif
 
 #endif
 

-    wxCommandEvent event(wxEVT_COMMAND_RADIOBOX_SELECTED, m_windowId);
-    event.SetInt( m_selectedButton );
-    event.SetEventObject( this );
-    ProcessCommand(event);
-    return TRUE;
-  }
-  else return FALSE;
+        wxCommandEvent event(wxEVT_COMMAND_RADIOBOX_SELECTED, m_windowId);
+        event.SetInt( m_selectedButton );
+        event.SetEventObject( this );
+        ProcessCommand(event);
+        return TRUE;
+    }
+    else return FALSE;

 }
 
 #if WXWIN_COMPATIBILITY
 wxRadioBox::wxRadioBox(wxWindow *parent, wxFunction func, const char *title,
 }
 
 #if WXWIN_COMPATIBILITY
 wxRadioBox::wxRadioBox(wxWindow *parent, wxFunction func, const char *title,

-             int x, int y, int width, int height,
-             int n, char **choices,
-             int majorDim, long style, const char *name)
+        int x, int y, int width, int height,
+        int n, char **choices,
+        int majorDim, long style, const char *name)

 {
     wxString *choices2 = new wxString[n];
     for ( int i = 0; i < n; i ++) choices2[i] = choices[i];
     Create(parent, -1, title, wxPoint(x, y), wxSize(width, height), n, choices2, majorDim, style,
 {
     wxString *choices2 = new wxString[n];
     for ( int i = 0; i < n; i ++) choices2[i] = choices[i];
     Create(parent, -1, title, wxPoint(x, y), wxSize(width, height), n, choices2, majorDim, style,

-        wxDefaultValidator, name);
+            wxDefaultValidator, name);

     Callback(func);
     delete choices2;
 }
     Callback(func);
     delete choices2;
 }


@@ -78,655 +78,680 @@ wxRadioBox::wxRadioBox(wxWindow *parent, wxFunction func, const char *title,
 // Radio box item
 wxRadioBox::wxRadioBox(void)
 {
 // Radio box item
 wxRadioBox::wxRadioBox(void)
 {

-  m_selectedButton = -1;
-  m_noItems = 0;
-  m_noRowsOrCols = 0;
-  m_radioButtons = NULL;
-  m_majorDim = 0 ;
-  m_radioWidth = NULL ;
-  m_radioHeight = NULL ;
+    m_selectedButton = -1;
+    m_noItems = 0;
+    m_noRowsOrCols = 0;
+    m_radioButtons = NULL;
+    m_majorDim = 0 ;
+    m_radioWidth = NULL ;
+    m_radioHeight = NULL ;

 }
 
 bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,
 }
 
 bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,

-             const wxPoint& pos, const wxSize& size,
-             int n, const wxString choices[],
-             int majorDim, long style,
-             const wxValidator& val, const wxString& name)
+        const wxPoint& pos, const wxSize& size,
+        int n, const wxString choices[],
+        int majorDim, long style,
+        const wxValidator& val, const wxString& name)

 {
 {

-  m_selectedButton = -1;
-  m_noItems = n;
+    m_selectedButton = -1;
+    m_noItems = n;

 
 

-  SetName(name);
-  SetValidator(val);
+    SetName(name);
+    SetValidator(val);

 
 

-  parent->AddChild(this);
-  m_backgroundColour = parent->GetBackgroundColour() ;
-  m_foregroundColour = parent->GetForegroundColour() ;
+    parent->AddChild(this);
+    m_backgroundColour = parent->GetBackgroundColour() ;
+    m_foregroundColour = parent->GetForegroundColour() ;

 
 

-  m_windowStyle = (long&)style;
+    m_windowStyle = (long&)style;

 
 

-  int x = pos.x;
-  int y = pos.y;
-  int width = size.x;
-  int height = size.y;
+    int x = pos.x;
+    int y = pos.y;
+    int width = size.x;
+    int height = size.y;

 
 

-  if (id == -1)
-    m_windowId = NewControlId();
-  else
-    m_windowId = id;
-
-  m_noRowsOrCols = majorDim;
-  if (majorDim==0)
-    m_majorDim = n ;
-  else // Seemed to make sense to put this 'else' here...  (RD)
-    m_majorDim = majorDim ;
-
-  long msStyle = GROUP_FLAGS;
-
-  bool want3D;
-  WXDWORD exStyle = Determine3DEffects(0, &want3D) ;
-  // Even with extended styles, need to combine with WS_BORDER
-  // for them to look right.
-/*
-  if ( want3D || wxStyleHasBorder(m_windowStyle) )
-    msStyle |= WS_BORDER;
-*/
-
-
-  HWND the_handle = (HWND) parent->GetHWND() ;
-
-  m_hWnd = (WXHWND)::CreateWindowEx
-                     (
-                      (DWORD)exStyle,
-                      GROUP_CLASS,
-                      title,
-                      msStyle,
-                      0, 0, 0, 0,
-                      the_handle,
-                      (HMENU)m_windowId,
-                      wxGetInstance(),
-                      NULL
-                     );
+    if (id == -1)
+        m_windowId = NewControlId();
+    else
+        m_windowId = id;
+
+    m_noRowsOrCols = majorDim;
+    if (majorDim==0)
+        m_majorDim = n ;
+    else // Seemed to make sense to put this 'else' here...  (RD)
+        m_majorDim = majorDim ;
+
+    long msStyle = GROUP_FLAGS;
+
+    bool want3D;
+    WXDWORD exStyle = Determine3DEffects(0, &want3D) ;
+    // Even with extended styles, need to combine with WS_BORDER
+    // for them to look right.
+    /*
+       if ( want3D || wxStyleHasBorder(m_windowStyle) )
+       msStyle |= WS_BORDER;
+     */
+
+
+    HWND the_handle = (HWND) parent->GetHWND() ;
+
+    m_hWnd = (WXHWND)::CreateWindowEx
+        (
+         (DWORD)exStyle,
+         GROUP_CLASS,
+         title,
+         msStyle,
+         0, 0, 0, 0,
+         the_handle,
+         (HMENU)m_windowId,
+         wxGetInstance(),
+         NULL
+        );

 
 #if CTL3D
 
 #if CTL3D

-  if (want3D)
-  {
-    Ctl3dSubclassCtl((HWND)m_hWnd);
-    m_useCtl3D = TRUE;
-  }
+    if (want3D)
+    {
+        Ctl3dSubclassCtl((HWND)m_hWnd);
+        m_useCtl3D = TRUE;
+    }

 #endif
 
 #endif
 

-  SetFont(parent->GetFont());
-
-  SubclassWin((WXHWND)m_hWnd);
-
-  // Some radio boxes test consecutive id.
-  (void)NewControlId() ;
-  m_radioButtons = new WXHWND[n];
-  m_radioWidth = new int[n] ;
-  m_radioHeight = new int[n] ;
-  int i;
-  for (i = 0; i < n; i++)
-  {
-    m_radioWidth[i] = m_radioHeight[i] = -1 ;
-    long groupStyle = 0;
-    if (i == 0 && style==0)
-      groupStyle = WS_GROUP;
-    long newId = NewControlId();
-    long msStyle = groupStyle | RADIO_FLAGS;
-
-    m_radioButtons[i] = (WXHWND) CreateWindowEx(exStyle, RADIO_CLASS, choices[i],
-                          msStyle,0,0,0,0,
-                          the_handle, (HMENU)newId, wxGetInstance(), NULL);
+    SetFont(parent->GetFont());
+
+    SubclassWin((WXHWND)m_hWnd);
+
+    // Some radio boxes test consecutive id.
+    (void)NewControlId() ;
+    m_radioButtons = new WXHWND[n];
+    m_radioWidth = new int[n] ;
+    m_radioHeight = new int[n] ;
+    int i;
+    for (i = 0; i < n; i++)
+    {
+        m_radioWidth[i] = m_radioHeight[i] = -1 ;
+        long groupStyle = 0;
+        if (i == 0 && style==0)
+            groupStyle = WS_GROUP;
+        long newId = NewControlId();
+        long msStyle = groupStyle | RADIO_FLAGS;
+
+        m_radioButtons[i] = (WXHWND) CreateWindowEx(exStyle, RADIO_CLASS, choices[i],
+                msStyle,0,0,0,0,
+                the_handle, (HMENU)newId, wxGetInstance(), NULL);

 #if CTL3D
 #if CTL3D

-  if (want3D)
-  {
-    Ctl3dSubclassCtl((HWND) m_hWnd);
-   m_useCtl3D = TRUE;
-  }
+        if (want3D)
+        {
+            Ctl3dSubclassCtl((HWND) m_hWnd);
+            m_useCtl3D = TRUE;
+        }

 #endif
 #endif

-    if (GetFont().Ok())
-    {
-       SendMessage((HWND)m_radioButtons[i],WM_SETFONT,
+        if (GetFont().Ok())
+        {
+            SendMessage((HWND)m_radioButtons[i],WM_SETFONT,

                     (WPARAM)GetFont().GetResourceHandle(),0L);
                     (WPARAM)GetFont().GetResourceHandle(),0L);

+        }
+        m_subControls.Append((wxObject *)newId);

     }
     }

-    m_subControls.Append((wxObject *)newId);
-  }

 
 

-  // Create a dummy radio control to end the group.
-  (void)CreateWindowEx(0, RADIO_CLASS, "", WS_GROUP|RADIO_FLAGS, 0,0,0,0, the_handle, (HMENU)NewControlId(), wxGetInstance(), NULL);
+    // Create a dummy radio control to end the group.
+    (void)CreateWindowEx(0, RADIO_CLASS, "", WS_GROUP|RADIO_FLAGS, 0,0,0,0, the_handle, (HMENU)NewControlId(), wxGetInstance(), NULL);

 
 

-  SetSelection(0);
+    SetSelection(0);

 
 

-  SetSize(x, y, width, height);
+    SetSize(x, y, width, height);

 
 

-  return TRUE;
+    return TRUE;

 }
 
 #if 0
 bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,
 }
 
 #if 0
 bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,

-             const wxPoint& pos, const wxSize& size,
-             int n, const wxBitmap *choices[],
-             int majorDim, long style,
-             const wxValidator& val, const wxString& name)
+        const wxPoint& pos, const wxSize& size,
+        int n, const wxBitmap *choices[],
+        int majorDim, long style,
+        const wxValidator& val, const wxString& name)

 {
 {

-  m_selectedButton = -1;
-  m_noRowsOrCols = 0;
-  m_noItems = n;
+    m_selectedButton = -1;
+    m_noRowsOrCols = 0;
+    m_noItems = n;

 
 

-  SetName(name);
-  SetValidator(val);
+    SetName(name);
+    SetValidator(val);

 
 

-  parent->AddChild(this);
-  m_backgroundColour = parent->GetBackgroundColour() ;
-  m_foregroundColour = parent->GetForegroundColour() ;
+    parent->AddChild(this);
+    m_backgroundColour = parent->GetBackgroundColour() ;
+    m_foregroundColour = parent->GetForegroundColour() ;

 
 

-  m_windowStyle = (long&)style;
+    m_windowStyle = (long&)style;

 
 

-  int x = pos.x;
-  int y = pos.y;
-  int width = size.x;
-  int height = size.y;
+    int x = pos.x;
+    int y = pos.y;
+    int width = size.x;
+    int height = size.y;

 
 

-  if (id == -1)
-    m_windowId = NewControlId();
-  else
-    m_windowId = id;
+    if (id == -1)
+        m_windowId = NewControlId();
+    else
+        m_windowId = id;

 
 
 
 

-  m_noRowsOrCols = majorDim;
-  if (majorDim==0)
-    m_majorDim = n ;
-  m_majorDim = majorDim ;
-  HWND the_handle ;
+    m_noRowsOrCols = majorDim;
+    if (majorDim==0)
+        m_majorDim = n ;
+    m_majorDim = majorDim ;
+    HWND the_handle ;

 
 

-  long msStyle = GROUP_FLAGS;
+    long msStyle = GROUP_FLAGS;

 
 

-  bool want3D;
-  WXDWORD exStyle = Determine3DEffects(0, &want3D) ;
-  // Even with extended styles, need to combine with WS_BORDER
-  // for them to look right.
-  if ( want3D || wxStyleHasBorder(m_windowStyle) )
-    msStyle |= WS_BORDER;
+    bool want3D;
+    WXDWORD exStyle = Determine3DEffects(0, &want3D) ;
+    // Even with extended styles, need to combine with WS_BORDER
+    // for them to look right.
+    if ( want3D || wxStyleHasBorder(m_windowStyle) )
+        msStyle |= WS_BORDER;

 
 

-  m_hWnd = (WXHWND) CreateWindowEx((DWORD) exStyle, GROUP_CLASS, (title == "" ? NULL : (const char *)title),
-                           msStyle,
-                           0,0,0,0,
-                           (HWND) parent->GetHWND(), (HMENU) m_windowId, wxGetInstance(), NULL) ;
+    m_hWnd = (WXHWND) CreateWindowEx((DWORD) exStyle, GROUP_CLASS, (title == "" ? NULL : (const char *)title),
+            msStyle,
+            0,0,0,0,
+            (HWND) parent->GetHWND(), (HMENU) m_windowId, wxGetInstance(), NULL) ;

 
 

-  the_handle = (HWND) parent->GetHWND();
+    the_handle = (HWND) parent->GetHWND();

 
 #if CTL3D
 
 #if CTL3D

-  if (want3D)
-  {
-    Ctl3dSubclassCtl((HWND) m_hWnd);
-   m_useCtl3D = TRUE;
-  }
+    if (want3D)
+    {
+        Ctl3dSubclassCtl((HWND) m_hWnd);
+        m_useCtl3D = TRUE;
+    }

 #endif
 
 #endif
 

-  SetFont(parent->GetFont());
-
-  // Subclass again for purposes of dialog editing mode
-  SubclassWin((WXHWND)m_hWnd);
-
-  (void)NewControlId() ;
-  m_radioButtons = new WXHWND[n];
-  m_radioWidth = new int[n] ;
-  m_radioHeight = new int[n] ;
-
-  int i;
-  for (i = 0; i < n; i++)
-  {
-    long groupStyle = 0;
-    if (i == 0 && style==0)
-      groupStyle = WS_GROUP;
-    long newId = NewControlId();
-    m_radioWidth[i]  = ((wxBitmap *)choices[i])->GetWidth();
-    m_radioHeight[i] = ((wxBitmap *)choices[i])->GetHeight();
-    char tmp[32] ;
-    sprintf(tmp,"Toggle%d",i) ;
-    long msStyle = groupStyle | RADIO_FLAGS;
-    m_radioButtons[i] = (WXHWND) CreateWindowEx(exStyle, RADIO_CLASS, tmp,
-                          msStyle,0,0,0,0,
-                          the_handle, (HMENU)newId, wxhInstance, NULL);
+    SetFont(parent->GetFont());
+
+    // Subclass again for purposes of dialog editing mode
+    SubclassWin((WXHWND)m_hWnd);
+
+    (void)NewControlId() ;
+    m_radioButtons = new WXHWND[n];
+    m_radioWidth = new int[n] ;
+    m_radioHeight = new int[n] ;
+
+    int i;
+    for (i = 0; i < n; i++)
+    {
+        long groupStyle = 0;
+        if (i == 0 && style==0)
+            groupStyle = WS_GROUP;
+        long newId = NewControlId();
+        m_radioWidth[i]  = ((wxBitmap *)choices[i])->GetWidth();
+        m_radioHeight[i] = ((wxBitmap *)choices[i])->GetHeight();
+        char tmp[32] ;
+        sprintf(tmp,"Toggle%d",i) ;
+        long msStyle = groupStyle | RADIO_FLAGS;
+        m_radioButtons[i] = (WXHWND) CreateWindowEx(exStyle, RADIO_CLASS, tmp,
+                msStyle,0,0,0,0,
+                the_handle, (HMENU)newId, wxhInstance, NULL);

 #if CTL3D
 #if CTL3D

-  if (want3D)
-  {
-    Ctl3dSubclassCtl((HWND) m_hWnd);
-   m_useCtl3D = TRUE;
-  }
+        if (want3D)
+        {
+            Ctl3dSubclassCtl((HWND) m_hWnd);
+            m_useCtl3D = TRUE;
+        }

 #endif
 #endif

-    m_subControls.Append((wxObject *)newId);
-  }
-  // Create a dummy radio control to end the group.
-  (void)CreateWindowEx(0, RADIO_CLASS, "", WS_GROUP|RADIO_FLAGS, 0,0,0,0, the_handle, (HMENU)NewControlId(), wxGetInstance(), NULL);
+        m_subControls.Append((wxObject *)newId);
+    }
+    // Create a dummy radio control to end the group.
+    (void)CreateWindowEx(0, RADIO_CLASS, "", WS_GROUP|RADIO_FLAGS, 0,0,0,0, the_handle, (HMENU)NewControlId(), wxGetInstance(), NULL);

 
 

-  SetSelection(0);
+    SetSelection(0);

 
 

-  SetSize(x, y, width, height);
+    SetSize(x, y, width, height);

 
 

-  return TRUE;
+    return TRUE;

 }
 #endif
 
 wxRadioBox::~wxRadioBox(void)
 {
 }
 #endif
 
 wxRadioBox::~wxRadioBox(void)
 {

-  m_isBeingDeleted = TRUE;
+    m_isBeingDeleted = TRUE;

 
 

-  if (m_radioButtons)
-  {
-    int i;
-    for (i = 0; i < m_noItems; i++)
-      DestroyWindow((HWND) m_radioButtons[i]);
-    delete[] m_radioButtons;
-  }
-  if (m_radioWidth)
-    delete[] m_radioWidth ;
-  if (m_radioHeight)
-    delete[] m_radioHeight ;
-  if (m_hWnd)
-    ::DestroyWindow((HWND) m_hWnd) ;
-  m_hWnd = 0 ;
+    if (m_radioButtons)
+    {
+        int i;
+        for (i = 0; i < m_noItems; i++)
+            DestroyWindow((HWND) m_radioButtons[i]);
+        delete[] m_radioButtons;
+    }
+    if (m_radioWidth)
+        delete[] m_radioWidth ;
+    if (m_radioHeight)
+        delete[] m_radioHeight ;
+    if (m_hWnd)
+        ::DestroyWindow((HWND) m_hWnd) ;
+    m_hWnd = 0 ;

 
 }
 
 wxString wxRadioBox::GetLabel(int item) const
 {
 
 }
 
 wxString wxRadioBox::GetLabel(int item) const
 {

-  GetWindowText((HWND)m_radioButtons[item], wxBuffer, 300);
-  return wxString(wxBuffer);
+    GetWindowText((HWND)m_radioButtons[item], wxBuffer, 300);
+    return wxString(wxBuffer);

 }
 
 void wxRadioBox::SetLabel(int item, const wxString& label)
 {
 }
 
 void wxRadioBox::SetLabel(int item, const wxString& label)
 {

-  m_radioWidth[item] = m_radioHeight[item] = -1 ;
-  SetWindowText((HWND)m_radioButtons[item], (const char *)label);
+    m_radioWidth[item] = m_radioHeight[item] = -1 ;
+    SetWindowText((HWND)m_radioButtons[item], (const char *)label);

 }
 
 void wxRadioBox::SetLabel(int item, wxBitmap *bitmap)
 {
 }
 
 void wxRadioBox::SetLabel(int item, wxBitmap *bitmap)
 {

-/*
-    m_radioWidth[item] = bitmap->GetWidth() + FB_MARGIN ;
-    m_radioHeight[item] = bitmap->GetHeight() + FB_MARGIN ;
-*/
+    /*
+       m_radioWidth[item] = bitmap->GetWidth() + FB_MARGIN ;
+       m_radioHeight[item] = bitmap->GetHeight() + FB_MARGIN ;
+     */

 }
 
 int wxRadioBox::FindString(const wxString& s) const
 {
 }
 
 int wxRadioBox::FindString(const wxString& s) const
 {

- int i;
- for (i = 0; i < m_noItems; i++)
- {
-  GetWindowText((HWND) m_radioButtons[i], wxBuffer, 1000);
-  if (s == wxBuffer)
-    return i;
- }
- return -1;
+    int i;
+    for (i = 0; i < m_noItems; i++)
+    {
+        GetWindowText((HWND) m_radioButtons[i], wxBuffer, 1000);
+        if (s == wxBuffer)
+            return i;
+    }
+    return -1;

 }
 
 void wxRadioBox::SetSelection(int N)
 {
 }
 
 void wxRadioBox::SetSelection(int N)
 {

-  if ((N < 0) || (N >= m_noItems))
-    return;
+    if ((N < 0) || (N >= m_noItems))
+        return;

 
 

-// Following necessary for Win32s, because Win32s translate BM_SETCHECK
-  if (m_selectedButton >= 0 && m_selectedButton < m_noItems)
-    SendMessage((HWND) m_radioButtons[m_selectedButton], BM_SETCHECK, 0, 0L);
+    // Following necessary for Win32s, because Win32s translate BM_SETCHECK
+    if (m_selectedButton >= 0 && m_selectedButton < m_noItems)
+        SendMessage((HWND) m_radioButtons[m_selectedButton], BM_SETCHECK, 0, 0L);

 
 

-  SendMessage((HWND) m_radioButtons[N], BM_SETCHECK, 1, 0L);
-  m_selectedButton = N;
+    SendMessage((HWND) m_radioButtons[N], BM_SETCHECK, 1, 0L);
+    m_selectedButton = N;

 }
 
 // Get single selection, for single choice list items
 int wxRadioBox::GetSelection(void) const
 {
 }
 
 // Get single selection, for single choice list items
 int wxRadioBox::GetSelection(void) const
 {

-  return m_selectedButton;
+    return m_selectedButton;

 }
 
 // Find string for position
 wxString wxRadioBox::GetString(int N) const
 {
 }
 
 // Find string for position
 wxString wxRadioBox::GetString(int N) const
 {

-  GetWindowText((HWND) m_radioButtons[N], wxBuffer, 1000);
-  return wxString(wxBuffer);
+    GetWindowText((HWND) m_radioButtons[N], wxBuffer, 1000);
+    return wxString(wxBuffer);

 }
 
 void wxRadioBox::SetSize(int x, int y, int width, int height, int sizeFlags)
 {
 }
 
 void wxRadioBox::SetSize(int x, int y, int width, int height, int sizeFlags)
 {

-  int currentX, currentY;
-  GetPosition(&currentX, &currentY);
-  int xx = x;
-  int yy = y;
-
-  if (x == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
-    xx = currentX;
-  if (y == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
-    yy = currentY;
-
-  AdjustForParentClientOrigin(xx, yy, sizeFlags);
-
-  char buf[400];
-
-  int y_offset = yy;
-  int x_offset = xx;
-  int current_width, cyf;
-
-  int cx1,cy1 ;
-  wxGetCharSize(m_hWnd, &cx1, &cy1, & this->GetFont());
-  // Attempt to have a look coherent with other platforms:
-  // We compute the biggest toggle dim, then we align all
-  // items according this value.
-  int maxWidth =  -1;
-  int maxHeight = -1 ;
-
-  int i;
-  for (i = 0 ; i < m_noItems; i++)
-  {
-    int eachWidth;
-    int eachHeight ;
-    if (m_radioWidth[i]<0)
+    int currentX, currentY;
+    GetPosition(&currentX, &currentY);
+    int xx = x;
+    int yy = y;
+
+    if (x == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+        xx = currentX;
+    if (y == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+        yy = currentY;
+
+    AdjustForParentClientOrigin(xx, yy, sizeFlags);
+
+    wxString textRadioButton;
+
+    int y_offset = yy;
+    int x_offset = xx;
+    int current_width, cyf;
+
+    int cx1,cy1;
+    wxGetCharSize(m_hWnd, &cx1, &cy1, & this->GetFont());
+
+    // number of radio boxes in both directions
+    int nbHor, nbVer;
+    if (m_windowStyle & wxRA_VERTICAL)

     {
     {

-      // It's a labelled toggle
-      GetWindowText((HWND) m_radioButtons[i], buf, 300);
-      GetTextExtent(buf, &current_width, &cyf,NULL,NULL, & this->GetFont());
-      eachWidth = (int)(current_width + RADIO_SIZE);
-      eachHeight = (int)((3*cyf)/2);
+        nbVer = m_majorDim ;
+        nbHor = (m_noItems+m_majorDim-1)/m_majorDim ;

     }
     else
     {
     }
     else
     {

-      eachWidth = m_radioWidth[i] ;
-      eachHeight = m_radioHeight[i] ;
+        nbHor = m_majorDim ;
+        nbVer = (m_noItems+m_majorDim-1)/m_majorDim ;

     }
     }

-    if (maxWidth<eachWidth) maxWidth = eachWidth ;
-    if (maxHeight<eachHeight) maxHeight = eachHeight ;
-  }

 
 

-  if (m_hWnd)
-  {
-    int totWidth ;
-    int totHeight;
+    // Attempt to have a look coherent with other platforms:
+    // We compute the biggest toggle dim, then we align all
+    // items according this value.
+    int maxWidth = width,
+        maxHeight = height;

 
 

-    int nbHor,nbVer;
+    // if we're given the width or height explicitly do not recalculate it, but
+    // use what we have
+    bool calcWidth = maxWidth == -1,
+         calcHeight = maxHeight == -1;

 
 

-    if (m_windowStyle & wxRA_VERTICAL)
+    if ( calcWidth || calcHeight )

     {
     {

-      nbVer = m_majorDim ;
-      nbHor = (m_noItems+m_majorDim-1)/m_majorDim ;
+        // init vars to avoid compiler warnings, even if we don't use them
+        int eachWidth = 0,
+            eachHeight = 0;
+
+        for ( int i = 0 ; i < m_noItems; i++ )
+        {
+            if ( m_radioWidth[i] < 0 )
+            {
+                // It's a labelled toggle
+                textRadioButton = wxGetWindowText(m_radioButtons[i]);
+                GetTextExtent(textRadioButton, &current_width, &cyf,
+                        NULL,NULL, & this->GetFont());
+
+                if ( calcWidth )
+                    eachWidth = (int)(current_width + RADIO_SIZE);
+                if ( calcHeight )
+                    eachHeight = (int)((3*cyf)/2);
+            }
+            else
+            {
+                if ( calcWidth )
+                    eachWidth = m_radioWidth[i] ;
+                if ( calcHeight )
+                    eachHeight = m_radioHeight[i] ;
+            }
+
+            if ( calcWidth && maxWidth < eachWidth )
+                maxWidth = eachWidth;
+            if ( calcHeight && maxHeight < eachHeight )
+                maxHeight = eachHeight;
+        }

     }
     else
     {
     }
     else
     {

-      nbHor = m_majorDim ;
-      nbVer = (m_noItems+m_majorDim-1)/m_majorDim ;
+        maxHeight = height/nbVer;
+        maxWidth = width/nbHor;

     }
 
     }
 

-    // this formula works, but I don't know why.
-    // Please, be sure what you do if you modify it!!
-    if (m_radioWidth[0]<0)
-      totHeight = (nbVer * maxHeight) + cy1/2 ;
-    else
-      totHeight = nbVer * (maxHeight+cy1/2) ;
-    totWidth  = nbHor * (maxWidth+cx1) ;
+    if (m_hWnd)
+    {
+        int totWidth ;
+        int totHeight;
+
+        // this formula works, but I don't know why.
+        // Please, be sure what you do if you modify it!!
+        if (m_radioWidth[0]<0)
+            totHeight = (nbVer * maxHeight) + cy1/2 ;
+        else
+            totHeight = nbVer * (maxHeight+cy1/2) ;
+        totWidth  = nbHor * (maxWidth+cx1) ;

 
 #if (!CTL3D)
 
 #if (!CTL3D)

-    // Requires a bigger group box in plain Windows
-    MoveWindow((HWND) m_hWnd,x_offset,y_offset,totWidth+cx1,totHeight+(3*cy1)/2,TRUE) ;
+        // Requires a bigger group box in plain Windows
+        MoveWindow((HWND) m_hWnd,x_offset,y_offset,totWidth+cx1,totHeight+(3*cy1)/2,TRUE) ;

 #else
 #else

-    MoveWindow((HWND) m_hWnd,x_offset,y_offset,totWidth+cx1,totHeight+cy1,TRUE) ;
+        MoveWindow((HWND) m_hWnd,x_offset,y_offset,totWidth+cx1,totHeight+cy1,TRUE) ;

 #endif
 #endif

-    x_offset += cx1;
-    y_offset += cy1;
-  }
+        x_offset += cx1;
+        y_offset += cy1;
+    }

 
 #if (!CTL3D)
 
 #if (!CTL3D)

-  y_offset += (int)(cy1/2); // Fudge factor since buttons overlapped label
-                            // JACS 2/12/93. CTL3D draws group label quite high.
+    y_offset += (int)(cy1/2); // Fudge factor since buttons overlapped label
+    // JACS 2/12/93. CTL3D draws group label quite high.

 #endif
 #endif

-  int startX = x_offset ;
-  int startY = y_offset ;
+    int startX = x_offset ;
+    int startY = y_offset ;

 
 

-  for ( i = 0 ; i < m_noItems; i++)
-  {
-    // Bidimensional radio adjustment
-    if (i&&((i%m_majorDim)==0)) // Why is this omitted for i = 0?
-    {
-      if (m_windowStyle & wxRA_VERTICAL)
-      {
-        y_offset = startY;
-        x_offset += maxWidth + cx1 ;
-      }
-      else
-      {
-        x_offset = startX ;
-        y_offset += maxHeight ;
-        if (m_radioWidth[0]>0)
-          y_offset += cy1/2 ;
-      }
-    }
-    int eachWidth ;
-    int eachHeight ;
-    if (m_radioWidth[i]<0)
+    for ( int i = 0 ; i < m_noItems; i++)

     {
     {

-      // It's a labeled item
-      GetWindowText((HWND) m_radioButtons[i], buf, 300);
-      GetTextExtent(buf, &current_width, &cyf,NULL,NULL, & this->GetFont());
-
-      // How do we find out radio button bitmap size!!
-      // By adjusting them carefully, manually :-)
-      eachWidth = (int)(current_width + RADIO_SIZE);
-      eachHeight = (int)((3*cyf)/2);
+        // Bidimensional radio adjustment
+        if (i&&((i%m_majorDim)==0)) // Why is this omitted for i = 0?
+        {
+            if (m_windowStyle & wxRA_VERTICAL)
+            {
+                y_offset = startY;
+                x_offset += maxWidth + cx1 ;
+            }
+            else
+            {
+                x_offset = startX ;
+                y_offset += maxHeight ;
+                if (m_radioWidth[0]>0)
+                    y_offset += cy1/2 ;
+            }
+        }
+        int eachWidth ;
+        int eachHeight ;
+        if (m_radioWidth[i]<0)
+        {
+            // It's a labeled item
+            textRadioButton = wxGetWindowText(m_radioButtons[i]);
+            GetTextExtent(textRadioButton, &current_width, &cyf,
+                          NULL,NULL, & this->GetFont());
+
+            // How do we find out radio button bitmap size!!
+            // By adjusting them carefully, manually :-)
+            eachWidth = (int)(current_width + RADIO_SIZE);
+            eachHeight = (int)((3*cyf)/2);
+        }
+        else
+        {
+            eachWidth = m_radioWidth[i] ;
+            eachHeight = m_radioHeight[i] ;
+        }
+
+        MoveWindow((HWND) m_radioButtons[i],x_offset,y_offset,eachWidth,eachHeight,TRUE);
+        if (m_windowStyle & wxRA_VERTICAL)
+        {
+            y_offset += maxHeight;
+            if (m_radioWidth[0]>0)
+                y_offset += cy1/2 ;
+        }
+        else
+            x_offset += maxWidth + cx1;

     }
     }

-    else
-    {
-      eachWidth = m_radioWidth[i] ;
-      eachHeight = m_radioHeight[i] ;
-    }
-
-    MoveWindow((HWND) m_radioButtons[i],x_offset,y_offset,eachWidth,eachHeight,TRUE);
-    if (m_windowStyle & wxRA_VERTICAL)
-    {
-      y_offset += maxHeight;
-      if (m_radioWidth[0]>0)
-        y_offset += cy1/2 ;
-    }
-    else
-      x_offset += maxWidth + cx1;
-  }

 }
 
 void wxRadioBox::GetSize(int *width, int *height) const
 {
 }
 
 void wxRadioBox::GetSize(int *width, int *height) const
 {

-  RECT rect;
-  rect.left = -1; rect.right = -1; rect.top = -1; rect.bottom = -1;
+    RECT rect;
+    rect.left = -1; rect.right = -1; rect.top = -1; rect.bottom = -1;

 
 

-  if (m_hWnd)
-    wxFindMaxSize(m_hWnd, &rect);
+    if (m_hWnd)
+        wxFindMaxSize(m_hWnd, &rect);

 
 

-  int i;
-  for (i = 0; i < m_noItems; i++)
-    wxFindMaxSize(m_radioButtons[i], &rect);
+    int i;
+    for (i = 0; i < m_noItems; i++)
+        wxFindMaxSize(m_radioButtons[i], &rect);

 
 

-  *width = rect.right - rect.left;
-  *height = rect.bottom - rect.top;
+    *width = rect.right - rect.left;
+    *height = rect.bottom - rect.top;

 }
 
 void wxRadioBox::GetPosition(int *x, int *y) const
 {
 }
 
 void wxRadioBox::GetPosition(int *x, int *y) const
 {

-  wxWindow *parent = GetParent();
-  RECT rect;
-  rect.left = -1; rect.right = -1; rect.top = -1; rect.bottom = -1;
-
-  int i;
-  for (i = 0; i < m_noItems; i++)
-    wxFindMaxSize(m_radioButtons[i], &rect);
-
-  if (m_hWnd)
-    wxFindMaxSize(m_hWnd, &rect);
-
-  // Since we now have the absolute screen coords,
-  // if there's a parent we must subtract its top left corner
-  POINT point;
-  point.x = rect.left;
-  point.y = rect.top;
-  if (parent)
-  {
-    ::ScreenToClient((HWND) parent->GetHWND(), &point);
-  }
-  // We may be faking the client origin.
-  // So a window that's really at (0, 30) may appear
-  // (to wxWin apps) to be at (0, 0).
-  if (GetParent())
-  {
-    wxPoint pt(GetParent()->GetClientAreaOrigin());
-    point.x -= pt.x;
-    point.y -= pt.y;
-  }
-
-  *x = point.x;
-  *y = point.y;
+    wxWindow *parent = GetParent();
+    RECT rect;
+    rect.left = -1; rect.right = -1; rect.top = -1; rect.bottom = -1;
+
+    int i;
+    for (i = 0; i < m_noItems; i++)
+        wxFindMaxSize(m_radioButtons[i], &rect);
+
+    if (m_hWnd)
+        wxFindMaxSize(m_hWnd, &rect);
+
+    // Since we now have the absolute screen coords,
+    // if there's a parent we must subtract its top left corner
+    POINT point;
+    point.x = rect.left;
+    point.y = rect.top;
+    if (parent)
+    {
+        ::ScreenToClient((HWND) parent->GetHWND(), &point);
+    }
+    // We may be faking the client origin.
+    // So a window that's really at (0, 30) may appear
+    // (to wxWin apps) to be at (0, 0).
+    if (GetParent())
+    {
+        wxPoint pt(GetParent()->GetClientAreaOrigin());
+        point.x -= pt.x;
+        point.y -= pt.y;
+    }
+
+    *x = point.x;
+    *y = point.y;

 }
 
 wxString wxRadioBox::GetLabel(void) const
 {
 }
 
 wxString wxRadioBox::GetLabel(void) const
 {

-  if (m_hWnd)
-  {
-    GetWindowText((HWND) m_hWnd, wxBuffer, 300);
-    return wxString(wxBuffer);
-  }
-  else return wxString("");
+    if (m_hWnd)
+    {
+        GetWindowText((HWND) m_hWnd, wxBuffer, 300);
+        return wxString(wxBuffer);
+    }
+    else return wxString("");

 }
 
 void wxRadioBox::SetLabel(const wxString& label)
 {
 }
 
 void wxRadioBox::SetLabel(const wxString& label)
 {

-  if (m_hWnd)
-    SetWindowText((HWND) m_hWnd, label);
+    if (m_hWnd)
+        SetWindowText((HWND) m_hWnd, label);

 }
 
 void wxRadioBox::SetFocus(void)
 {
 }
 
 void wxRadioBox::SetFocus(void)
 {

-  if (m_noItems > 0)
-  {
-    if (m_selectedButton == -1)
-      ::SetFocus((HWND) m_radioButtons[0]);
-    else
-      ::SetFocus((HWND) m_radioButtons[m_selectedButton]);
-  }
+    if (m_noItems > 0)
+    {
+        if (m_selectedButton == -1)
+            ::SetFocus((HWND) m_radioButtons[0]);
+        else
+            ::SetFocus((HWND) m_radioButtons[m_selectedButton]);
+    }

 
 }
 
 bool wxRadioBox::Show(bool show)
 {
 
 }
 
 bool wxRadioBox::Show(bool show)
 {

-  int cshow;
-  if (show)
-    cshow = SW_SHOW;
-  else
-    cshow = SW_HIDE;
-  if (m_hWnd)
-    ShowWindow((HWND) m_hWnd, cshow);
-  int i;
-  for (i = 0; i < m_noItems; i++)
-    ShowWindow((HWND) m_radioButtons[i], cshow);
-  return TRUE;
+    int cshow;
+    if (show)
+        cshow = SW_SHOW;
+    else
+        cshow = SW_HIDE;
+    if (m_hWnd)
+        ShowWindow((HWND) m_hWnd, cshow);
+    int i;
+    for (i = 0; i < m_noItems; i++)
+        ShowWindow((HWND) m_radioButtons[i], cshow);
+    return TRUE;

 }
 
 // Enable a specific button
 void wxRadioBox::Enable(int item, bool enable)
 {
 }
 
 // Enable a specific button
 void wxRadioBox::Enable(int item, bool enable)
 {

-  if (item<0)
-    wxWindow::Enable(enable) ;
-  else if (item < m_noItems)
-    ::EnableWindow((HWND) m_radioButtons[item], enable);
+    if (item<0)
+        wxWindow::Enable(enable) ;
+    else if (item < m_noItems)
+        ::EnableWindow((HWND) m_radioButtons[item], enable);

 }
 
 // Enable all controls
 void wxRadioBox::Enable(bool enable)
 {
 }
 
 // Enable all controls
 void wxRadioBox::Enable(bool enable)
 {

-  wxControl::Enable(enable);
+    wxControl::Enable(enable);

 
 

-  int i;
-  for (i = 0; i < m_noItems; i++)
-    ::EnableWindow((HWND) m_radioButtons[i], enable);
+    int i;
+    for (i = 0; i < m_noItems; i++)
+        ::EnableWindow((HWND) m_radioButtons[i], enable);

 }
 
 // Show a specific button
 void wxRadioBox::Show(int item, bool show)
 {
 }
 
 // Show a specific button
 void wxRadioBox::Show(int item, bool show)
 {

-  if (item<0)
-    wxRadioBox::Show(show) ;
-  else if (item < m_noItems)
-  {
-    int cshow;
-    if (show)
-      cshow = SW_SHOW;
-    else
-      cshow = SW_HIDE;
-    ShowWindow((HWND) m_radioButtons[item], cshow);
-  }
+    if (item<0)
+        wxRadioBox::Show(show) ;
+    else if (item < m_noItems)
+    {
+        int cshow;
+        if (show)
+            cshow = SW_SHOW;
+        else
+            cshow = SW_HIDE;
+        ShowWindow((HWND) m_radioButtons[item], cshow);
+    }

 }
 
 WXHBRUSH wxRadioBox::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
 }
 
 WXHBRUSH wxRadioBox::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,

-      WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
+        WXUINT message, WXWPARAM wParam, WXLPARAM lParam)

 {
 #if CTL3D
 {
 #if CTL3D

-  if ( m_useCtl3D )
-  {
-    HBRUSH hbrush = Ctl3dCtlColorEx(message, wParam, lParam);
-    return (WXHBRUSH) hbrush;
-  }
+    if ( m_useCtl3D )
+    {
+        HBRUSH hbrush = Ctl3dCtlColorEx(message, wParam, lParam);
+        return (WXHBRUSH) hbrush;
+    }

 #endif
 
 #endif
 

-  if (GetParent()->GetTransparentBackground())
-    SetBkMode((HDC) pDC, TRANSPARENT);
-  else
-    SetBkMode((HDC) pDC, OPAQUE);
+    if (GetParent()->GetTransparentBackground())
+        SetBkMode((HDC) pDC, TRANSPARENT);
+    else
+        SetBkMode((HDC) pDC, OPAQUE);

 
 

-  ::SetBkColor((HDC) pDC, RGB(GetBackgroundColour().Red(), GetBackgroundColour().Green(), GetBackgroundColour().Blue()));
-  ::SetTextColor((HDC) pDC, RGB(GetForegroundColour().Red(), GetForegroundColour().Green(), GetForegroundColour().Blue()));
+    ::SetBkColor((HDC) pDC, RGB(GetBackgroundColour().Red(), GetBackgroundColour().Green(), GetBackgroundColour().Blue()));
+    ::SetTextColor((HDC) pDC, RGB(GetForegroundColour().Red(), GetForegroundColour().Green(), GetForegroundColour().Blue()));

 
 

-  wxBrush *backgroundBrush = wxTheBrushList->FindOrCreateBrush(GetBackgroundColour(), wxSOLID);
+    wxBrush *backgroundBrush = wxTheBrushList->FindOrCreateBrush(GetBackgroundColour(), wxSOLID);

 
 

-  // Note that this will be cleaned up in wxApp::OnIdle, if backgroundBrush
-  // has a zero usage count.
-//  backgroundBrush->RealizeResource();
-  return (WXHBRUSH) backgroundBrush->GetResourceHandle();
+    // Note that this will be cleaned up in wxApp::OnIdle, if backgroundBrush
+    // has a zero usage count.
+    //  backgroundBrush->RealizeResource();
+    return (WXHBRUSH) backgroundBrush->GetResourceHandle();

 }
 
 // For single selection items only
 wxString wxRadioBox::GetStringSelection (void) const
 {
 }
 
 // For single selection items only
 wxString wxRadioBox::GetStringSelection (void) const
 {

-  int sel = GetSelection ();
-  if (sel > -1)
-    return this->GetString (sel);
-  else
-    return wxString("");
+    int sel = GetSelection ();
+    if (sel > -1)
+        return this->GetString (sel);
+    else
+        return wxString("");

 }
 
 bool wxRadioBox::SetStringSelection (const wxString& s)
 {
 }
 
 bool wxRadioBox::SetStringSelection (const wxString& s)
 {

-  int sel = FindString (s);
-  if (sel > -1)
+    int sel = FindString (s);
+    if (sel > -1)

     {
     {

-      SetSelection (sel);
-      return TRUE;
+        SetSelection (sel);
+        return TRUE;

     }
     }

-  else
-    return FALSE;
+    else
+        return FALSE;

 }
 
 bool wxRadioBox::ContainsHWND(WXHWND hWnd) const
 {
 }
 
 bool wxRadioBox::ContainsHWND(WXHWND hWnd) const
 {

-  int i;
+    int i;

     for (i = 0; i < Number(); i++)
     for (i = 0; i < Number(); i++)

-       if (GetRadioButtons()[i] == hWnd)
-          return TRUE;
-  return FALSE;
+        if (GetRadioButtons()[i] == hWnd)
+            return TRUE;
+    return FALSE;

 }
 
 void wxRadioBox::Command (wxCommandEvent & event)
 {
 }
 
 void wxRadioBox::Command (wxCommandEvent & event)
 {

-  SetSelection (event.m_commandInt);
-  ProcessCommand (event);
+    SetSelection (event.m_commandInt);
+    ProcessCommand (event);

 }
 
 long wxRadioBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
 {
 }
 
 long wxRadioBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
 {

-  if (nMsg == WM_NCHITTEST)
+    if (nMsg == WM_NCHITTEST)

     {
         int xPos = LOWORD(lParam);  // horizontal position of cursor
         int yPos = HIWORD(lParam);  // vertical position of cursor
     {
         int xPos = LOWORD(lParam);  // horizontal position of cursor
         int yPos = HIWORD(lParam);  // vertical position of cursor


@@ -739,6 +764,6 @@ long wxRadioBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
             return (long)HTCLIENT;
     }
 
             return (long)HTCLIENT;
     }
 

-  return wxControl::MSWWindowProc(nMsg, wParam, lParam);
+    return wxControl::MSWWindowProc(nMsg, wParam, lParam);

 }
 
 }