Inexplicable removal of wxRadioBox::MSWWindowProc reversed, so wxRadioBox
works in Dialog Editor again. Compile error in Dialog Editor fixed. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4836 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -60,10 +60,6 @@ bool wxChoice::Create(wxWindow *parent,
|
||||
if ( !CreateControl(parent, id, pos, size, style, validator, name) )
|
||||
return FALSE;
|
||||
|
||||
// A choice/combobox normally has a white background (or other, depending
|
||||
// on global settings) rather than inheriting the parent's background colour.
|
||||
SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW));
|
||||
|
||||
long msStyle = WS_CHILD | CBS_DROPDOWNLIST | WS_TABSTOP | WS_VISIBLE | WS_HSCROLL | WS_VSCROLL;
|
||||
if ( style & wxCB_SORT )
|
||||
msStyle |= CBS_SORT;
|
||||
@@ -79,6 +75,10 @@ bool wxChoice::Create(wxWindow *parent,
|
||||
if ( !MSWCreateControl(wxT("COMBOBOX"), msStyle) )
|
||||
return FALSE;
|
||||
|
||||
// A choice/combobox normally has a white background (or other, depending
|
||||
// on global settings) rather than inheriting the parent's background colour.
|
||||
SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW));
|
||||
|
||||
for ( int i = 0; i < n; i++ )
|
||||
{
|
||||
Append(choices[i]);
|
||||
|
Reference in New Issue
Block a user