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

diff --git a/src/generic/panelg.cpp b/src/generic/panelg.cpp
index f10285fe46..d539393dbe 100644
--- a/src/generic/panelg.cpp
+++ b/src/generic/panelg.cpp
@@ -1,82 +1,69 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        panelg.cpp
-// Purpose:     wxPanel
-// Author:      Julian Smart
-// Modified by:
-// Created:     04/01/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
-/////////////////////////////////////////////////////////////////////////////
-
-#ifdef __GNUG__
-#pragma implementation "panelg.h"
-#endif
-
-// For compilers that support precompilation, includes "wx.h".
+///////////////////////////////////////////////////////////////////////////////
+// Name:        src/generic/panelg.cpp
+// Purpose:     Generic wxPanel implementation.
+// Author:      Vadim Zeitlin
+// Created:     2011-03-20
+// RCS-ID:      $Id: wxhead.cpp,v 1.11 2010-04-22 12:44:51 zeitlin Exp $
+// Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// for compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
 #ifndef WX_PRECOMP
-#include "wx/settings.h"
-#endif
-
-#include "wx/generic/panelg.h"
-
-#if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxPanel, wxWindow)
-
-BEGIN_EVENT_TABLE(wxPanel, wxWindow)
-  EVT_SYS_COLOUR_CHANGED(wxPanel::OnSysColourChanged)
-END_EVENT_TABLE()
-
-#endif
+    #include "wx/dc.h"
+    #include "wx/panel.h"
+#endif // WX_PRECOMP
 
-wxPanel::wxPanel(void)
-{
-  SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
-  SetDefaultBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
-}
+#ifdef wxHAS_GENERIC_PANEL
 
-bool wxPanel::Create(wxWindow *parent, const wxWindowID id,
-           const wxPoint& pos,
-           const wxSize& size,
-           const long style,
-           const wxString& name)
-{
-  bool ret = wxWindow::Create(parent, id, pos, size, style, name);
-
-  SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
-  SetDefaultBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
-  SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
-  return ret;
-}
+// ============================================================================
+// implementation
+// ============================================================================
 
-void wxPanel::OnPaint(wxPaintEvent& WXUNUSED(event))
+void wxPanel::DoSetBackgroundBitmap(const wxBitmap& bmp)
 {
-	// No: if you call the default procedure, it makes
-	// the following painting code not work.
-//	wxWindow::OnPaint(event);
+    m_bitmapBg = bmp;
+
+    if ( m_bitmapBg.IsOk() )
+    {
+        Connect(wxEVT_ERASE_BACKGROUND,
+                wxEraseEventHandler(wxPanel::OnEraseBackground));
+    }
+    else
+    {
+        Disconnect(wxEVT_ERASE_BACKGROUND,
+                   wxEraseEventHandler(wxPanel::OnEraseBackground));
+    }
 }
 
-void wxPanel::InitDialog(void)
+void wxPanel::OnEraseBackground(wxEraseEvent& event)
 {
- 	wxInitDialogEvent event(GetId());
- 	event.SetEventObject(this);
- 	GetEventHandler()->ProcessEvent(event);
-}
-
-// Responds to colour changes, and passes event on to children.
-void wxPanel::OnSysColourChanged(wxSysColourChangedEvent& event)
-{
-    SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
-    SetDefaultBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
-    Refresh();
-
-    // Propagate the event to the non-top-level children
-    wxWindow::OnSysColourChanged(event);
+    wxDC& dc = *event.GetDC();
+
+    const wxSize clientSize = GetClientSize();
+    const wxSize bitmapSize = m_bitmapBg.GetSize();
+
+    for ( int x = 0; x < clientSize.x; x += bitmapSize.x )
+    {
+        for ( int y = 0; y < clientSize.y; y += bitmapSize.y )
+        {
+            dc.DrawBitmap(m_bitmapBg, x, y);
+        }
+    }
 }
 
+#endif // wxHAS_GENERIC_PANEL