buttonbar.cpp/.h must be in GUI_CMN_SRC/HDR as toolbkg.cpp which is in common depends...

[wxWidgets.git] / wxPython / contrib / gizmos / wxCode / include / wx / treelistctrl.h

diff --git a/wxPython/contrib/gizmos/wxCode/include/wx/treelistctrl.h b/wxPython/contrib/gizmos/wxCode/include/wx/treelistctrl.h
index 0600984616b30a7fb9293d73a16ccec5d00d6647..1edc024eb0fefee781be2eec9411e66502bb4a79 100644 (file)
--- a/wxPython/contrib/gizmos/wxCode/include/wx/treelistctrl.h
+++ b/wxPython/contrib/gizmos/wxCode/include/wx/treelistctrl.h
@@ -14,10 +14,6 @@
 #ifndef TREELISTCTRL_H
 #define TREELISTCTRL_H
 
 #ifndef TREELISTCTRL_H
 #define TREELISTCTRL_H
 

-#if defined(__GNUG__) && !defined(__APPLE__)
-    #pragma interface "treelistctrl.h"
-#endif
-

 #include <wx/treectrl.h>
 #include <wx/control.h>
 #include <wx/pen.h>
 #include <wx/treectrl.h>
 #include <wx/control.h>
 #include <wx/pen.h>


@@ -44,6 +40,9 @@ typedef void *wxTreeItemIdValue;
 #endif
 #endif
 
 #endif
 #endif
 

+
+#define wxTR_DONT_ADJUST_MAC    0x0100          // Don't adjust the style for the Mac
+

 //-----------------------------------------------------------------------------
 // wxTreeListColumnAttrs
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxTreeListColumnAttrs
 //-----------------------------------------------------------------------------


@@ -142,7 +141,9 @@ class GIZMODLLEXPORT wxTreeListCtrl : public wxControl
 public:
     // creation
     // --------
 public:
     // creation
     // --------

-    wxTreeListCtrl() {}
+    wxTreeListCtrl()
+        : m_header_win(0), m_main_win(0), m_headerHeight(0)
+    {}

 
     wxTreeListCtrl(wxWindow *parent, wxWindowID id = -1,
                const wxPoint& pos = wxDefaultPosition,
 
     wxTreeListCtrl(wxWindow *parent, wxWindowID id = -1,
                const wxPoint& pos = wxDefaultPosition,


@@ -150,7 +151,7 @@ public:
                long style = wxTR_DEFAULT_STYLE,
                const wxValidator &validator = wxDefaultValidator,
                const wxString& name = wxTreeListCtrlNameStr )
                long style = wxTR_DEFAULT_STYLE,
                const wxValidator &validator = wxDefaultValidator,
                const wxString& name = wxTreeListCtrlNameStr )

-        : m_header_win(0), m_main_win(0)
+        : m_header_win(0), m_main_win(0), m_headerHeight(0)

     {
         Create(parent, id, pos, size, style, validator, name);
     }
     {
         Create(parent, id, pos, size, style, validator, name);
     }


@@ -527,6 +528,8 @@ public:
     wxTreeListMainWindow* GetMainWindow() const
     { return m_main_win; }
 
     wxTreeListMainWindow* GetMainWindow() const
     { return m_main_win; }
 

+    virtual wxSize DoGetBestSize() const;
+    

 protected:
     // header window, responsible for column visualization and manipulation
     wxTreeListHeaderWindow* m_header_win;
 protected:
     // header window, responsible for column visualization and manipulation
     wxTreeListHeaderWindow* m_header_win;


@@ -536,11 +539,14 @@ protected:
 //     // the common part of all ctors
 //     void Init();
 
 //     // the common part of all ctors
 //     void Init();
 

+    void OnGetToolTip( wxTreeEvent &event );

     void OnSize(wxSizeEvent& event);
     void OnSize(wxSizeEvent& event);

-
+    void CalculateAndSetHeaderHeight();
+    void DoHeaderLayout();

 
 private:
     size_t fill_column;
 
 private:
     size_t fill_column;

+    size_t m_headerHeight;

 
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxTreeListCtrl)
 
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxTreeListCtrl)