X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/879dcac2f175944bc0c54419531c1b043645d3d2..1978421a6d8b81c1f8a961da4b8ddf544fec7b1b:/src/generic/panelg.cpp diff --git a/src/generic/panelg.cpp b/src/generic/panelg.cpp index 0c7b85fb42..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) @@ -107,22 +121,20 @@ void wxPanel::OnSize(wxSizeEvent& event) #if wxUSE_CONSTRAINTS if (GetAutoLayout()) Layout(); -#endif // wxUSE_CONSTRAINTS - - // - // Need to properly move child windows under OS/2 - // #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 + } + else { SWP vSwp; int nYDiff; @@ -135,6 +147,8 @@ void wxPanel::OnSize(wxSizeEvent& event) } } #endif +#endif // wxUSE_CONSTRAINTS + event.Skip(); }