A few tweaks and cleanups

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

diff --git a/src/generic/panelg.cpp b/src/generic/panelg.cpp
index e9339b481a876516a56ade8d343d54de4e8e7576..a67f7da2e556f1d644102a94c97377f9657f914f 100644 (file)
--- a/src/generic/panelg.cpp
+++ b/src/generic/panelg.cpp
@@ -1,50 +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
 // 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__
 #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__
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

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

 #endif
 
 #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)
 IMPLEMENT_DYNAMIC_CLASS(wxPanel, wxWindow)
 
 BEGIN_EVENT_TABLE(wxPanel, wxWindow)

-  EVT_SYS_COLOUR_CHANGED(wxPanel::OnSysColourChanged)
-  EVT_SET_FOCUS(wxPanel::OnFocus)
-  EVT_NAVIGATION_KEY(wxPanel::OnNavigationKey)
-  EVT_SIZE(wxPanel::OnSize)
+    EVT_SYS_COLOUR_CHANGED(wxPanel::OnSysColourChanged)
+
+    EVT_SIZE(wxPanel::OnSize)
+
+    WX_EVENT_TABLE_CONTROL_CONTAINER(wxPanel)

 END_EVENT_TABLE()
 
 END_EVENT_TABLE()
 

-#endif
+// ============================================================================
+// implementation
+// ============================================================================
+
+WX_DELEGATE_TO_CONTROL_CONTAINER(wxPanel)
+
+// ----------------------------------------------------------------------------
+// wxPanel creation
+// ----------------------------------------------------------------------------

 
 void wxPanel::Init()
 {
 
 void wxPanel::Init()
 {

-    m_winLastFocused = (wxWindow *)NULL;
-    m_btnDefault = (wxButton *)NULL;
+    m_container.SetContainerWindow(this);

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


@@ -53,138 +74,40 @@ bool wxPanel::Create(wxWindow *parent, wxWindowID id,
                      long style,
                      const wxString& name)
 {
                      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);
 }
 
 {
     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)
 {
 // 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::OnNavigationKey( wxNavigationKeyEvent& event )
-{
-    // there is not much to do if we have only one child (or not at all)
-    if (GetChildren().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;
-    }
-
-    wxWindowList::Node *start_node = GetChildren().Find( winFocus );
-    if ( !start_node )
-        start_node = GetChildren().Find( m_winLastFocused );
-    if ( !start_node )
-        start_node = GetChildren().GetFirst();
-
-    wxWindowList::Node *node = event.GetDirection() ? start_node->GetNext()
-                                                    : start_node->GetPrevious();
-
-    while ( node != start_node )
-    {
-        if ( !node )
-        {
-            // check if our (may be grand) parent is another panel: if this is
-            // the case, they will know what to do with this navigation key and
-            // so give them the chance to process it instead of looping inside
-            // this panel (normally, the focus will go to the next/previous
-            // item after this panel in the parent panel)
-           wxWindow *focussed_child_of_p = this;
-            for ( wxWindow *p = GetParent(); p; p = p->GetParent() )
-            {
-               // we don't want to tab into a different dialog or frame
-               if ( focussed_child_of_p->IsTopLevel() )
-                   break;
-
-                if ( wxDynamicCast(p, wxPanel) )
-                {
-                   event.SetCurrentFocus( focussed_child_of_p );
-                   if (p->GetEventHandler()->ProcessEvent( event ))
-                        return;
-                }
-               focussed_child_of_p = p;
-            }
-
-            // no, we are not inside another panel so process this ourself
-            node = event.GetDirection() ? GetChildren().GetFirst()
-                                        : GetChildren().GetLast();
-
-            continue;
-        }
-
-        wxWindow *child = node->GetData();
-
-        if ( child->AcceptsFocus() )
-        {
-            // ok, event processed
-            child->SetFocus();
-            return;
-        }
-
-        node = event.GetDirection() ? node->GetNext() : node->GetPrevious();
-    }
-
-    // we cycled through all of our children and none of them wanted to accept
-    // focus
-    event.Skip();
-}
-
-
-void wxPanel::OnSize(wxSizeEvent& WXUNUSED(event))
+void wxPanel::OnSize(wxSizeEvent& event)

 {
 #if wxUSE_CONSTRAINTS
 {
 #if wxUSE_CONSTRAINTS

-    if (GetAutoLayout()) Layout();
-#endif
+    if (GetAutoLayout())
+        Layout();
+#endif // wxUSE_CONSTRAINTS
+    event.Skip();

 }
 
 }
 

-void wxPanel::OnFocus(wxFocusEvent& event)
-{
-    if ( m_winLastFocused )
-    {
-        // it might happen that the window got reparented...
-        if ( m_winLastFocused->GetParent() != this )
-            m_winLastFocused = (wxWindow *)NULL;
-        else
-            m_winLastFocused->SetFocus();
-    }
-    else
-        event.Skip();
-}