Added DnD guard

[wxWidgets.git] / src / xrc / xh_notbk.cpp

diff --git a/src/xrc/xh_notbk.cpp b/src/xrc/xh_notbk.cpp
index 14a60c8536e5030e7269868ad732a89f153ea059..7c0217f9c85c287b4368f8b0ec3f83a62ffabbf8 100644 (file)
--- a/src/xrc/xh_notbk.cpp
+++ b/src/xrc/xh_notbk.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        xh_notbk.cpp
+// Name:        src/xrc/xh_notbk.cpp
 // Purpose:     XRC resource for wxNotebook
 // Author:      Vaclav Slavik
 // Created:     2000/03/21
@@ -8,10 +8,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "xh_notbk.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -23,21 +19,39 @@
 
 #include "wx/xrc/xh_notbk.h"
 
-#include "wx/log.h"
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/sizer.h"
+#endif
+
 #include "wx/notebook.h"
 #include "wx/imaglist.h"
-#include "wx/sizer.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxNotebookXmlHandler, wxXmlResourceHandler)
 
 wxNotebookXmlHandler::wxNotebookXmlHandler()
-: wxXmlResourceHandler(), m_isInside(false), m_notebook(NULL)
+                     :wxXmlResourceHandler(),
+                      m_isInside(false),
+                      m_notebook(NULL)
 {
-    XRC_ADD_STYLE(wxNB_FIXEDWIDTH);
+    XRC_ADD_STYLE(wxBK_DEFAULT);
+    XRC_ADD_STYLE(wxBK_LEFT);
+    XRC_ADD_STYLE(wxBK_RIGHT);
+    XRC_ADD_STYLE(wxBK_TOP);
+    XRC_ADD_STYLE(wxBK_BOTTOM);
+
+#if WXWIN_COMPATIBILITY_2_6
+    XRC_ADD_STYLE(wxNB_DEFAULT);
     XRC_ADD_STYLE(wxNB_LEFT);
     XRC_ADD_STYLE(wxNB_RIGHT);
     XRC_ADD_STYLE(wxNB_TOP);
     XRC_ADD_STYLE(wxNB_BOTTOM);
+#endif
+
+    XRC_ADD_STYLE(wxNB_FIXEDWIDTH);
+    XRC_ADD_STYLE(wxNB_MULTILINE);
+    XRC_ADD_STYLE(wxNB_NOPAGETHEME);
+
     AddWindowStyles();
 }
 
@@ -96,6 +110,8 @@ wxObject *wxNotebookXmlHandler::DoCreateResource()
                    GetStyle(wxT("style")),
                    GetName());
 
+        SetupWindow(nb);
+
         wxNotebook *old_par = m_notebook;
         m_notebook = nb;
         bool old_ins = m_isInside;