X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3c7789014106c9269b0f4ecc1a3071b14f351d3f..6f026b5b63fe7ccb025e84509886f74772b9df13:/src/generic/laywin.cpp diff --git a/src/generic/laywin.cpp b/src/generic/laywin.cpp index 9976702459..5cb58f3f6a 100644 --- a/src/generic/laywin.cpp +++ b/src/generic/laywin.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: laywin.cpp +// Name: src/generic/laywin.cpp // Purpose: Implements a simple layout algorithm, plus // wxSashLayoutWindow which is an example of a window with // layout-awareness (via event handlers). This is suited to @@ -7,7 +7,6 @@ // Author: Julian Smart // Modified by: // Created: 04/01/98 -// RCS-ID: $Id$ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -21,20 +20,25 @@ #ifndef WX_PRECOMP #include "wx/frame.h" - #include "wx/mdi.h" #endif #include "wx/laywin.h" +#include "wx/mdi.h" + IMPLEMENT_DYNAMIC_CLASS(wxQueryLayoutInfoEvent, wxEvent) IMPLEMENT_DYNAMIC_CLASS(wxCalculateLayoutEvent, wxEvent) -wxDEFINE_EVENT( wxEVT_QUERY_LAYOUT_INFO, wxQueryLayoutInfoEvent ) -wxDEFINE_EVENT( wxEVT_CALCULATE_LAYOUT, wxCalculateLayoutEvent ) +wxDEFINE_EVENT( wxEVT_QUERY_LAYOUT_INFO, wxQueryLayoutInfoEvent ); +wxDEFINE_EVENT( wxEVT_CALCULATE_LAYOUT, wxCalculateLayoutEvent ); + + +// ---------------------------------------------------------------------------- +// wxSashLayoutWindow +// ---------------------------------------------------------------------------- #if wxUSE_SASH IMPLEMENT_CLASS(wxSashLayoutWindow, wxSashWindow) - BEGIN_EVENT_TABLE(wxSashLayoutWindow, wxSashWindow) EVT_CALCULATE_LAYOUT(wxSashLayoutWindow::OnCalculateLayout) EVT_QUERY_LAYOUT_INFO(wxSashLayoutWindow::OnQueryLayoutInfo) @@ -174,9 +178,10 @@ void wxSashLayoutWindow::OnCalculateLayout(wxCalculateLayoutEvent& event) } #endif // wxUSE_SASH -/* - * wxLayoutAlgorithm - */ + +// ---------------------------------------------------------------------------- +// wxLayoutAlgorithm +// ---------------------------------------------------------------------------- #if wxUSE_MDI_ARCHITECTURE @@ -232,7 +237,7 @@ bool wxLayoutAlgorithm::LayoutWindow(wxWindow* parent, wxWindow* mainWindow) int leftMargin = 0, rightMargin = 0, topMargin = 0, bottomMargin = 0; #if wxUSE_SASH - if (parent->IsKindOf(CLASSINFO(wxSashWindow))) + if (wxDynamicCast(parent, wxSashWindow)) { wxSashWindow* sashWindow = (wxSashWindow*) parent;