X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/edccf4281bc8fbb9d8151240ba5b208339c9ac11..d89e39fcdccbf0532b3c48090349e5e33bd20166:/src/generic/panelg.cpp

diff --git a/src/generic/panelg.cpp b/src/generic/panelg.cpp
index 9ae2865482..d7f69ce937 100644
--- a/src/generic/panelg.cpp
+++ b/src/generic/panelg.cpp
@@ -1,49 +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/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
 
-#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_SET_FOCUS(wxPanel::OnFocus)
-  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 creation
+// ----------------------------------------------------------------------------
 
 void wxPanel::Init()
 {
-    m_lastFocus = 0;
-    m_btnDefault = (wxButton *)NULL;
+    m_container.SetContainerWindow(this);
 }
 
 bool wxPanel::Create(wxWindow *parent, wxWindowID id,
@@ -52,104 +74,67 @@ 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)
 {
-    // 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())
+#if wxUSE_CONSTRAINTS
+    if (GetAutoLayout())
+        Layout();
+#if defined(__WXPM__)
+    else
     {
-        event.Skip();
-        return;
-    }
-
-    wxWindow *winFocus = event.GetCurrentFocus();
-    if (!winFocus)
-        winFocus = wxWindow::FindFocus();
+        // Need to properly move child windows under OS/2
 
-    if (!winFocus)
-    {
-        event.Skip();
-        return;
-    }
+        PSWP                        pWinSwp = GetSwp();
 
-    wxWindowList::Node *start_node = GetChildren().Find( winFocus );
-    if (!start_node)
-        start_node = GetChildren().GetFirst();
-
-    wxWindowList::Node *node = event.GetDirection() ? start_node->GetNext()
-                                                    : start_node->GetPrevious();
-
-    while (node != start_node)
-    {
-        if (!node)
+        if (pWinSwp->cx == 0 && pWinSwp->cy == 0 && pWinSwp->fl == 0)
         {
-            node = event.GetDirection() ? GetChildren().GetFirst()
-                                        : GetChildren().GetLast();
-
-            continue;
-        }
-
-        wxWindow *child = node->GetData();
+            // Uninitialized
 
-        if (child->AcceptsFocus())
+            ::WinQueryWindowPos(GetHWND(), pWinSwp);
+	}
+	else
         {
-            // ok, event processed
-            child->SetFocus();
-            return;
+            SWP                     vSwp;
+            int                     nYDiff;
+
+            ::WinQueryWindowPos(GetHWND(), &vSwp);
+            nYDiff = pWinSwp->cy - vSwp.cy;
+            MoveChildren(nYDiff);
+            pWinSwp->cx = vSwp.cx;
+            pWinSwp->cy = vSwp.cy;
         }
-
-        node = event.GetDirection() ? node->GetNext() : node->GetPrevious();
     }
+#endif
+#endif // wxUSE_CONSTRAINTS
 
-    // we cycled through all of our children and none of them wanted to accept
-    // focus
     event.Skip();
 }
 
-void wxPanel::OnFocus(wxFocusEvent& event)
-{
-    if (m_lastFocus != 0)
-    {
-        wxWindow* child = FindWindow(m_lastFocus);
-        if (child)
-            child->SetFocus();
-    }
-    else
-        event.Skip();
-}