make --static flag act on --cppflags too.

[wxWidgets.git] / src / generic / panelg.cpp

diff --git a/src/generic/panelg.cpp b/src/generic/panelg.cpp
index f42365f225e6c3e30a1cbcfbca6db8a44bf9cfc7..927afc68fff4886a66562c6b70a086e3012859a7 100644 (file)
--- a/src/generic/panelg.cpp
+++ b/src/generic/panelg.cpp
@@ -57,7 +57,7 @@ END_EVENT_TABLE()
 // implementation
 // ============================================================================
 
 // implementation
 // ============================================================================
 

-WX_DELEGATE_TO_CONTROL_CONTAINER(wxPanel, m_container)
+WX_DELEGATE_TO_CONTROL_CONTAINER(wxPanel)

 
 // ----------------------------------------------------------------------------
 // wxPanel creation
 
 // ----------------------------------------------------------------------------
 // wxPanel creation


@@ -65,7 +65,7 @@ WX_DELEGATE_TO_CONTROL_CONTAINER(wxPanel, m_container)
 
 void wxPanel::Init()
 {
 
 void wxPanel::Init()
 {

-    m_container = new wxControlContainer(this);
+    m_container.SetContainerWindow(this);

 }
 
 bool wxPanel::Create(wxWindow *parent, wxWindowID id,
 }
 
 bool wxPanel::Create(wxWindow *parent, wxWindowID id,


@@ -79,13 +79,8 @@ bool wxPanel::Create(wxWindow *parent, wxWindowID id,
 
 wxPanel::~wxPanel()
 {
 
 wxPanel::~wxPanel()
 {

-    delete m_container;

 }
 
 }
 

-// ----------------------------------------------------------------------------
-// misc
-// ----------------------------------------------------------------------------
-

 void wxPanel::InitDialog()
 {
     wxInitDialogEvent event(GetId());
 void wxPanel::InitDialog()
 {
     wxInitDialogEvent event(GetId());


@@ -93,6 +88,10 @@ void wxPanel::InitDialog()
     GetEventHandler()->ProcessEvent(event);
 }
 
     GetEventHandler()->ProcessEvent(event);
 }
 

+// ----------------------------------------------------------------------------
+// event handlers
+// ----------------------------------------------------------------------------
+

 // Responds to colour changes, and passes event on to children.
 void wxPanel::OnSysColourChanged(wxSysColourChangedEvent& event)
 {
 // Responds to colour changes, and passes event on to children.
 void wxPanel::OnSysColourChanged(wxSysColourChangedEvent& event)
 {