Added OnEraseBackground to wxNotebook on wxMSW to avoid black background;

wxTreeCtrl mod for BC++

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@921 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/distrib/msw/generic.rsp b/distrib/msw/generic.rsp
index 0cd8544c3f70e9326544f77a23d96093a1edcc3b..05d9001f46bff404709793e74c71067655ef07b1 100644 (file)
--- a/distrib/msw/generic.rsp
+++ b/distrib/msw/generic.rsp
@@ -634,6 +634,17 @@ samples/tab/*.xpm
 samples/tab/*.ico
 samples/tab/*.txt
 
+samples/notebook/*.cpp
+samples/notebook/*.h
+samples/notebook/makefile*
+samples/notebook/*.rc
+samples/notebook/*.def
+samples/notebook/*.bmp
+samples/notebook/*.xbm
+samples/notebook/*.xpm
+samples/notebook/*.ico
+samples/notebook/*.txt
+
 samples/png/*.cpp
 samples/png/*.h
 samples/png/makefile*

diff --git a/include/wx/msw/notebook.h b/include/wx/msw/notebook.h
index 82d90dcffe67c9b06730ed974db4463fd12b5bf3..7ce1bd427472a074c3c9b1c0c2944c9ebe53ca84 100644 (file)
--- a/include/wx/msw/notebook.h
+++ b/include/wx/msw/notebook.h
@@ -159,6 +159,7 @@ public:
   void OnSelChange(wxNotebookEvent& event);
   void OnSetFocus(wxFocusEvent& event);
   void OnNavigationKey(wxNavigationKeyEvent& event);
+  void OnEraseBackground(wxEraseEvent& event);
 
   // base class virtuals
   // -------------------

diff --git a/include/wx/msw/treectrl.h b/include/wx/msw/treectrl.h
index ce4523f1e2b32dddb7aa1ca242b279eb1c9e9af7..021c68d66a8a2ef4b9f05b96749f1b9a74aa24ca 100644 (file)
--- a/include/wx/msw/treectrl.h
+++ b/include/wx/msw/treectrl.h
@@ -143,7 +143,7 @@ public:
 
     // accessors: set/get the item associated with this node
     void SetId(const wxTreeItemId& id) { m_itemId = id; }
-    const wxTreeItemId& GetId() const { return m_itemId; }
+    const wxTreeItemId& GetId() const { return (wxTreeItemId&) m_itemId; }
 };
 
 // ----------------------------------------------------------------------------

diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp
index 742d04e8b9b9fe50583e736e5aad89fe03f2a5f9..04278992fb676140853980076033de2df3121e0c 100644 (file)
--- a/src/msw/notebook.cpp
+++ b/src/msw/notebook.cpp
@@ -63,6 +63,7 @@
     EVT_NOTEBOOK_PAGE_CHANGED(-1, wxNotebook::OnSelChange)
 
     EVT_SIZE(wxNotebook::OnSize)
+    EVT_ERASE_BACKGROUND(wxNotebook::OnEraseBackground)
     EVT_SET_FOCUS(wxNotebook::OnSetFocus)
     EVT_NAVIGATION_KEY(wxNotebook::OnNavigationKey)
   END_EVENT_TABLE()
@@ -476,3 +477,9 @@ void wxNotebook::ChangePage(int nOldSel, int nSel)
 
   m_nSelection = nSel;
 }
+
+void wxNotebook::OnEraseBackground(wxEraseEvent& event)
+{
+    Default();
+}
+