X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/86bb7d48256bbca4b3e09c05125c3b6333a506ef..1978421a6d8b81c1f8a961da4b8ddf544fec7b1b:/src/generic/panelg.cpp diff --git a/src/generic/panelg.cpp b/src/generic/panelg.cpp index c58841ba5c..8213de3ba1 100644 --- a/src/generic/panelg.cpp +++ b/src/generic/panelg.cpp @@ -1,43 +1,85 @@ ///////////////////////////////////////////////////////////////////////////// -// 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 +// Copyright: (c) Julian Smart +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "panelg.h" +// ============================================================================ +// declarations +// ============================================================================ + +// ---------------------------------------------------------------------------- +// headers +// ---------------------------------------------------------------------------- + +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) + #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 wxUSE_EXTENDED_RTTI +IMPLEMENT_DYNAMIC_CLASS_XTI(wxPanel, wxWindow,"wx/panel.h") -#if !USE_SHARED_LIBRARY +WX_BEGIN_PROPERTIES_TABLE(wxPanel) +// style wxTAB_TRAVERSAL +WX_END_PROPERTIES_TABLE() + +WX_BEGIN_HANDLERS_TABLE(wxPanel) +WX_END_HANDLERS_TABLE() + +WX_CONSTRUCTOR_4( wxPanel , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size ) + +#else IMPLEMENT_DYNAMIC_CLASS(wxPanel, wxWindow) +#endif 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,130 +88,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 ) { - SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE)); - SetDefaultBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE)); - SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT)); - } - - return ret; + return wxWindow::Create(parent, id, pos, size, style, name); } -void wxPanel::InitDialog(void) +wxPanel::~wxPanel() { - wxInitDialogEvent event(GetId()); - event.SetEventObject(this); - GetEventHandler()->ProcessEvent(event); } -void wxPanel::SetFocus() +void wxPanel::InitDialog() { - SetFocusToNextChild(); + 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)); - SetDefaultBackgroundColour(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) { - // don't process these ones here - if ( event.IsWindowChange() ) { - event.Skip(); - return; - } - - // first of all, find the window which currently has the focus - wxNode *node = GetChildren()->First(); - wxWindow *winFocus = event.GetCurrentFocus(); - - // @@@ no FindFocus() in wxGTK - #ifndef __WXGTK__ - if ( winFocus == NULL ) - winFocus = wxWindow::FindFocus(); - #endif - - while ( node != NULL ) { - if ( node->Data() == winFocus ) - break; - - node = node->Next(); - } - - if ( !SetFocusToNextChild(node, event.GetDirection()) ) - event.Skip(); -} - -// set focus to the next child which accepts it (or first/last if node == NULL) -bool wxPanel::SetFocusToNextChild(wxNode *node, bool bForward) -{ - // @@ using typed list would be better... - #define WIN(node) ((wxWindow *)(node->Data())) - - bool bFound = FALSE; // have we found a window we will set focus to? - - wxList *children = GetChildren(); - if ( node == NULL ) { - // we've never had focus before - node = bForward ? children->First() : children->Last(); - if ( node == NULL ) { - // no children - return FALSE; - } - - bFound = WIN(node)->AcceptsFocus(); - } -#if 0 // to restore when it will really work (now it's triggered all the time) - else { - // just to be sure it's the right one - wxASSERT( WIN(node)->AcceptsFocus() ); - } -#endif // 0 - - // find the next child which accepts focus - bool bParentWantsIt = TRUE; - while ( !bFound ) { - node = bForward ? node->Next() : node->Previous(); - if ( node == NULL ) { - if ( !bParentWantsIt ) { - // we've already been here which means that we've done a whole - // cycle without success - get out from the infinite loop - return FALSE; - } - - // ask parent if he doesn't want to advance focus to the next panel - if ( GetParent() != NULL ) { - wxNavigationKeyEvent event; - event.SetDirection(bForward); - event.SetWindowChange(FALSE); - event.SetCurrentFocus(this); - - if ( GetParent()->ProcessEvent(event) ) - return TRUE; - } - - // a sentinel to avoid infinite loops - bParentWantsIt = FALSE; - - // wrap around - node = bForward ? children->First() : children->Last(); +#if wxUSE_CONSTRAINTS + if (GetAutoLayout()) + Layout(); +#if defined(__WXPM__) + else + { + // Need to properly move child windows under OS/2 + + PSWP pWinSwp = GetSwp(); + + if (pWinSwp->cx == 0 && pWinSwp->cy == 0 && pWinSwp->fl == 0) + { + // 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; + } } +#endif +#endif // wxUSE_CONSTRAINTS - bFound = WIN(node)->AcceptsFocus(); - } - - WIN(node)->SetFocus(); - - #undef WIN - - return TRUE; + event.Skip(); } +