ignore clicks on a toolbar but outside any button

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

diff --git a/src/generic/panelg.cpp b/src/generic/panelg.cpp
index c36c49c46d2bb3397d4eb1ef64a85582b3c63488..a67f7da2e556f1d644102a94c97377f9657f914f 100644 (file)
--- a/src/generic/panelg.cpp
+++ b/src/generic/panelg.cpp
@@ -65,6 +65,7 @@ WX_DELEGATE_TO_CONTROL_CONTAINER(wxPanel)
 
 void wxPanel::Init()
 {
 
 void wxPanel::Init()
 {

+    m_container.SetContainerWindow(this);

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


@@ -80,10 +81,6 @@ wxPanel::~wxPanel()
 {
 }
 
 {
 }
 

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

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


@@ -91,21 +88,26 @@ 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)
 {

-    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);
 }
 
     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
 {
 #if wxUSE_CONSTRAINTS
     if (GetAutoLayout())
         Layout();
 #endif // wxUSE_CONSTRAINTS

+    event.Skip();

 }
 
 }