Allow wxPreferencesEditor::Dismiss() to work when using modal dialogs too.

[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 14e909568b24fff6a0f2e5be57ae8ebbec44c186..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$
@@ -10,19 +10,16 @@
 #ifndef _WX_XH_NOTBK_H_
 #define _WX_XH_NOTBK_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "xh_notbk.h"
-#endif
-
 #include "wx/xrc/xmlres.h"
 
-#if wxUSE_NOTEBOOK
+#if wxUSE_XRC && wxUSE_NOTEBOOK
 
-class WXDLLEXPORT wxNotebook;
+class WXDLLIMPEXP_FWD_CORE wxNotebook;
 
-class WXXMLDLLEXPORT wxNotebookXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxNotebookXmlHandler : public wxXmlResourceHandler
 {
-DECLARE_DYNAMIC_CLASS(wxNotebookXmlHandler)
+    DECLARE_DYNAMIC_CLASS(wxNotebookXmlHandler)
+
 public:
     wxNotebookXmlHandler();
     virtual wxObject *DoCreateResource();
@@ -33,6 +30,6 @@ private:
     wxNotebook *m_notebook;
 };
 
-#endif
+#endif // wxUSE_XRC && wxUSE_NOTEBOOK
 
 #endif // _WX_XH_NOTBK_H_