correct the inversed assert check in LVN_DELETEITEM handler (closes #10831)

[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 0c7d16a4ef2f4a0ee9eebbdf039527341c2ce15e..5d57d7ea663eaad33434feeae29eb6be72cf40a5 100644 (file)
--- a/include/wx/xrc/xh_sizer.h
+++ b/include/wx/xrc/xh_sizer.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        xh_sizer.h
+// Name:        wx/xrc/xh_sizer.h

 // Purpose:     XML resource handler for wxBoxSizer
 // Author:      Vaclav Slavik
 // Created:     2000/04/24
 // Purpose:     XML resource handler for wxBoxSizer
 // Author:      Vaclav Slavik
 // Created:     2000/04/24


@@ -11,17 +11,17 @@
 #ifndef _WX_XH_SIZER_H_
 #define _WX_XH_SIZER_H_
 
 #ifndef _WX_XH_SIZER_H_
 #define _WX_XH_SIZER_H_
 

-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "xh_sizer.h"
-#endif
-

 #include "wx/xrc/xmlres.h"
 
 #include "wx/xrc/xmlres.h"
 

+#if wxUSE_XRC

 
 

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

 
 

-class WXXMLDLLEXPORT wxSizerXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxSizerXmlHandler : public wxXmlResourceHandler

 {
 {

+    DECLARE_DYNAMIC_CLASS(wxSizerXmlHandler)
+

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


@@ -29,10 +29,52 @@ public:
 
 private:
     bool m_isInside;
 
 private:
     bool m_isInside;

+    bool m_isGBS;
+

     wxSizer *m_parentSizer;
 
     bool IsSizerNode(wxXmlNode *node);
     wxSizer *m_parentSizer;
 
     bool IsSizerNode(wxXmlNode *node);

+
+    wxObject* Handle_sizeritem();
+    wxObject* Handle_spacer();
+    wxObject* Handle_sizer();
+    wxSizer*  Handle_wxBoxSizer();
+#if wxUSE_STATBOX
+    wxSizer*  Handle_wxStaticBoxSizer();
+#endif
+    wxSizer*  Handle_wxGridSizer();
+    wxFlexGridSizer* Handle_wxFlexGridSizer();
+    wxGridBagSizer* Handle_wxGridBagSizer();
+    wxSizer*  Handle_wxWrapSizer();
+
+    bool ValidateGridSizerChildren();
+    void SetGrowables(wxFlexGridSizer* fsizer, const wxChar* param, bool rows);
+    wxGBPosition GetGBPos(const wxString& param);
+    wxGBSpan GetGBSpan(const wxString& param);
+    wxSizerItem* MakeSizerItem();
+    void SetSizerItemAttributes(wxSizerItem* sitem);
+    void AddSizerItem(wxSizerItem* sitem);

 };
 
 };
 

+#if wxUSE_BUTTON
+
+class WXDLLIMPEXP_XRC wxStdDialogButtonSizerXmlHandler
+    : public wxXmlResourceHandler
+{
+    DECLARE_DYNAMIC_CLASS(wxStdDialogButtonSizerXmlHandler)
+
+public:
+    wxStdDialogButtonSizerXmlHandler();
+    virtual wxObject *DoCreateResource();
+    virtual bool CanHandle(wxXmlNode *node);
+
+private:
+    bool m_isInside;
+    wxStdDialogButtonSizer *m_parentSizer;
+};
+
+#endif // wxUSE_BUTTON
+
+#endif // wxUSE_XRC

 
 

-#endif // _WX_XH_BOXSIZER_H_
+#endif // _WX_XH_SIZER_H_