use wxNewId() to implement XRCID

[wxWidgets.git] / contrib / samples / gizmos / splittree / tree.h

diff --git a/contrib/samples/gizmos/splittree/tree.h b/contrib/samples/gizmos/splittree/tree.h
index 95f9fbbff015aeb29730b7079b61ef1c71e7994c..fd939628fccdf1649d1bf809693e1e8ad36d7aba 100644 (file)
--- a/contrib/samples/gizmos/splittree/tree.h
+++ b/contrib/samples/gizmos/splittree/tree.h
@@ -45,10 +45,11 @@ protected:
     wxRemotelyScrolledTreeCtrl*        m_tree;
     wxThinSplitterWindow*   m_splitter;
        wxSplitterScrolledWindow* m_scrolledWindow;
     wxRemotelyScrolledTreeCtrl*        m_tree;
     wxThinSplitterWindow*   m_splitter;
        wxSplitterScrolledWindow* m_scrolledWindow;

+       //wxScrolledWindow* m_scrolledWindow;

     TestValueWindow*           m_valueWindow;
 
 private:
     TestValueWindow*           m_valueWindow;
 
 private:

-    // any class wishing to process wxWindows events must use this macro
+    // any class wishing to process wxWidgets events must use this macro

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 


@@ -77,15 +78,16 @@ public:
     TestTree(wxWindow* parent, wxWindowID id, const wxPoint& pt = wxDefaultPosition,
         const wxSize& sz = wxDefaultSize, long style = wxTR_HAS_BUTTONS);
        ~TestTree();
     TestTree(wxWindow* parent, wxWindowID id, const wxPoint& pt = wxDefaultPosition,
         const wxSize& sz = wxDefaultSize, long style = wxTR_HAS_BUTTONS);
        ~TestTree();

+

     DECLARE_EVENT_TABLE()
 protected:
        wxImageList*    m_imageList;
 };
 
     DECLARE_EVENT_TABLE()
 protected:
        wxImageList*    m_imageList;
 };
 

-class TestValueWindow: public wxWindow
+class TestValueWindow: public wxTreeCompanionWindow

 {
 public:
 {
 public:

-    TestValueWindow(wxWindow* parent, wxWindowID id = -1,
+    TestValueWindow(wxWindow* parent, wxWindowID id = wxID_ANY,

       const wxPoint& pos = wxDefaultPosition,
       const wxSize& sz = wxDefaultSize,
       long style = 0);
       const wxPoint& pos = wxDefaultPosition,
       const wxSize& sz = wxDefaultSize,
       long style = 0);


@@ -93,7 +95,6 @@ public:
 //// Overrides
 
 //// Events
 //// Overrides
 
 //// Events

-       void OnSize(wxSizeEvent& event);

     
 //// Data members
 protected:
     
 //// Data members
 protected: