Corrections to config checking; tweaking wxUniv's setup.h; added fix to makeb32.env

[wxWidgets.git] / src / generic / laywin.cpp

diff --git a/src/generic/laywin.cpp b/src/generic/laywin.cpp
index 26fb6fdf52fdcdf5765ae18baf729a4d3505fb89..ea613698ec66cac91284192522de77621bbbf673 100644 (file)
--- a/src/generic/laywin.cpp
+++ b/src/generic/laywin.cpp
@@ -24,7 +24,6 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-#include "wx/wx.h"

 #include "wx/mdi.h"
 #endif
 
 #include "wx/mdi.h"
 #endif
 


@@ -33,8 +32,8 @@
 IMPLEMENT_DYNAMIC_CLASS(wxQueryLayoutInfoEvent, wxEvent)
 IMPLEMENT_DYNAMIC_CLASS(wxCalculateLayoutEvent, wxEvent)
 
 IMPLEMENT_DYNAMIC_CLASS(wxQueryLayoutInfoEvent, wxEvent)
 IMPLEMENT_DYNAMIC_CLASS(wxCalculateLayoutEvent, wxEvent)
 

-const int wxEVT_QUERY_LAYOUT_INFO = wxNewEventType();
-const int wxEVT_CALCULATE_LAYOUT = wxNewEventType();
+DEFINE_EVENT_TYPE(wxEVT_QUERY_LAYOUT_INFO)
+DEFINE_EVENT_TYPE(wxEVT_CALCULATE_LAYOUT)

 
 #if wxUSE_SASH
 IMPLEMENT_CLASS(wxSashLayoutWindow, wxSashWindow)
 
 #if wxUSE_SASH
 IMPLEMENT_CLASS(wxSashLayoutWindow, wxSashWindow)


@@ -179,6 +178,8 @@ void wxSashLayoutWindow::OnCalculateLayout(wxCalculateLayoutEvent& event)
  * wxLayoutAlgorithm
  */
 
  * wxLayoutAlgorithm
  */
 

+#if wxUSE_MDI_ARCHITECTURE
+

 // Lays out windows for an MDI frame. The MDI client area gets what's left
 // over.
 bool wxLayoutAlgorithm::LayoutMDIFrame(wxMDIParentFrame* frame, wxRect* r)
 // Lays out windows for an MDI frame. The MDI client area gets what's left
 // over.
 bool wxLayoutAlgorithm::LayoutMDIFrame(wxMDIParentFrame* frame, wxRect* r)


@@ -216,6 +217,8 @@ bool wxLayoutAlgorithm::LayoutMDIFrame(wxMDIParentFrame* frame, wxRect* r)
     return TRUE;
 }
 
     return TRUE;
 }
 

+#endif // wxUSE_MDI_ARCHITECTURE
+

 // Layout algorithm for any window. mainWindow gets what's left over.
 bool wxLayoutAlgorithm::LayoutWindow(wxWindow* parent, wxWindow* mainWindow)
 {
 // Layout algorithm for any window. mainWindow gets what's left over.
 bool wxLayoutAlgorithm::LayoutWindow(wxWindow* parent, wxWindow* mainWindow)
 {