removing outdated code

[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..d38f778d95f38605a2ed41534c3d0b6bf68e74a6 100644 (file)
--- a/include/wx/xrc/xh_sizer.h
+++ b/include/wx/xrc/xh_sizer.h
@@ -12,37 +12,46 @@
 #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();
     virtual bool CanHandle(wxXmlNode *node);
 
 public:
     wxSizerXmlHandler();
     virtual wxObject *DoCreateResource();
     virtual bool CanHandle(wxXmlNode *node);
 

+protected:
+    virtual wxSizer* DoCreateSizer(const wxString& name);
+    virtual bool IsSizerNode(wxXmlNode *node) const;
+

 private:
     bool m_isInside;
     bool m_isGBS;
 
     wxSizer *m_parentSizer;
 
 private:
     bool m_isInside;
     bool m_isGBS;
 
     wxSizer *m_parentSizer;
 

-    bool IsSizerNode(wxXmlNode *node);

 
     wxObject* Handle_sizeritem();
     wxObject* Handle_spacer();
     wxObject* Handle_sizer();
     wxSizer*  Handle_wxBoxSizer();
 
     wxObject* Handle_sizeritem();
     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();

 
 

+    bool ValidateGridSizerChildren();
+    void SetFlexibleMode(wxFlexGridSizer* fsizer);

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


@@ -51,10 +60,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 +75,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_