tried to correct the colour problems

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

src/msw/radiobox.cpp

@@ -56,14 +56,7 @@
 //     reason to revert to the backward compatible behaviour - but I still
 //     leave this possibility just in case.
 
-// For some reason, the background colour is set wrongly in WIN16 mode
-// if we use the new method.
-
-#ifdef __WIN16__
-#define RADIOBTN_PARENT_IS_RADIOBOX 0
-#else
 #define RADIOBTN_PARENT_IS_RADIOBOX 1
-#endif
 
 // ---------------------------------------------------------------------------
 // private functions
@@ -229,7 +222,7 @@ bool wxRadioBox::Create(wxWindow *parent,
     {
         m_radioWidth[i] =
         m_radioHeight[i] = -1;
-        long styleBtn = BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE;
+        long styleBtn = BS_AUTORADIOBUTTON | WS_TABSTOP | WS_CHILD | WS_VISIBLE;
         if ( i == 0 && style == 0 )
             styleBtn |= WS_GROUP;
 
@@ -717,9 +710,25 @@ bool wxRadioBox::SetFont(const wxFont& font)
 
 long wxRadioBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
 {
+    switch ( nMsg )
+    {
+        case WM_CTLCOLORSTATIC:
+            // set the colour of the radio buttons to be the same as ours
+            {
+                HDC hdc = (HDC)wParam;
+
+                const wxColour& colBack = GetBackgroundColour();
+                ::SetBkColor(hdc, wxColourToRGB(colBack));
+                ::SetTextColor(hdc, wxColourToRGB(GetForegroundColour()));
+
+                wxBrush *brush = wxTheBrushList->FindOrCreateBrush(colBack, wxSOLID);
+
+                return (WXHBRUSH)brush->GetResourceHandle();
+            }
+
         // This is required for the radiobox to be sensitive to mouse input,
         // e.g. for Dialog Editor.
-    if (nMsg == WM_NCHITTEST)
+        case WM_NCHITTEST:
             {
                 int xPos = LOWORD(lParam);  // horizontal position of cursor
                 int yPos = HIWORD(lParam);  // vertical position of cursor
@@ -731,9 +740,12 @@ long wxRadioBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
                 if (yPos < 10)
                     return (long)HTCLIENT;
             }
+            // fall through
 
+        default:
             return wxControl::MSWWindowProc(nMsg, wParam, lParam);
     }
+}
 
 // ---------------------------------------------------------------------------
 // window proc for radio buttons