Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tried to correct the colour problems

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5310 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2000-01-08 22:20:03 +00:00
parent 2480be69b1
commit d3acd3697a
1 changed files with 33 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/msw/radiobox.cpp
View File

@@ -46,7 +46,7 @@
#include "wx/tooltip.h" #include "wx/tooltip.h"
#endif // wxUSE_TOOLTIPS #endif // wxUSE_TOOLTIPS
IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl)
// VZ: the new behaviour is to create the radio buttons as children of the // VZ: the new behaviour is to create the radio buttons as children of the
// radiobox instead of creating them as children of the radiobox' parent. // radiobox instead of creating them as children of the radiobox' parent.
@@ -56,14 +56,7 @@
// reason to revert to the backward compatible behaviour - but I still // reason to revert to the backward compatible behaviour - but I still
// leave this possibility just in case. // 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 #define RADIOBTN_PARENT_IS_RADIOBOX 1
#endif
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
// private functions // private functions
@@ -229,7 +222,7 @@ bool wxRadioBox::Create(wxWindow *parent,
{ {
m_radioWidth[i] = m_radioWidth[i] =
m_radioHeight[i] = -1; 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 ) if ( i == 0 && style == 0 )
styleBtn |= WS_GROUP; styleBtn |= WS_GROUP;
@@ -717,9 +710,25 @@ bool wxRadioBox::SetFont(const wxFont& font)
long wxRadioBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) 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, // This is required for the radiobox to be sensitive to mouse input,
// e.g. for Dialog Editor. // e.g. for Dialog Editor.
if (nMsg == WM_NCHITTEST) case WM_NCHITTEST:
{ {
int xPos = LOWORD(lParam); // horizontal position of cursor int xPos = LOWORD(lParam); // horizontal position of cursor
int yPos = HIWORD(lParam); // vertical position of cursor int yPos = HIWORD(lParam); // vertical position of cursor
@@ -731,8 +740,11 @@ long wxRadioBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
if (yPos < 10) if (yPos < 10)
return (long)HTCLIENT; return (long)HTCLIENT;
} }
// fall through
default:
return wxControl::MSWWindowProc(nMsg, wParam, lParam); return wxControl::MSWWindowProc(nMsg, wParam, lParam);
}
} }
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------