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

wxBORDER_THEME processing for Motif and X11

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49909 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2007-11-13 14:44:21 +00:00
parent dbb6177963
commit cce69fec84
3 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/motif/utils.cpp
View File

@@ -639,7 +639,7 @@ WXWidget wxCreateBorderWidget( WXWidget parent, long style )
NULL
);
}
else if (style & wxSUNKEN_BORDER)
else if ((style & wxSUNKEN_BORDER) || (style & wxBORDER_THEME))
{
borderWidget = XtVaCreateManagedWidget
(

5
src/motif/window.cpp
View File

@@ -230,6 +230,11 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID id,
long style,
const wxString& name)
{
// Get default border
wxBorder border = GetBorder(style);
style &= ~wxBORDER_MASK;
style |= border;
wxCHECK_MSG( parent, false, "can't create wxWindow without parent" );
CreateBase(parent, id, pos, size, style, wxDefaultValidator, name);

9
src/x11/window.cpp
View File

@@ -122,6 +122,11 @@ bool wxWindowX11::Create(wxWindow *parent, wxWindowID id,
{
wxCHECK_MSG( parent, false, wxT("can't create wxWindow without parent") );
// Get default border
wxBorder border = GetBorder(style);
style &= ~wxBORDER_MASK;
style |= border;
CreateBase(parent, id, pos, size, style, wxDefaultValidator, name);
parent->AddChild(this);
@@ -164,7 +169,7 @@ bool wxWindowX11::Create(wxWindow *parent, wxWindowID id,
#if wxUSE_TWO_WINDOWS
bool need_two_windows =
((( wxSUNKEN_BORDER | wxRAISED_BORDER | wxSIMPLE_BORDER | wxHSCROLL | wxVSCROLL ) & m_windowStyle) != 0);
((( wxSUNKEN_BORDER | wxBORDER_THEME | wxRAISED_BORDER | wxSIMPLE_BORDER | wxHSCROLL | wxVSCROLL ) & m_windowStyle) != 0);
#else
bool need_two_windows = false;
#endif
@@ -230,7 +235,7 @@ bool wxWindowX11::Create(wxWindow *parent, wxWindowID id,
}
#endif
if (HasFlag( wxSUNKEN_BORDER) || HasFlag( wxRAISED_BORDER))
if (HasFlag(wxSUNKEN_BORDER) || HasFlag(wxRAISED_BORDER) || HasFlag(wxBORDER_THEME))
{
pos2.x = 2;
pos2.y = 2;