]> git.saurik.com Git - wxWidgets.git/blobdiff - src/generic/panelg.cpp
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
aui dock renumbering fix
[wxWidgets.git] / src / generic / panelg.cpp
diff --git a/src/generic/panelg.cpp b/src/generic/panelg.cpp
index 52d864fbf566aee3899f921b00b3ee4912eaf4ed..d714bce3c08935bc3602c6f9453b590ea8e3adb7 100644 (file)
--- a/src/generic/panelg.cpp
+++ b/src/generic/panelg.cpp
@@ -1,50 +1,111 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////
-// 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$
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:     wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "panelg.h"
-#endif
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 
 // 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"
+    #include "wx/panel.h"
+    #include "wx/containr.h"
 #endif
 
 #endif
 
-#include "wx/generic/panelg.h"
-
-#if !USE_SHARED_LIBRARY
+// ----------------------------------------------------------------------------
+// wxWin macros
+// ----------------------------------------------------------------------------
+
+#if wxUSE_EXTENDED_RTTI
+WX_DEFINE_FLAGS( wxPanelStyle )
+
+wxBEGIN_FLAGS( wxPanelStyle )
+    // new style border flags, we put them first to
+    // use them for streaming out
+    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
+    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
+    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
+    wxFLAGS_MEMBER(wxBORDER_RAISED)
+    wxFLAGS_MEMBER(wxBORDER_STATIC)
+    wxFLAGS_MEMBER(wxBORDER_NONE)
+
+    // old style border flags
+    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
+    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
+    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
+    wxFLAGS_MEMBER(wxRAISED_BORDER)
+    wxFLAGS_MEMBER(wxSTATIC_BORDER)
+    wxFLAGS_MEMBER(wxBORDER)
+
+    // standard window styles
+    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
+    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
+    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
+    wxFLAGS_MEMBER(wxWANTS_CHARS)
+    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
+    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
+    wxFLAGS_MEMBER(wxVSCROLL)
+    wxFLAGS_MEMBER(wxHSCROLL)
+
+wxEND_FLAGS( wxPanelStyle )
+
+IMPLEMENT_DYNAMIC_CLASS_XTI(wxPanel, wxWindow,"wx/panel.h")
+
+wxBEGIN_PROPERTIES_TABLE(wxPanel)
+    wxPROPERTY_FLAGS( WindowStyle , wxPanelStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE, 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
+// style wxTAB_TRAVERSAL
+wxEND_PROPERTIES_TABLE()
+
+wxBEGIN_HANDLERS_TABLE(wxPanel)
+wxEND_HANDLERS_TABLE()
+
+wxCONSTRUCTOR_5( wxPanel , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle )
+
+#else
 IMPLEMENT_DYNAMIC_CLASS(wxPanel, wxWindow)
 IMPLEMENT_DYNAMIC_CLASS(wxPanel, wxWindow)
+#endif
 
 BEGIN_EVENT_TABLE(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_SIZE(wxPanel::OnSize)
+
+    WX_EVENT_TABLE_CONTROL_CONTAINER(wxPanel)
 END_EVENT_TABLE()
 
 END_EVENT_TABLE()
 
-#endif
+// ============================================================================
+// implementation
+// ============================================================================
+
+WX_DELEGATE_TO_CONTROL_CONTAINER(wxPanel, wxWindow)
+
+// ----------------------------------------------------------------------------
+// wxPanel creation
+// ----------------------------------------------------------------------------
 
 void wxPanel::Init()
 {
 
 void wxPanel::Init()
 {
-    m_winLastFocused = (wxWindow *)NULL;
-    m_btnDefault = (wxButton *)NULL;
+    WX_INIT_CONTROL_CONTAINER();
 }
 
 bool wxPanel::Create(wxWindow *parent, wxWindowID id,
 }
 
 bool wxPanel::Create(wxWindow *parent, wxWindowID id,
@@ -53,193 +114,67 @@ 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 ( !wxWindow::Create(parent, id, pos, size, style, name) )
+        return false;
 
 
-    if ( ret )
-    {
-#ifndef __WXGTK__
-        SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
-        SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
+    // so that non-solid background renders correctly under GTK+:
+    SetThemeEnabled(true);
+
+#if defined(__WXWINCE__) && (defined(__POCKETPC__) || defined(__SMARTPHONE__))
+    // Required to get solid control backgrounds under WinCE
+    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
 #endif
 #endif
-    }
 
 
-    return ret;
+    return true;
 }
 
 }
 
-void wxPanel::InitDialog(void)
+wxPanel::~wxPanel()
 {
 {
-    wxInitDialogEvent event(GetId());
-    event.SetEventObject(this);
-    GetEventHandler()->ProcessEvent(event);
 }
 
 }
 
-// Responds to colour changes, and passes event on to children.
-void wxPanel::OnSysColourChanged(wxSysColourChangedEvent& event)
+void wxPanel::InitDialog()
 {
 {
-    SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
-    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;
-    }
-
-    // Did the event emitter tell us where the last focus was?
-    // wxGTK does this in wxWindow, but wxMSW does not. It is
-    // also done in wxPanel if the event is propagated up.
-        wxWindow *winFocus = event.GetCurrentFocus();
-
-    // Do we know where the focus was ourselves, then?
-    if (!winFocus)
-        winFocus = m_winLastFocused;
-
-    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 )
-    {
-        // Have we come to the last or first item on the panel?
-        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_parent = this;
-            for ( wxWindow *parent = GetParent(); parent; parent = parent->GetParent() )
-            {
-                // we don't want to tab into a different dialog or frame
-                if ( focussed_child_of_parent->IsTopLevel() )
-                    break;
-
-                // is the parent a panel?
-                wxPanel *panel = wxDynamicCast(parent, wxPanel);
-                if (panel)
-                {
-                    event.SetCurrentFocus( focussed_child_of_parent );
-                    if (parent->GetEventHandler()->ProcessEvent( event ))
-                        return;
-                }
-
-                focussed_child_of_parent = parent;
-            }
-
-            // 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() )
-        {
-            m_winLastFocused = child;  // should be redundant, but it is not
-            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();
+    wxInitDialogEvent event(GetId());
+    event.SetEventObject(this);
+    GetEventHandler()->ProcessEvent(event);
 }
 
 }
 
+// ----------------------------------------------------------------------------
+// event handlers
+// ----------------------------------------------------------------------------
 
 
-void wxPanel::OnSize(wxSizeEvent& WXUNUSED(event))
+void wxPanel::OnSize(wxSizeEvent& event)
 {
 {
+    if (GetAutoLayout())
+        Layout();
 #if wxUSE_CONSTRAINTS
 #if wxUSE_CONSTRAINTS
-    if (GetAutoLayout()) Layout();
-#endif
-}
-
-void wxPanel::SetFocus()
-{
-    // If the panel gets the focus *by way of getting it set directly*
-    // we move it to the first window that can get it.
-
-    wxNode *node = GetChildren().First();
-    while (node)
+#if defined(__WXPM__) && 0
+    else
     {
     {
-        wxWindow *child = (wxWindow*) node->Data();
-        if (child->AcceptsFocus())
-        {
-            m_winLastFocused = child;   // should be redundant, but it is not
-            child->SetFocus();
-            return;
-        }
-        node = node->Next();
-    }
-
-    m_winLastFocused = (wxWindow*) NULL;
-
-    wxWindow::SetFocus();
-}
+        // Need to properly move child windows under OS/2
 
 
-void wxPanel::OnFocus(wxFocusEvent& event)
-{
-    // If the panel gets the focus *by way of getting clicked on*
-    // we move it to either the last window that had the focus or
-    // the first one that can get it.
+        PSWP                        pWinSwp = GetSwp();
 
 
-    if (m_winLastFocused)
-    {
-        // it might happen that the window got reparented...
-        if ( m_winLastFocused->GetParent() == this )
+        if (pWinSwp->cx == 0 && pWinSwp->cy == 0 && pWinSwp->fl == 0)
         {
         {
-            m_winLastFocused->SetFocus();
-            return;
-        }
-    }
+            // Uninitialized
 
 
-    wxNode *node = GetChildren().First();
-    while (node)
-    {
-        wxWindow *child = (wxWindow*) node->Data();
-        if (child->AcceptsFocus())
+            ::WinQueryWindowPos(GetHWND(), pWinSwp);
+        }
+        else
         {
         {
-            m_winLastFocused = child;  // should be redundant, but it is not
-            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 = node->Next();
     }
     }
-
-    m_winLastFocused = (wxWindow*) NULL;
+#endif
+#endif // wxUSE_CONSTRAINTS
 
     event.Skip();
 }
 
     event.Skip();
 }
wxWidgets (Impactor)