AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wxX11 wants to have the border style flag

Browse Source 
in wxWindowX11.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14825 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling 2002-03-27 22:09:49 +00:00
parent f4d0cce0b8
commit 372c2812d9
3 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/univ/listbox.cpp
View File

@ -101,7 +101,14 @@ bool wxListBox::Create(wxWindow *parent,
if ( !(style & (wxLB_MULTIPLE | wxLB_EXTENDED)) ) if ( !(style & (wxLB_MULTIPLE | wxLB_EXTENDED)) )
style |= wxLB_SINGLE; style |= wxLB_SINGLE;
if ( !wxControl::Create(parent, id, pos, size, style | wxVSCROLL , wxDefaultValidator, name) ) #if wxUSE_TWO_WINDOWS
style |= wxVSCROLL|wxHSCROLL;
if ((style & wxBORDER_MASK) == 0)
style |= wxBORDER_SUNKEN;
#endif
if ( !wxControl::Create(parent, id, pos, size, style,
wxDefaultValidator, name) )
return FALSE; return FALSE;
SetWindow(this); SetWindow(this);

5
src/univ/textctrl.cpp
View File

@ -692,6 +692,11 @@ bool wxTextCtrl::Create(wxWindow *parent,
m_data.sdata = new wxTextSingleLineData; m_data.sdata = new wxTextSingleLineData;
} }
#if wxUSE_TWO_WINDOWS
if ((style & wxBORDER_MASK) == 0)
style |= wxBORDER_SUNKEN;
#endif
if ( !wxControl::Create(parent, id, pos, size, style, if ( !wxControl::Create(parent, id, pos, size, style,
validator, name) ) validator, name) )
{ {

4
src/univ/themes/win32.cpp
View File

@ -1864,8 +1864,12 @@ wxRect wxWin32Renderer::GetBorderDimensions(wxBorder border) const
break; break;
default: default:
{
// char *crash = NULL;
// *crash = 0;
wxFAIL_MSG(_T("unknown border type")); wxFAIL_MSG(_T("unknown border type"));
// fall through // fall through
}
case wxBORDER_DEFAULT: case wxBORDER_DEFAULT:
case wxBORDER_NONE: case wxBORDER_NONE: