X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1a584f14bf7c07c7f1a87ad80a5a9b710402dd27..dba0885d8c52d3a9a3e3f3887b525db57ba759f7:/contrib/samples/gizmos/splittree/tree.h diff --git a/contrib/samples/gizmos/splittree/tree.h b/contrib/samples/gizmos/splittree/tree.h index 382d580f66..4562d8810d 100644 --- a/contrib/samples/gizmos/splittree/tree.h +++ b/contrib/samples/gizmos/splittree/tree.h @@ -12,6 +12,10 @@ #ifndef _TREE_H_ #define _TREE_H_ +#ifdef __GNUG__ + #pragma interface "tree.h" +#endif + #include "wx/wx.h" #include "wx/gizmos/splittree.h" @@ -44,11 +48,12 @@ public: protected: wxRemotelyScrolledTreeCtrl* m_tree; wxThinSplitterWindow* m_splitter; - wxSplitterScrolledWindow* m_scrolledWindow; - TestValueWindow* m_valueWindow; + wxSplitterScrolledWindow* m_scrolledWindow; + //wxScrolledWindow* m_scrolledWindow; + 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() }; @@ -66,28 +71,27 @@ enum #define idTREE_CTRL 2000 #define idSPLITTER_WINDOW 2001 -#define idVALUE_WINDOW 2002 -#define idMAIN_FRAME 2003 +#define idVALUE_WINDOW 2002 +#define idMAIN_FRAME 2003 #define idSCROLLED_WINDOW 2004 class TestTree: public wxRemotelyScrolledTreeCtrl { - DECLARE_CLASS(TestTree) + DECLARE_CLASS(TestTree) public: TestTree(wxWindow* parent, wxWindowID id, const wxPoint& pt = wxDefaultPosition, const wxSize& sz = wxDefaultSize, long style = wxTR_HAS_BUTTONS); - ~TestTree(); + ~TestTree(); - void OnPaint(wxPaintEvent& event); DECLARE_EVENT_TABLE() protected: - wxImageList* m_imageList; + wxImageList* m_imageList; }; class TestValueWindow: public wxTreeCompanionWindow { 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); @@ -95,7 +99,7 @@ public: //// Overrides //// Events - + //// Data members protected: