Applied [ 1223122 ] [wxMSW] Proper repainting when resizing - take 2

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

diff --git a/src/xrc/xh_notbk.cpp b/src/xrc/xh_notbk.cpp
index 4947899622ec4b11d24ecd379708be8215144608..7ac56de506cdc5427a331c60cd9f0d897441fd9f 100644 (file)
--- a/src/xrc/xh_notbk.cpp
+++ b/src/xrc/xh_notbk.cpp
@@ -8,7 +8,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "xh_notbk.h"
 #endif
 
@@ -19,12 +19,13 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XML && wxUSE_XRC && wxUSE_NOTEBOOK
+#if wxUSE_XRC && wxUSE_NOTEBOOK
 
 #include "wx/xrc/xh_notbk.h"
 
 #include "wx/log.h"
 #include "wx/notebook.h"
+#include "wx/imaglist.h"
 #include "wx/sizer.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxNotebookXmlHandler, wxXmlResourceHandler)
@@ -32,10 +33,16 @@ IMPLEMENT_DYNAMIC_CLASS(wxNotebookXmlHandler, wxXmlResourceHandler)
 wxNotebookXmlHandler::wxNotebookXmlHandler()
 : wxXmlResourceHandler(), m_isInside(false), m_notebook(NULL)
 {
-    XRC_ADD_STYLE(wxNB_FIXEDWIDTH);
+    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);
+
+    XRC_ADD_STYLE(wxNB_FIXEDWIDTH);
+    XRC_ADD_STYLE(wxNB_MULTILINE);
+    XRC_ADD_STYLE(wxNB_NOPAGETHEME);
+
     AddWindowStyles();
 }
 
@@ -57,8 +64,22 @@ wxObject *wxNotebookXmlHandler::DoCreateResource()
             wxWindow *wnd = wxDynamicCast(item, wxWindow);
 
             if (wnd)
+            {
                 m_notebook->AddPage(wnd, GetText(wxT("label")),
-                                         GetBool(wxT("selected"), 0));
+                                         GetBool(wxT("selected")));
+                if ( HasParam(wxT("bitmap")) )
+                {
+                    wxBitmap bmp = GetBitmap(wxT("bitmap"), wxART_OTHER);
+                    wxImageList *imgList = m_notebook->GetImageList();
+                    if ( imgList == NULL )
+                    {
+                        imgList = new wxImageList( bmp.GetWidth(), bmp.GetHeight() );
+                        m_notebook->AssignImageList( imgList );
+                    }
+                    int imgIndex = imgList->Add(bmp);
+                    m_notebook->SetPageImage(m_notebook->GetPageCount()-1, imgIndex );
+                }
+            }
             else
                 wxLogError(wxT("Error in resource."));
             return wnd;
@@ -80,6 +101,8 @@ wxObject *wxNotebookXmlHandler::DoCreateResource()
                    GetStyle(wxT("style")),
                    GetName());
 
+        SetupWindow(nb);
+
         wxNotebook *old_par = m_notebook;
         m_notebook = nb;
         bool old_ins = m_isInside;
@@ -98,4 +121,4 @@ bool wxNotebookXmlHandler::CanHandle(wxXmlNode *node)
             (m_isInside && IsOfClass(node, wxT("notebookpage"))));
 }
 
-#endif // wxUSE_XML && wxUSE_XRC && wxUSE_NOTEBOOK
+#endif // wxUSE_XRC && wxUSE_NOTEBOOK