make wxTmemchr() return (and take) char* instead of void* in ANSI build too

[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 7159605584fb71446bdb59f74036854b94bab95c..c26179e95e063a603062dd8f98ec9a527c3bdcd4 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
@@ -11,20 +11,19 @@
 #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"
+
+#if wxUSE_XRC
+
 #include "wx/sizer.h"
 #include "wx/gbsizer.h"
 
-
-class WXDLLEXPORT wxSizer;
+class WXDLLIMPEXP_FWD_CORE wxSizer;
 
 class WXDLLIMPEXP_XRC wxSizerXmlHandler : public wxXmlResourceHandler
 {
-DECLARE_DYNAMIC_CLASS(wxSizerXmlHandler)
+    DECLARE_DYNAMIC_CLASS(wxSizerXmlHandler)
+
 public:
     wxSizerXmlHandler();
     virtual wxObject *DoCreateResource();
@@ -33,7 +32,7 @@ public:
 private:
     bool m_isInside;
     bool m_isGBS;
-    
+
     wxSizer *m_parentSizer;
 
     bool IsSizerNode(wxXmlNode *node);
@@ -42,7 +41,9 @@ private:
     wxObject* Handle_spacer();
     wxObject* Handle_sizer();
     wxSizer*  Handle_wxBoxSizer();
+#if wxUSE_STATBOX
     wxSizer*  Handle_wxStaticBoxSizer();
+#endif
     wxSizer*  Handle_wxGridSizer();
     wxSizer*  Handle_wxFlexGridSizer();
     wxSizer*  Handle_wxGridBagSizer();
@@ -52,8 +53,28 @@ private:
     wxGBSpan GetGBSpan(const wxString& param);
     wxSizerItem* MakeSizerItem();
     void SetSizerItemAttributes(wxSizerItem* sitem);
-    void AddSizerItem(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_