don't disable wxLogTrace() at debug levels < 2

[wxWidgets.git] / interface / wx / laywin.h

diff --git a/interface/wx/laywin.h b/interface/wx/laywin.h
index 8256747bf4645c57a58a79ff29688d2a5b455a0f..74eab3752f26042d94a14d18cbf814db6b5a6efd 100644 (file)
--- a/interface/wx/laywin.h
+++ b/interface/wx/laywin.h
@@ -90,7 +90,7 @@ enum wxLayoutAlignment
           It is an alternative way of specifying layouts for which the normal
           constraint system is unsuitable.
 
           It is an alternative way of specifying layouts for which the normal
           constraint system is unsuitable.
 

-    @beginEventTable{wxQueryLayoutInfoEvent,wxCalculateLayoutEvent}
+    @beginEventEmissionTable{wxQueryLayoutInfoEvent,wxCalculateLayoutEvent}

     @event{EVT_QUERY_LAYOUT_INFO(func)}
         Process a wxEVT_QUERY_LAYOUT_INFO event, to get size, orientation and
         alignment from a window. See wxQueryLayoutInfoEvent.
     @event{EVT_QUERY_LAYOUT_INFO(func)}
         Process a wxEVT_QUERY_LAYOUT_INFO event, to get size, orientation and
         alignment from a window. See wxQueryLayoutInfoEvent.


@@ -106,7 +106,7 @@ enum wxLayoutAlignment
     @library{wxadv}
     @category{winlayout}
 
     @library{wxadv}
     @category{winlayout}
 

-    @see wxSashEvent, wxSashLayoutWindow, @ref overview_eventhandling
+    @see wxSashEvent, wxSashLayoutWindow, @ref overview_events

 */
 class wxLayoutAlgorithm : public wxObject
 {
 */
 class wxLayoutAlgorithm : public wxObject
 {


@@ -169,7 +169,7 @@ public:
     @library{wxadv}
     @category{miscwnd}
 
     @library{wxadv}
     @category{miscwnd}
 

-    @see wxLayoutAlgorithm, wxSashWindow, @ref overview_eventhandling
+    @see wxLayoutAlgorithm, wxSashWindow, @ref overview_events

 */
 class wxSashLayoutWindow : public wxSashWindow
 {
 */
 class wxSashLayoutWindow : public wxSashWindow
 {


@@ -225,7 +225,7 @@ public:
         @param name
             Window name.
     */
         @param name
             Window name.
     */

-    bool Create(wxSashLayoutWindow* parent, wxWindowID id,
+    bool Create(wxWindow* parent, wxWindowID id = wxID_ANY,

                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxCLIP_CHILDREN | wxSW_3D,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxCLIP_CHILDREN | wxSW_3D,


@@ -316,7 +316,7 @@ public:
         client area the window sticks to).
         One of wxLAYOUT_TOP, wxLAYOUT_LEFT, wxLAYOUT_RIGHT, wxLAYOUT_BOTTOM.
     */
         client area the window sticks to).
         One of wxLAYOUT_TOP, wxLAYOUT_LEFT, wxLAYOUT_RIGHT, wxLAYOUT_BOTTOM.
     */

-    void GetAlignment() const;
+    wxLayoutAlignment GetAlignment() const;

 
     /**
         Returns the flags associated with this event. Not currently used.
 
     /**
         Returns the flags associated with this event. Not currently used.