implemented Freeze/Thaw() (patch 922156)

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

diff --git a/src/os2/radiobox.cpp b/src/os2/radiobox.cpp
index 94792b521704e73b29d220314c89f46940044e8d..ef06f20c8a4255960869ea0579ae66d5b3aa434a 100644 (file)
--- a/src/os2/radiobox.cpp
+++ b/src/os2/radiobox.cpp
@@ -107,8 +107,6 @@ void wxRadioBox::AdjustButtons(
     int                             nStartY;
     int                             nMaxWidth;
     int                             nMaxHeight;
     int                             nStartY;
     int                             nMaxWidth;
     int                             nMaxHeight;

-    int                             nTotWidth;
-    int                             nTotHeight;

 
     wxGetCharSize( m_hWnd
                   ,&nCx1
 
     wxGetCharSize( m_hWnd
                   ,&nCx1


@@ -266,7 +264,7 @@ bool wxRadioBox::Create(
 , const wxString&                   rsName
 )
 {
 , const wxString&                   rsName
 )
 {

-    wxCArrayString(asChoices);
+    wxCArrayString chs(asChoices);

 
     return Create(pParent, vId, rsTitle, rPos, rSize, chs.GetCount(),
                   chs.GetStrings(), nMajorDim, lStyle, rVal, rsName);
 
     return Create(pParent, vId, rsTitle, rPos, rSize, chs.GetCount(),
                   chs.GetStrings(), nMajorDim, lStyle, rVal, rsName);


@@ -318,12 +316,6 @@ bool wxRadioBox::Create(
         return FALSE;
 
     wxAssociateWinWithHandle(m_hWnd, this);
         return FALSE;
 
     wxAssociateWinWithHandle(m_hWnd, this);

-#if RADIOBTN_PARENT_IS_RADIOBOX
-    HWND                            hWndParent = GetHwnd();
-#else
-    HWND                            hWndParent = GetHwndOf(pParent);
-#endif
-    HFONT                           hFont;

 
     //
     // Some radio boxes test consecutive id.
 
     //
     // Some radio boxes test consecutive id.


@@ -1041,8 +1033,6 @@ bool wxRadioBox::SetFont(
     //
     // Also set the font of our radio buttons
     //
     //
     // Also set the font of our radio buttons
     //

-    WXHFONT                         hFont = wxFont(rFont).GetResourceHandle();
-

     for (int n = 0; n < (int)m_nNoItems; n++)
     {
         HWND                        hWndBtn = (HWND)m_ahRadioButtons[n];
     for (int n = 0; n < (int)m_nNoItems; n++)
     {
         HWND                        hWndBtn = (HWND)m_ahRadioButtons[n];


@@ -1099,8 +1089,6 @@ bool wxRadioBox::Show(
   bool                              bShow
 )
 {
   bool                              bShow
 )
 {

-    int                             nCmdShow = 0;
-

     if (!wxControl::Show(bShow))
         return FALSE;
 
     if (!wxControl::Show(bShow))
         return FALSE;
 


@@ -1127,8 +1115,6 @@ void wxRadioBox::SubclassRadioButton(
   WXHWND                            hWndBtn
 )
 {
   WXHWND                            hWndBtn
 )
 {

-    HWND                            hwndBtn = (HWND)hWndBtn;
-

     fnWndProcRadioBtn = (WXFARPROC)::WinSubclassWindow(hWndBtn, (PFNWP)wxRadioBtnWndProc);
 } // end of wxRadioBox::SubclassRadioButton
 
     fnWndProcRadioBtn = (WXFARPROC)::WinSubclassWindow(hWndBtn, (PFNWP)wxRadioBtnWndProc);
 } // end of wxRadioBox::SubclassRadioButton