Don't reset bullet number and outline number when applying style sheet.

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

diff --git a/src/os2/radiobox.cpp b/src/os2/radiobox.cpp
index c65677b170f08bdad1152e1be063b47c66755183..19ff8a2bacf8024d6f0e3b33abfba5c7bef913ed 100644 (file)
--- a/src/os2/radiobox.cpp
+++ b/src/os2/radiobox.cpp
@@ -18,7 +18,7 @@
 
 #ifndef WX_PRECOMP
     #include <stdio.h>
 
 #ifndef WX_PRECOMP
     #include <stdio.h>

-    #include "wx/wxchar.h"
+    #include "wx/crt.h"

     #include "wx/string.h"
     #include "wx/bitmap.h"
     #include "wx/brush.h"
     #include "wx/string.h"
     #include "wx/bitmap.h"
     #include "wx/brush.h"


@@ -76,7 +76,7 @@ wxRadioBox::wxRadioBox()
 
 wxRadioBox::~wxRadioBox()
 {
 
 wxRadioBox::~wxRadioBox()
 {

-    m_isBeingDeleted = true;
+    SendDestroyEvent();

 
     if (m_hWnd)
         wxRemoveHandleAssociation(this);
 
     if (m_hWnd)
         wxRemoveHandleAssociation(this);


@@ -145,11 +145,10 @@ bool wxRadioBox::Create( wxWindow* pParent,
                          const wxValidator& rVal,
                          const wxString& rsName )
 {
                          const wxValidator& rVal,
                          const wxString& rsName )
 {

-    wxColour vColour;
+    wxColour vColour(*wxBLACK);

     LONG     lColor;
     HWND     hWndParent = GetHwndOf(pParent);
 
     LONG     lColor;
     HWND     hWndParent = GetHwndOf(pParent);
 

-    vColour.Set(wxString(wxT("BLACK")));

     m_backgroundColour = pParent->GetBackgroundColour();
     m_nSelectedButton = -1;
     m_nNoItems = 0;
     m_backgroundColour = pParent->GetBackgroundColour();
     m_nSelectedButton = -1;
     m_nNoItems = 0;


@@ -782,7 +781,7 @@ void wxRadioBox::SetString(unsigned int nItem, const wxString& rsLabel)
     wxCHECK_RET( IsValid(nItem), wxT("invalid radiobox index") );
 
     m_pnRadioWidth[nItem] = m_pnRadioHeight[nItem] = -1;
     wxCHECK_RET( IsValid(nItem), wxT("invalid radiobox index") );
 
     m_pnRadioWidth[nItem] = m_pnRadioHeight[nItem] = -1;

-    ::WinSetWindowText((HWND)m_ahRadioButtons[nItem], (PSZ)rsLabel.c_str());
+    ::WinSetWindowText((HWND)m_ahRadioButtons[nItem], rsLabel.c_str());

 } // end of wxRadioBox::SetString
 
 bool wxRadioBox::SetStringSelection(const wxString& rsStr)
 } // end of wxRadioBox::SetString
 
 bool wxRadioBox::SetStringSelection(const wxString& rsStr)