X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/456bc6d9b83882a3b0e919fc733898d9d331ecd6..8b3fddc49326c0b6019cd7082218726aa17a5727:/src/generic/panelg.cpp?ds=sidebyside diff --git a/src/generic/panelg.cpp b/src/generic/panelg.cpp index f42365f225..a67f7da2e5 100644 --- a/src/generic/panelg.cpp +++ b/src/generic/panelg.cpp @@ -57,7 +57,7 @@ END_EVENT_TABLE() // implementation // ============================================================================ -WX_DELEGATE_TO_CONTROL_CONTAINER(wxPanel, m_container) +WX_DELEGATE_TO_CONTROL_CONTAINER(wxPanel) // ---------------------------------------------------------------------------- // wxPanel creation @@ -65,7 +65,7 @@ WX_DELEGATE_TO_CONTROL_CONTAINER(wxPanel, m_container) void wxPanel::Init() { - m_container = new wxControlContainer(this); + m_container.SetContainerWindow(this); } bool wxPanel::Create(wxWindow *parent, wxWindowID id, @@ -79,13 +79,8 @@ bool wxPanel::Create(wxWindow *parent, wxWindowID id, wxPanel::~wxPanel() { - delete m_container; } -// ---------------------------------------------------------------------------- -// misc -// ---------------------------------------------------------------------------- - void wxPanel::InitDialog() { wxInitDialogEvent event(GetId()); @@ -93,21 +88,26 @@ void wxPanel::InitDialog() GetEventHandler()->ProcessEvent(event); } +// ---------------------------------------------------------------------------- +// event handlers +// ---------------------------------------------------------------------------- + // Responds to colour changes, and passes event on to children. void wxPanel::OnSysColourChanged(wxSysColourChangedEvent& event) { - SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE)); + SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE)); Refresh(); // Propagate the event to the non-top-level children wxWindow::OnSysColourChanged(event); } -void wxPanel::OnSize(wxSizeEvent& WXUNUSED(event)) +void wxPanel::OnSize(wxSizeEvent& event) { #if wxUSE_CONSTRAINTS if (GetAutoLayout()) Layout(); #endif // wxUSE_CONSTRAINTS + event.Skip(); }