use native conversions that are close to the native storage of wxString

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

diff --git a/src/generic/laywin.cpp b/src/generic/laywin.cpp
index 997670245937ad8ac92d9267cb7a1de271904dbc..2057e101f4cf378204d6223c215b9a89a88cb5db 100644 (file)
--- a/src/generic/laywin.cpp
+++ b/src/generic/laywin.cpp
@@ -21,10 +21,11 @@
 
 #ifndef WX_PRECOMP
     #include "wx/frame.h"
 
 #ifndef WX_PRECOMP
     #include "wx/frame.h"

-    #include "wx/mdi.h"

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

+#include "wx/mdi.h"
+

 
 IMPLEMENT_DYNAMIC_CLASS(wxQueryLayoutInfoEvent, wxEvent)
 IMPLEMENT_DYNAMIC_CLASS(wxCalculateLayoutEvent, wxEvent)
 
 IMPLEMENT_DYNAMIC_CLASS(wxQueryLayoutInfoEvent, wxEvent)
 IMPLEMENT_DYNAMIC_CLASS(wxCalculateLayoutEvent, wxEvent)


@@ -32,9 +33,13 @@ 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)
 #if wxUSE_SASH
 IMPLEMENT_CLASS(wxSashLayoutWindow, wxSashWindow)

-

 BEGIN_EVENT_TABLE(wxSashLayoutWindow, wxSashWindow)
     EVT_CALCULATE_LAYOUT(wxSashLayoutWindow::OnCalculateLayout)
     EVT_QUERY_LAYOUT_INFO(wxSashLayoutWindow::OnQueryLayoutInfo)
 BEGIN_EVENT_TABLE(wxSashLayoutWindow, wxSashWindow)
     EVT_CALCULATE_LAYOUT(wxSashLayoutWindow::OnCalculateLayout)
     EVT_QUERY_LAYOUT_INFO(wxSashLayoutWindow::OnQueryLayoutInfo)


@@ -174,9 +179,10 @@ void wxSashLayoutWindow::OnCalculateLayout(wxCalculateLayoutEvent& event)
 }
 #endif // wxUSE_SASH
 
 }
 #endif // wxUSE_SASH
 

-/*
- * wxLayoutAlgorithm
- */
+
+// ----------------------------------------------------------------------------
+// wxLayoutAlgorithm
+// ----------------------------------------------------------------------------

 
 #if wxUSE_MDI_ARCHITECTURE
 
 
 #if wxUSE_MDI_ARCHITECTURE