Rework IE virtual file system support to use new syntax. Remove now unused code for...

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

diff --git a/src/generic/panelg.cpp b/src/generic/panelg.cpp
index d7f69ce93764b61ab6e383db6605732ac7c83504..d539393dbe3a836cc75ef5793ba68a876eea8679 100644 (file)
--- a/src/generic/panelg.cpp
+++ b/src/generic/panelg.cpp
@@ -1,13 +1,12 @@
-/////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////

 // Name:        src/generic/panelg.cpp
 // Name:        src/generic/panelg.cpp

-// Purpose:     wxPanel and the keyboard handling code
-// Author:      Julian Smart, Robert Roebling, Vadim Zeitlin
-// Modified by:
-// Created:     04/01/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:     wxWindows license
-/////////////////////////////////////////////////////////////////////////////
+// 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
 
 // ============================================================================
 // declarations


@@ -17,11 +16,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation "panelg.h"
-#endif
-
-// For compilers that support precompilation, includes "wx.h".
+// for compilers that support precompilation, includes "wx.h".

 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__


@@ -29,112 +24,46 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-    #include "wx/object.h"
-    #include "wx/font.h"
-    #include "wx/colour.h"
-    #include "wx/settings.h"
-    #include "wx/log.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)
+    #include "wx/dc.h"
+    #include "wx/panel.h"
+#endif // WX_PRECOMP

 
 

-    WX_EVENT_TABLE_CONTROL_CONTAINER(wxPanel)
-END_EVENT_TABLE()
+#ifdef wxHAS_GENERIC_PANEL

 
 // ============================================================================
 // implementation
 // ============================================================================
 
 
 // ============================================================================
 // implementation
 // ============================================================================
 

-WX_DELEGATE_TO_CONTROL_CONTAINER(wxPanel)
-
-// ----------------------------------------------------------------------------
-// wxPanel creation
-// ----------------------------------------------------------------------------
-
-void wxPanel::Init()
-{
-    m_container.SetContainerWindow(this);
-}
-
-bool wxPanel::Create(wxWindow *parent, wxWindowID id,
-                     const wxPoint& pos,
-                     const wxSize& size,
-                     long style,
-                     const wxString& name)
-{
-    return wxWindow::Create(parent, id, pos, size, style, name);
-}
-
-wxPanel::~wxPanel()
+void wxPanel::DoSetBackgroundBitmap(const wxBitmap& bmp)

 {
 {

-}
+    m_bitmapBg = bmp;

 
 

-void wxPanel::InitDialog()
-{
-    wxInitDialogEvent event(GetId());
-    event.SetEventObject(this);
-    GetEventHandler()->ProcessEvent(event);
+    if ( m_bitmapBg.IsOk() )
+    {
+        Connect(wxEVT_ERASE_BACKGROUND,
+                wxEraseEventHandler(wxPanel::OnEraseBackground));
+    }
+    else
+    {
+        Disconnect(wxEVT_ERASE_BACKGROUND,
+                   wxEraseEventHandler(wxPanel::OnEraseBackground));
+    }

 }
 
 }
 

-// ----------------------------------------------------------------------------
-// event handlers
-// ----------------------------------------------------------------------------
-
-// Responds to colour changes, and passes event on to children.
-void wxPanel::OnSysColourChanged(wxSysColourChangedEvent& event)
+void wxPanel::OnEraseBackground(wxEraseEvent& event)

 {
 {

-    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
-    Refresh();
+    wxDC& dc = *event.GetDC();

 
 

-    // Propagate the event to the non-top-level children
-    wxWindow::OnSysColourChanged(event);
-}
+    const wxSize clientSize = GetClientSize();
+    const wxSize bitmapSize = m_bitmapBg.GetSize();

 
 

-void wxPanel::OnSize(wxSizeEvent& event)
-{
-#if wxUSE_CONSTRAINTS
-    if (GetAutoLayout())
-        Layout();
-#if defined(__WXPM__)
-    else
+    for ( int x = 0; x < clientSize.x; x += bitmapSize.x )

     {
     {

-        // Need to properly move child windows under OS/2
-
-        PSWP                        pWinSwp = GetSwp();
-
-        if (pWinSwp->cx == 0 && pWinSwp->cy == 0 && pWinSwp->fl == 0)
+        for ( int y = 0; y < clientSize.y; y += bitmapSize.y )

         {
         {

-            // Uninitialized
-
-            ::WinQueryWindowPos(GetHWND(), pWinSwp);
-       }
-       else
-        {
-            SWP                     vSwp;
-            int                     nYDiff;
-
-            ::WinQueryWindowPos(GetHWND(), &vSwp);
-            nYDiff = pWinSwp->cy - vSwp.cy;
-            MoveChildren(nYDiff);
-            pWinSwp->cx = vSwp.cx;
-            pWinSwp->cy = vSwp.cy;
+            dc.DrawBitmap(m_bitmapBg, x, y);

         }
     }
         }
     }

-#endif
-#endif // wxUSE_CONSTRAINTS
-
-    event.Skip();

 }
 
 }
 

+#endif // wxHAS_GENERIC_PANEL