set m_isBeingDeleted to true (only) in SendDestroyEvent(); call it as early as possib...

[wxWidgets.git] / include / wx / xrc / xh_sizer.h

diff --git a/include/wx/xrc/xh_sizer.h b/include/wx/xrc/xh_sizer.h
index c960d36383cd22eca45a697931b661a84e0bada3..6c3992c7878c68de7bfb9be7477c7a77d008092b 100644 (file)
--- a/include/wx/xrc/xh_sizer.h
+++ b/include/wx/xrc/xh_sizer.h
@@ -12,15 +12,16 @@
 #define _WX_XH_SIZER_H_
 
 #include "wx/xrc/xmlres.h"
 #define _WX_XH_SIZER_H_
 
 #include "wx/xrc/xmlres.h"

-#include "wx/sizer.h"
-#include "wx/gbsizer.h"

 
 

+#if wxUSE_XRC

 
 

-class WXDLLEXPORT wxSizer;
+#include "wx/sizer.h"
+#include "wx/gbsizer.h"

 
 class WXDLLIMPEXP_XRC wxSizerXmlHandler : public wxXmlResourceHandler
 {
 
 class WXDLLIMPEXP_XRC wxSizerXmlHandler : public wxXmlResourceHandler
 {

-DECLARE_DYNAMIC_CLASS(wxSizerXmlHandler)
+    DECLARE_DYNAMIC_CLASS(wxSizerXmlHandler)
+

 public:
     wxSizerXmlHandler();
     virtual wxObject *DoCreateResource();
 public:
     wxSizerXmlHandler();
     virtual wxObject *DoCreateResource();


@@ -38,10 +39,13 @@ private:
     wxObject* Handle_spacer();
     wxObject* Handle_sizer();
     wxSizer*  Handle_wxBoxSizer();
     wxObject* Handle_spacer();
     wxObject* Handle_sizer();
     wxSizer*  Handle_wxBoxSizer();

+#if wxUSE_STATBOX

     wxSizer*  Handle_wxStaticBoxSizer();
     wxSizer*  Handle_wxStaticBoxSizer();

+#endif

     wxSizer*  Handle_wxGridSizer();
     wxSizer*  Handle_wxGridSizer();

-    wxSizer*  Handle_wxFlexGridSizer();
-    wxSizer*  Handle_wxGridBagSizer();
+    wxFlexGridSizer* Handle_wxFlexGridSizer();
+    wxGridBagSizer* Handle_wxGridBagSizer();
+    wxSizer*  Handle_wxWrapSizer();

 
     void SetGrowables(wxFlexGridSizer* fsizer, const wxChar* param, bool rows);
     wxGBPosition GetGBPos(const wxString& param);
 
     void SetGrowables(wxFlexGridSizer* fsizer, const wxChar* param, bool rows);
     wxGBPosition GetGBPos(const wxString& param);


@@ -51,10 +55,13 @@ private:
     void AddSizerItem(wxSizerItem* sitem);
 };
 
     void AddSizerItem(wxSizerItem* sitem);
 };
 

+#if wxUSE_BUTTON

 
 class WXDLLIMPEXP_XRC wxStdDialogButtonSizerXmlHandler
     : public wxXmlResourceHandler
 {
 
 class WXDLLIMPEXP_XRC wxStdDialogButtonSizerXmlHandler
     : public wxXmlResourceHandler
 {

+    DECLARE_DYNAMIC_CLASS(wxStdDialogButtonSizerXmlHandler)
+

 public:
     wxStdDialogButtonSizerXmlHandler();
     virtual wxObject *DoCreateResource();
 public:
     wxStdDialogButtonSizerXmlHandler();
     virtual wxObject *DoCreateResource();


@@ -63,9 +70,10 @@ public:
 private:
     bool m_isInside;
     wxStdDialogButtonSizer *m_parentSizer;
 private:
     bool m_isInside;
     wxStdDialogButtonSizer *m_parentSizer;

-
-    DECLARE_DYNAMIC_CLASS(wxStdDialogButtonSizerXmlHandler)

 };
 
 };
 

+#endif // wxUSE_BUTTON
+
+#endif // wxUSE_XRC

 
 #endif // _WX_XH_SIZER_H_
 
 #endif // _WX_XH_SIZER_H_