Getting borders working
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49907 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -2226,6 +2226,11 @@ bool wxWindowGTK::Create( wxWindow *parent,
|
||||
long style,
|
||||
const wxString &name )
|
||||
{
|
||||
// Get default border
|
||||
wxBorder border = GetBorder(style);
|
||||
style &= ~wxBORDER_MASK;
|
||||
style |= border;
|
||||
|
||||
if (!PreCreation( parent, pos, size ) ||
|
||||
!CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
|
||||
{
|
||||
@@ -2233,6 +2238,7 @@ bool wxWindowGTK::Create( wxWindow *parent,
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
m_wxwindow = wxPizza::New(m_windowStyle);
|
||||
if (!HasFlag(wxHSCROLL) && !HasFlag(wxVSCROLL))
|
||||
m_widget = m_wxwindow;
|
||||
@@ -2408,7 +2414,7 @@ void wxWindowGTK::PostCreation()
|
||||
|
||||
// border drawing
|
||||
#ifndef __WXUNIVERSAL__
|
||||
if (HasFlag(wxBORDER_SIMPLE | wxBORDER_RAISED | wxBORDER_SUNKEN))
|
||||
if (HasFlag(wxBORDER_SIMPLE | wxBORDER_RAISED | wxBORDER_SUNKEN | wxBORDER_THEME))
|
||||
{
|
||||
g_signal_connect(m_widget, "expose_event",
|
||||
G_CALLBACK(expose_event_border), this);
|
||||
|
Reference in New Issue
Block a user