Warning fixes, source cleaning.

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

diff --git a/contrib/src/xrc/xh_notbk.cpp b/contrib/src/xrc/xh_notbk.cpp
index 7cf5fb9ad22133fbac435976c4a8be95b54c75c6..1a0c7b14b4d834d7c3c0b0a924bcc40e1d43d9fd 100644 (file)
--- a/contrib/src/xrc/xh_notbk.cpp
+++ b/contrib/src/xrc/xh_notbk.cpp
@@ -7,7 +7,7 @@
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
- 
+
 #ifdef __GNUG__
 #pragma implementation "xh_notbk.h"
 #endif
@@ -27,37 +27,40 @@
 #include "wx/notebook.h"
 #include "wx/sizer.h"
 
-wxNotebookXmlHandler::wxNotebookXmlHandler() 
-: wxXmlResourceHandler(), m_isInside(FALSE), m_notebook(NULL)
+IMPLEMENT_DYNAMIC_CLASS(wxNotebookXmlHandler, wxXmlResourceHandler)
+
+wxNotebookXmlHandler::wxNotebookXmlHandler()
+: wxXmlResourceHandler(), m_isInside(false), m_notebook(NULL)
 {
-    ADD_STYLE(wxNB_FIXEDWIDTH);
-    ADD_STYLE(wxNB_LEFT);
-    ADD_STYLE(wxNB_RIGHT);
-    ADD_STYLE(wxNB_BOTTOM);
+    XRC_ADD_STYLE(wxNB_FIXEDWIDTH);
+    XRC_ADD_STYLE(wxNB_LEFT);
+    XRC_ADD_STYLE(wxNB_RIGHT);
+    XRC_ADD_STYLE(wxNB_BOTTOM);
     AddWindowStyles();
 }
 
-
-
 wxObject *wxNotebookXmlHandler::DoCreateResource()
-{ 
+{
     if (m_class == wxT("notebookpage"))
     {
         wxXmlNode *n = GetParamNode(wxT("object"));
 
+        if ( !n )
+            n = GetParamNode(wxT("object_ref"));
+
         if (n)
         {
             bool old_ins = m_isInside;
-            m_isInside = FALSE;
-            m_isInside = old_ins;
+            m_isInside = false;
             wxObject *item = CreateResFromNode(n, m_notebook, NULL);
+            m_isInside = old_ins;
             wxWindow *wnd = wxDynamicCast(item, wxWindow);
 
             if (wnd)
                 m_notebook->AddPage(wnd, GetText(wxT("label")),
                                          GetBool(wxT("selected"), 0));
-            else 
-                wxLogError(wxT("Error in resource."));              
+            else
+                wxLogError(wxT("Error in resource."));
             return wnd;
         }
         else
@@ -66,31 +69,29 @@ wxObject *wxNotebookXmlHandler::DoCreateResource()
             return NULL;
         }
     }
-    
-    else {
-        wxNotebook *nb = new wxNotebook(m_parentAsWindow, 
-                                        GetID(),
-                                        GetPosition(), GetSize(),
-                                        GetStyle( wxT("style" )),
-                                        GetName());
-    
+
+    else
+    {
+        XRC_MAKE_INSTANCE(nb, wxNotebook)
+
+        nb->Create(m_parentAsWindow,
+                   GetID(),
+                   GetPosition(), GetSize(),
+                   GetStyle(wxT("style")),
+                   GetName());
+
         wxNotebook *old_par = m_notebook;
         m_notebook = nb;
         bool old_ins = m_isInside;
-        m_isInside = TRUE;
-        CreateChildren(m_notebook, TRUE/*only this handler*/);
+        m_isInside = true;
+        CreateChildren(m_notebook, true/*only this handler*/);
         m_isInside = old_ins;
         m_notebook = old_par;
 
-        if (GetBool(wxT("usenotebooksizer"), FALSE))
-            return new wxNotebookSizer(nb);
-        else
-            return nb;
+        return nb;
     }
 }
 
-
-
 bool wxNotebookXmlHandler::CanHandle(wxXmlNode *node)
 {
     return ((!m_isInside && IsOfClass(node, wxT("wxNotebook"))) ||