X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e4ffaca45548c79ee89dce9779b79e2d25c6f068..3e1924dd5f5744c3e2a8973de9b3e4f372b7fd85:/src/generic/panelg.cpp?ds=sidebyside diff --git a/src/generic/panelg.cpp b/src/generic/panelg.cpp index 83d3d1fd6e..d714bce3c0 100644 --- a/src/generic/panelg.cpp +++ b/src/generic/panelg.cpp @@ -1,48 +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$ -// 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__ -#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" + #include "wx/panel.h" + #include "wx/containr.h" #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) +#endif 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) + + WX_EVENT_TABLE_CONTROL_CONTAINER(wxPanel) END_EVENT_TABLE() -#endif +// ============================================================================ +// implementation +// ============================================================================ + +WX_DELEGATE_TO_CONTROL_CONTAINER(wxPanel, wxWindow) -wxPanel::wxPanel() +// ---------------------------------------------------------------------------- +// wxPanel creation +// ---------------------------------------------------------------------------- + +void wxPanel::Init() { - m_lastFocus = NULL; + WX_INIT_CONTROL_CONTAINER(); } bool wxPanel::Create(wxWindow *parent, wxWindowID id, @@ -51,102 +114,67 @@ bool wxPanel::Create(wxWindow *parent, wxWindowID id, long style, const wxString& name) { - m_lastFocus = NULL; + if ( !wxWindow::Create(parent, id, pos, size, style, name) ) + return false; - bool ret = wxWindow::Create(parent, id, pos, size, style, name); + // so that non-solid background renders correctly under GTK+: + SetThemeEnabled(true); - if ( ret ) - { -#ifndef __WXGTK__ - SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE)); - SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT)); +#if defined(__WXWINCE__) && (defined(__POCKETPC__) || defined(__SMARTPHONE__)) + // Required to get solid control backgrounds under WinCE + SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW)); #endif - } - return ret; + return true; } -void wxPanel::InitDialog(void) +wxPanel::~wxPanel() +{ +} + +void wxPanel::InitDialog() { wxInitDialogEvent event(GetId()); event.SetEventObject(this); GetEventHandler()->ProcessEvent(event); } -// Responds to colour changes, and passes event on to children. -void wxPanel::OnSysColourChanged(wxSysColourChangedEvent& event) -{ - SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE)); - Refresh(); +// ---------------------------------------------------------------------------- +// event handlers +// ---------------------------------------------------------------------------- - // 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()) - { - event.Skip(); - return; - } - - wxWindow *winFocus = event.GetCurrentFocus(); - if (!winFocus) - winFocus = wxWindow::FindFocus(); - - if (!winFocus) + if (GetAutoLayout()) + Layout(); +#if wxUSE_CONSTRAINTS +#if defined(__WXPM__) && 0 + else { - event.Skip(); - return; - } + // Need to properly move child windows under OS/2 - wxNode *start_node = GetChildren().Find( winFocus ); - if (!start_node) - start_node = GetChildren().First(); + PSWP pWinSwp = GetSwp(); - wxNode *node = event.GetDirection() ? start_node->Next() - : start_node->Previous(); - - while (node != start_node) - { - if (!node) + if (pWinSwp->cx == 0 && pWinSwp->cy == 0 && pWinSwp->fl == 0) { - node = event.GetDirection() ? GetChildren().First() - : GetChildren().Last(); + // Uninitialized - continue; + ::WinQueryWindowPos(GetHWND(), pWinSwp); } - - wxWindow *child = (wxWindow *)node->Data(); - - if (child->AcceptsFocus()) + 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->Next() : node->Previous(); } +#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 ) - m_lastFocus->SetFocus(); - else - event.Skip(); -}