Don't create multiple parent-less top level frames in layout sample.

[wxWidgets.git] / include / wx / collpane.h

diff --git a/include/wx/collpane.h b/include/wx/collpane.h
index 2d97a0b6b54ec1d1cfa37ec1e4bf5c807e7d64a7..337000e640cbbb447274f9406c2ecc0e1f2cb4eb 100644 (file)
--- a/include/wx/collpane.h
+++ b/include/wx/collpane.h
@@ -53,14 +53,14 @@ public:
 
 class WXDLLIMPEXP_FWD_CORE wxCollapsiblePaneEvent;
 
 
 class WXDLLIMPEXP_FWD_CORE wxCollapsiblePaneEvent;
 

-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_COLLPANE_CHANGED, wxCollapsiblePaneEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COLLAPSIBLEPANE_CHANGED, wxCollapsiblePaneEvent );

 
 class WXDLLIMPEXP_CORE wxCollapsiblePaneEvent : public wxCommandEvent
 {
 public:
     wxCollapsiblePaneEvent() {}
     wxCollapsiblePaneEvent(wxObject *generator, int id, bool collapsed)
 
 class WXDLLIMPEXP_CORE wxCollapsiblePaneEvent : public wxCommandEvent
 {
 public:
     wxCollapsiblePaneEvent() {}
     wxCollapsiblePaneEvent(wxObject *generator, int id, bool collapsed)

-        : wxCommandEvent(wxEVT_COMMAND_COLLPANE_CHANGED, id),
+        : wxCommandEvent(wxEVT_COLLAPSIBLEPANE_CHANGED, id),

         m_bCollapsed(collapsed)
     {
         SetEventObject(generator);
         m_bCollapsed(collapsed)
     {
         SetEventObject(generator);


@@ -89,7 +89,7 @@ typedef void (wxEvtHandler::*wxCollapsiblePaneEventFunction)(wxCollapsiblePaneEv
     wxEVENT_HANDLER_CAST(wxCollapsiblePaneEventFunction, func)
 
 #define EVT_COLLAPSIBLEPANE_CHANGED(id, fn) \
     wxEVENT_HANDLER_CAST(wxCollapsiblePaneEventFunction, func)
 
 #define EVT_COLLAPSIBLEPANE_CHANGED(id, fn) \

-    wx__DECLARE_EVT1(wxEVT_COMMAND_COLLPANE_CHANGED, id, wxCollapsiblePaneEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_COLLAPSIBLEPANE_CHANGED, id, wxCollapsiblePaneEventHandler(fn))

 
 
 #if defined(__WXGTK20__) && !defined(__WXUNIVERSAL__)
 
 
 #if defined(__WXGTK20__) && !defined(__WXUNIVERSAL__)


@@ -101,6 +101,9 @@ typedef void (wxEvtHandler::*wxCollapsiblePaneEventFunction)(wxCollapsiblePaneEv
     #define wxCollapsiblePane wxGenericCollapsiblePane
 #endif
 
     #define wxCollapsiblePane wxGenericCollapsiblePane
 #endif
 

+// old wxEVT_COMMAND_* constant
+#define wxEVT_COMMAND_COLLPANE_CHANGED   wxEVT_COLLAPSIBLEPANE_CHANGED
+

 #endif // wxUSE_COLLPANE
 
 #endif // _WX_COLLAPSABLE_PANE_H_BASE_
 #endif // wxUSE_COLLPANE
 
 #endif // _WX_COLLAPSABLE_PANE_H_BASE_