use wxNullPtr instead of NULL with wxFileTypeInfo

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

diff --git a/include/wx/xrc/xh_listbk.h b/include/wx/xrc/xh_listbk.h
index 6eaba92cb4db0c6fd90f674c4819b11343770e14..7aa2e0b2f3f4fbbb894e94084a228e41d217c11d 100644 (file)
--- a/include/wx/xrc/xh_listbk.h
+++ b/include/wx/xrc/xh_listbk.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     XML resource handler for wxListbook
 // Author:      Vaclav Slavik
 // Copyright:   (c) 2000 Vaclav Slavik
 // Purpose:     XML resource handler for wxListbook
 // Author:      Vaclav Slavik
 // Copyright:   (c) 2000 Vaclav Slavik


@@ -9,19 +9,16 @@
 #ifndef _WX_XH_LISTBK_H_
 #define _WX_XH_LISTBK_H_
 
 #ifndef _WX_XH_LISTBK_H_
 #define _WX_XH_LISTBK_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "xh_listbk.h"
-#endif
-

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

-#if wxUSE_LISTBOOK
+#if wxUSE_XRC && wxUSE_LISTBOOK

 
 

-class WXDLLEXPORT wxListbook;
+class WXDLLIMPEXP_FWD_CORE wxListbook;

 
 class WXDLLIMPEXP_XRC wxListbookXmlHandler : public wxXmlResourceHandler
 {
 
 class WXDLLIMPEXP_XRC wxListbookXmlHandler : public wxXmlResourceHandler
 {

-DECLARE_DYNAMIC_CLASS(wxListbookXmlHandler)
+    DECLARE_DYNAMIC_CLASS(wxListbookXmlHandler)
+

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


@@ -32,6 +29,6 @@ private:
     wxListbook *m_listbook;
 };
 
     wxListbook *m_listbook;
 };
 

-#endif
+#endif // wxUSE_XRC && wxUSE_LISTBOOK

 
 #endif // _WX_XH_LISTBK_H_
 
 #endif // _WX_XH_LISTBK_H_