X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/456bc6d9b83882a3b0e919fc733898d9d331ecd6..1978421a6d8b81c1f8a961da4b8ddf544fec7b1b:/src/generic/panelg.cpp?ds=inline diff --git a/src/generic/panelg.cpp b/src/generic/panelg.cpp index f42365f225..8213de3ba1 100644 --- a/src/generic/panelg.cpp +++ b/src/generic/panelg.cpp @@ -5,8 +5,8 @@ // 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 ///////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -17,7 +17,7 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "panelg.h" #endif @@ -43,7 +43,21 @@ // wxWin macros // ---------------------------------------------------------------------------- +#if wxUSE_EXTENDED_RTTI +IMPLEMENT_DYNAMIC_CLASS_XTI(wxPanel, wxWindow,"wx/panel.h") + +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) @@ -57,7 +71,7 @@ END_EVENT_TABLE() // implementation // ============================================================================ -WX_DELEGATE_TO_CONTROL_CONTAINER(wxPanel, m_container) +WX_DELEGATE_TO_CONTROL_CONTAINER(wxPanel) // ---------------------------------------------------------------------------- // wxPanel creation @@ -65,7 +79,7 @@ WX_DELEGATE_TO_CONTROL_CONTAINER(wxPanel, m_container) void wxPanel::Init() { - m_container = new wxControlContainer(this); + m_container.SetContainerWindow(this); } bool wxPanel::Create(wxWindow *parent, wxWindowID id, @@ -79,13 +93,8 @@ bool wxPanel::Create(wxWindow *parent, wxWindowID id, wxPanel::~wxPanel() { - delete m_container; } -// ---------------------------------------------------------------------------- -// misc -// ---------------------------------------------------------------------------- - void wxPanel::InitDialog() { wxInitDialogEvent event(GetId()); @@ -93,21 +102,53 @@ void wxPanel::InitDialog() 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::OnSize(wxSizeEvent& WXUNUSED(event)) +void wxPanel::OnSize(wxSizeEvent& event) { #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 + + event.Skip(); }