Give access to m_lastKeydownConsumed

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

diff --git a/src/generic/panelg.cpp b/src/generic/panelg.cpp
index 8f3f3daab954fd64267219526d5fa0b7eeaaaa7d..a67f7da2e556f1d644102a94c97377f9657f914f 100644 (file)
--- a/src/generic/panelg.cpp
+++ b/src/generic/panelg.cpp
@@ -1,43 +1,71 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        panelg.cpp
-// Purpose:     wxPanel
-// Author:      Julian Smart
+// 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
+// Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
 #ifdef __GNUG__
-#pragma implementation "panelg.h"
+    #pragma implementation "panelg.h"
 #endif
 
 // 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"
+    #include "wx/object.h"
+    #include "wx/font.h"
+    #include "wx/colour.h"
+    #include "wx/settings.h"
+    #include "wx/log.h"
 #endif
 
-#include "wx/generic/panelg.h"
+#include "wx/containr.h"
+#include "wx/panel.h"
+
+// ----------------------------------------------------------------------------
+// wxWin macros
+// ----------------------------------------------------------------------------
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxPanel, wxWindow)
 
 BEGIN_EVENT_TABLE(wxPanel, wxWindow)
-  EVT_SYS_COLOUR_CHANGED(wxPanel::OnSysColourChanged)
-  EVT_NAVIGATION_KEY(wxPanel::OnNavigationKey)
+    EVT_SYS_COLOUR_CHANGED(wxPanel::OnSysColourChanged)
+
+    EVT_SIZE(wxPanel::OnSize)
+
+    WX_EVENT_TABLE_CONTROL_CONTAINER(wxPanel)
 END_EVENT_TABLE()
 
-#endif
+// ============================================================================
+// implementation
+// ============================================================================
+
+WX_DELEGATE_TO_CONTROL_CONTAINER(wxPanel)
 
-wxPanel::wxPanel()
+// ----------------------------------------------------------------------------
+// wxPanel creation
+// ----------------------------------------------------------------------------
+
+void wxPanel::Init()
 {
+    m_container.SetContainerWindow(this);
 }
 
 bool wxPanel::Create(wxWindow *parent, wxWindowID id,
@@ -46,98 +74,40 @@ bool wxPanel::Create(wxWindow *parent, wxWindowID id,
                      long style,
                      const wxString& name)
 {
-    bool ret = wxWindow::Create(parent, id, pos, size, style, name);
-
-    if ( ret ) 
-    {
-#ifndef __WXGTK__
-        SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
-        SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
-#endif
-    }
+    return wxWindow::Create(parent, id, pos, size, style, name);
+}
 
-    return ret;
+wxPanel::~wxPanel()
+{
 }
 
-void wxPanel::InitDialog(void)
+void wxPanel::InitDialog()
 {
     wxInitDialogEvent event(GetId());
     event.SetEventObject(this);
     GetEventHandler()->ProcessEvent(event);
 }
 
+// ----------------------------------------------------------------------------
+// event handlers
+// ----------------------------------------------------------------------------
+
 // 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);
 }
 
-void wxPanel::OnNavigationKey( wxNavigationKeyEvent& event )
+void wxPanel::OnSize(wxSizeEvent& event)
 {
-    if (m_children.GetCount() < 2) 
-    {
-        event.Skip();
-        return;
-    }
-
-    // don't process these ones here
-    if (event.IsWindowChange()) 
-    {
-        event.Skip();
-        return;
-    }
-
-    wxWindow *winFocus = event.GetCurrentFocus();
-    if (!winFocus) winFocus = wxWindow::FindFocus();
-    
-    if (!winFocus)
-    {
-        event.Skip();
-        return;
-    }
-    
-    wxNode *start_node = m_children.Find( winFocus );
-    if (!start_node) start_node = m_children.First();
-    
-    wxNode *node = event.GetDirection() ? start_node->Next() : start_node->Previous();
-           
-    while (node != start_node)
-    {
-       if (!node)
-       {
-/*
-            if (GetParent() != NULL) 
-           {
-                wxNavigationKeyEvent new_event;
-                new_event.SetDirection( event.GetDirection() );
-                new_event.SetWindowChange(FALSE);
-                new_event.SetCurrentFocus( this );
-
-                if (GetParent()->GetEventHandler()->ProcessEvent(new_event))
-               {  
-                   return;
-               }
-            }
-*/
-           
-           node = event.GetDirection() ? m_children.First() : m_children.Last();
-       }
-               
-       wxWindow *child = (wxWindow*) node->Data();
-               
-       if (child->AcceptsFocus())
-       {
-           child->SetFocus();
-           return;
-       }
-               
-       node = node->Next();
-    }
-    
+#if wxUSE_CONSTRAINTS
+    if (GetAutoLayout())
+        Layout();
+#endif // wxUSE_CONSTRAINTS
     event.Skip();
 }