propagate scroll wheel events to parent, fixes #15187

[wxWidgets.git] / samples / regtest / regtest.cpp

diff --git a/samples/regtest/regtest.cpp b/samples/regtest/regtest.cpp
index a1147cad0681ab2ee02a366908bd4f142d8c6549..c2b1d60c80ffd326f598c6c1c27ab7dadbef9da3 100644 (file)
--- a/samples/regtest/regtest.cpp
+++ b/samples/regtest/regtest.cpp
@@ -367,7 +367,7 @@ RegFrame::RegFrame(wxFrame *parent, const wxChar *title, int x, int y, int w, in
         : wxFrame(parent, wxID_ANY, title, wxPoint(x, y), wxSize(w, h))
 {
     // this reduces flicker effects
         : wxFrame(parent, wxID_ANY, title, wxPoint(x, y), wxSize(w, h))
 {
     // this reduces flicker effects

-    SetBackgroundColour(wxColour(255, 255, 255));
+    SetBackgroundColour(*wxWHITE);

 
     // set the icon
     // ------------
 
     // set the icon
     // ------------


@@ -784,7 +784,7 @@ void RegTreeCtrl::OnSelChanged(wxTreeEvent& event)
 void RegTreeCtrl::OnItemExpanding(wxTreeEvent& event)
 {
     TreeNode *pNode = GetNode(event);
 void RegTreeCtrl::OnItemExpanding(wxTreeEvent& event)
 {
     TreeNode *pNode = GetNode(event);

-    bool bExpanding = event.GetEventType() == wxEVT_COMMAND_TREE_ITEM_EXPANDING;
+    bool bExpanding = event.GetEventType() == wxEVT_TREE_ITEM_EXPANDING;

 
     // expansion might take some time
     wxSetCursor(*wxHOURGLASS_CURSOR);
 
     // expansion might take some time
     wxSetCursor(*wxHOURGLASS_CURSOR);


@@ -858,7 +858,7 @@ void RegTreeCtrl::OnEndEdit(wxTreeEvent& event)
 
 void RegTreeCtrl::OnBeginDrag(wxTreeEvent& event)
 {
 
 void RegTreeCtrl::OnBeginDrag(wxTreeEvent& event)
 {

-    m_copyOnDrop = event.GetEventType() == wxEVT_COMMAND_TREE_BEGIN_DRAG;
+    m_copyOnDrop = event.GetEventType() == wxEVT_TREE_BEGIN_DRAG;

 
     TreeNode *pNode = GetNode(event);
     if ( pNode->IsRoot() || pNode->Parent()->IsRoot() )
 
     TreeNode *pNode = GetNode(event);
     if ( pNode->IsRoot() || pNode->Parent()->IsRoot() )


@@ -1193,7 +1193,7 @@ const wxChar *RegTreeCtrl::TreeNode::FullName() const
         s_strName = Parent()->FullName();
         s_strName << wxT('\\') << m_strName;
 
         s_strName = Parent()->FullName();
         s_strName << wxT('\\') << m_strName;
 

-        return s_strName;
+        return s_strName.t_str();

     }
 }
 
     }
 }