code cleanup for the pen width condition (patch 1034942 + more)

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

diff --git a/src/xrc/xh_notbk.cpp b/src/xrc/xh_notbk.cpp
index 0a44e451b875bca8cf4e1ff142bf2eabd5af3dc6..5248793026e29af0cfaefa808a1e2b61dab4ec97 100644 (file)
--- a/src/xrc/xh_notbk.cpp
+++ b/src/xrc/xh_notbk.cpp
@@ -7,7 +7,7 @@
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

- 
+

 #ifdef __GNUG__
 #pragma implementation "xh_notbk.h"
 #endif
 #ifdef __GNUG__
 #pragma implementation "xh_notbk.h"
 #endif


@@ -19,48 +19,48 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#include "wx/xrc/xh_notbk.h"
+#if wxUSE_XRC && wxUSE_NOTEBOOK

 
 

-#if wxUSE_NOTEBOOK
+#include "wx/xrc/xh_notbk.h"

 
 #include "wx/log.h"
 #include "wx/notebook.h"
 #include "wx/sizer.h"
 
 
 #include "wx/log.h"
 #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();
 }
 
     AddWindowStyles();
 }
 

-
-

 wxObject *wxNotebookXmlHandler::DoCreateResource()
 wxObject *wxNotebookXmlHandler::DoCreateResource()

-{ 
+{

     if (m_class == wxT("notebookpage"))
     {
         wxXmlNode *n = GetParamNode(wxT("object"));
 
     if (m_class == wxT("notebookpage"))
     {
         wxXmlNode *n = GetParamNode(wxT("object"));
 

-       if ( !n )
-           n = GetParamNode(wxT("object_ref"));
+        if ( !n )
+            n = GetParamNode(wxT("object_ref"));

 
         if (n)
         {
             bool old_ins = m_isInside;
 
         if (n)
         {
             bool old_ins = m_isInside;

-            m_isInside = FALSE;
-            m_isInside = old_ins;
+            m_isInside = false;

             wxObject *item = CreateResFromNode(n, m_notebook, NULL);
             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));
             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
             return wnd;
         }
         else


@@ -69,40 +69,33 @@ wxObject *wxNotebookXmlHandler::DoCreateResource()
             return NULL;
         }
     }
             return NULL;
         }
     }

-    
-    else {
-       wxNotebook *nb = wxStaticCast(m_instance, wxNotebook);

 
 

-       if ( !nb )
-           nb = new wxNotebook;
+    else
+    {
+        XRC_MAKE_INSTANCE(nb, wxNotebook)

 
 

-       nb->Create(m_parentAsWindow, 
-                 GetID(),
-                 GetPosition(), GetSize(),
-                 GetStyle( wxT("style" )),
-                 GetName());
+        nb->Create(m_parentAsWindow,
+                   GetID(),
+                   GetPosition(), GetSize(),
+                   GetStyle(wxT("style")),
+                   GetName());

 
         wxNotebook *old_par = m_notebook;
         m_notebook = nb;
         bool old_ins = m_isInside;
 
         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;
 
         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"))) ||
             (m_isInside && IsOfClass(node, wxT("notebookpage"))));
 }
 
 bool wxNotebookXmlHandler::CanHandle(wxXmlNode *node)
 {
     return ((!m_isInside && IsOfClass(node, wxT("wxNotebook"))) ||
             (m_isInside && IsOfClass(node, wxT("notebookpage"))));
 }
 

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