Instead of just deleting m_popupInterface, call Destroy() of its wxWindow-based popup...

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

diff --git a/include/wx/xrc/xh_notbk.h b/include/wx/xrc/xh_notbk.h
index ea3cdb757ca57a45dd4bf16fd2acc28253e75c54..2d1131c29500c5d423f24d3bab06f4d04547dbcf 100644 (file)
--- a/include/wx/xrc/xh_notbk.h
+++ b/include/wx/xrc/xh_notbk.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     XML resource handler for wxNotebook
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Purpose:     XML resource handler for wxNotebook
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$


@@ -12,13 +12,14 @@
 
 #include "wx/xrc/xmlres.h"
 
 
 #include "wx/xrc/xmlres.h"
 

-#if wxUSE_NOTEBOOK
+#if wxUSE_XRC && wxUSE_NOTEBOOK

 
 

-class WXDLLEXPORT wxNotebook;
+class WXDLLIMPEXP_FWD_CORE wxNotebook;

 
 class WXDLLIMPEXP_XRC wxNotebookXmlHandler : public wxXmlResourceHandler
 {
 
 class WXDLLIMPEXP_XRC wxNotebookXmlHandler : public wxXmlResourceHandler
 {

-DECLARE_DYNAMIC_CLASS(wxNotebookXmlHandler)
+    DECLARE_DYNAMIC_CLASS(wxNotebookXmlHandler)
+

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


@@ -29,6 +30,6 @@ private:
     wxNotebook *m_notebook;
 };
 
     wxNotebook *m_notebook;
 };
 

-#endif
+#endif // wxUSE_XRC && wxUSE_NOTEBOOK

 
 #endif // _WX_XH_NOTBK_H_
 
 #endif // _WX_XH_NOTBK_H_