Removed previous broken fix for deferred positioning bug, and added

[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 bd066d32d513ca9d42885f68b99080b138ea1d6d..e6fe42254052d9cc7d97ea12c3cbd4541c218231 100644 (file)
--- a/include/wx/xrc/xh_notbk.h
+++ b/include/wx/xrc/xh_notbk.h
@@ -10,7 +10,7 @@
 #ifndef _WX_XH_NOTBK_H_
 #define _WX_XH_NOTBK_H_
 
 #ifndef _WX_XH_NOTBK_H_
 #define _WX_XH_NOTBK_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "xh_notbk.h"
 #endif
 
 #pragma interface "xh_notbk.h"
 #endif
 


@@ -20,8 +20,9 @@
 
 class WXDLLEXPORT wxNotebook;
 
 
 class WXDLLEXPORT wxNotebook;
 

-class WXXMLDLLEXPORT wxNotebookXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxNotebookXmlHandler : public wxXmlResourceHandler

 {
 {

+DECLARE_DYNAMIC_CLASS(wxNotebookXmlHandler)

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