X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a756f210019dd5b51331b7181c816d3882146a30..ce39ca74bc413b8a5574f733cd9a44e7b1e9beff:/src/generic/panelg.cpp?ds=sidebyside

diff --git a/src/generic/panelg.cpp b/src/generic/panelg.cpp
index a67f7da2e5..6ca4edace5 100644
--- a/src/generic/panelg.cpp
+++ b/src/generic/panelg.cpp
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:     wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
-    #pragma implementation "panelg.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -34,22 +30,15 @@
     #include "wx/colour.h"
     #include "wx/settings.h"
     #include "wx/log.h"
+    #include "wx/panel.h"
+    #include "wx/containr.h"
 #endif
 
-#include "wx/containr.h"
-#include "wx/panel.h"
-
 // ----------------------------------------------------------------------------
 // wxWin macros
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxPanel, wxWindow)
-
 BEGIN_EVENT_TABLE(wxPanel, wxWindow)
-    EVT_SYS_COLOUR_CHANGED(wxPanel::OnSysColourChanged)
-
-    EVT_SIZE(wxPanel::OnSize)
-
     WX_EVENT_TABLE_CONTROL_CONTAINER(wxPanel)
 END_EVENT_TABLE()
 
@@ -57,7 +46,7 @@ END_EVENT_TABLE()
 // implementation
 // ============================================================================
 
-WX_DELEGATE_TO_CONTROL_CONTAINER(wxPanel)
+WX_DELEGATE_TO_CONTROL_CONTAINER(wxPanel, wxWindow)
 
 // ----------------------------------------------------------------------------
 // wxPanel creation
@@ -65,7 +54,7 @@ WX_DELEGATE_TO_CONTROL_CONTAINER(wxPanel)
 
 void wxPanel::Init()
 {
-    m_container.SetContainerWindow(this);
+    WX_INIT_CONTROL_CONTAINER();
 }
 
 bool wxPanel::Create(wxWindow *parent, wxWindowID id,
@@ -74,7 +63,18 @@ bool wxPanel::Create(wxWindow *parent, wxWindowID id,
                      long style,
                      const wxString& name)
 {
-    return wxWindow::Create(parent, id, pos, size, style, name);
+    if ( !wxWindow::Create(parent, id, pos, size, style, name) )
+        return false;
+
+    // so that non-solid background renders correctly under GTK+:
+    SetThemeEnabled(true);
+
+#if defined(__WXWINCE__) && (defined(__POCKETPC__) || defined(__SMARTPHONE__))
+    // Required to get solid control backgrounds under WinCE
+    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
+#endif
+
+    return true;
 }
 
 wxPanel::~wxPanel()
@@ -88,26 +88,20 @@ void wxPanel::InitDialog()
     GetEventHandler()->ProcessEvent(event);
 }
 
-// ----------------------------------------------------------------------------
-// event handlers
-// ----------------------------------------------------------------------------
+#ifdef __WXMSW__
 
-// Responds to colour changes, and passes event on to children.
-void wxPanel::OnSysColourChanged(wxSysColourChangedEvent& event)
+bool wxPanel::HasTransparentBackground()
 {
-    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
-    Refresh();
+    for ( wxWindow *win = GetParent(); win; win = win->GetParent() )
+    {
+        if ( win->MSWHasInheritableBackground() )
+            return true;
 
-    // Propagate the event to the non-top-level children
-    wxWindow::OnSysColourChanged(event);
-}
+        if ( win->IsTopLevel() )
+            break;
+    }
 
-void wxPanel::OnSize(wxSizeEvent& event)
-{
-#if wxUSE_CONSTRAINTS
-    if (GetAutoLayout())
-        Layout();
-#endif // wxUSE_CONSTRAINTS
-    event.Skip();
+    return false;
 }
 
+#endif // __WXMSW__