Define WXBUILDING in Xcode projects.

[wxWidgets.git] / include / wx / treelist.h

diff --git a/include/wx/treelist.h b/include/wx/treelist.h
index 1b33b5abccf4f07020700491f4fec279fea7d1fc..3fa1cdaabef8cbd2950ec3f7c42b89afa2d4bcd3 100644 (file)
--- a/include/wx/treelist.h
+++ b/include/wx/treelist.h
@@ -3,7 +3,7 @@
 // Purpose:     wxTreeListCtrl class declaration.
 // Author:      Vadim Zeitlin
 // Created:     2011-08-17
 // Purpose:     wxTreeListCtrl class declaration.
 // Author:      Vadim Zeitlin
 // Created:     2011-08-17

-// RCS-ID:      $Id: wxhead.h,v 1.12 2010-04-22 12:44:51 zeitlin Exp $
+// RCS-ID:      $Id$

 // Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////


@@ -26,7 +26,7 @@
 class WXDLLIMPEXP_FWD_ADV wxDataViewCtrl;
 class WXDLLIMPEXP_FWD_ADV wxDataViewEvent;
 
 class WXDLLIMPEXP_FWD_ADV wxDataViewCtrl;
 class WXDLLIMPEXP_FWD_ADV wxDataViewEvent;
 

-extern WXDLLIMPEXP_DATA_CORE(const char) wxTreeListCtrlNameStr[];
+extern WXDLLIMPEXP_DATA_ADV(const char) wxTreeListCtrlNameStr[];

 
 class wxTreeListCtrl;
 class wxTreeListModel;
 
 class wxTreeListCtrl;
 class wxTreeListModel;


@@ -47,6 +47,7 @@ enum
     wxTL_CHECKBOX       = 0x0002,       // Show checkboxes in the first column.
     wxTL_3STATE         = 0x0004,       // Allow 3rd state in checkboxes.
     wxTL_USER_3STATE    = 0x0008,       // Allow user to set 3rd state.
     wxTL_CHECKBOX       = 0x0002,       // Show checkboxes in the first column.
     wxTL_3STATE         = 0x0004,       // Allow 3rd state in checkboxes.
     wxTL_USER_3STATE    = 0x0008,       // Allow user to set 3rd state.

+    wxTL_NO_HEADER      = 0x0010,       // Column titles not visible.

 
     wxTL_DEFAULT_STYLE  = wxTL_SINGLE,
     wxTL_STYLE_MASK     = wxTL_SINGLE |
 
     wxTL_DEFAULT_STYLE  = wxTL_SINGLE,
     wxTL_STYLE_MASK     = wxTL_SINGLE |


@@ -453,9 +454,12 @@ private:
 // wxTreeListEvent: event generated by wxTreeListCtrl.
 // ----------------------------------------------------------------------------
 
 // wxTreeListEvent: event generated by wxTreeListCtrl.
 // ----------------------------------------------------------------------------
 

-class wxTreeListEvent : public wxNotifyEvent
+class WXDLLIMPEXP_ADV wxTreeListEvent : public wxNotifyEvent

 {
 public:
 {
 public:

+    // Default ctor is provided for wxRTTI needs only but should never be used.
+    wxTreeListEvent() { Init(); }
+

     // The item affected by the event. Valid for all events except
     // column-specific ones such as COLUMN_SORTED.
     wxTreeListItem GetItem() const { return m_item; }
     // The item affected by the event. Valid for all events except
     // column-specific ones such as COLUMN_SORTED.
     wxTreeListItem GetItem() const { return m_item; }


@@ -470,6 +474,14 @@ public:
     virtual wxEvent* Clone() const { return new wxTreeListEvent(*this); }
 
 private:
     virtual wxEvent* Clone() const { return new wxTreeListEvent(*this); }
 
 private:

+    // Common part of all ctors.
+    void Init()
+    {
+        m_column = static_cast<unsigned>(-1);
+
+        m_oldCheckedState = wxCHK_UNDETERMINED;
+    }
+

     // Ctor is private, only wxTreeListCtrl can create events of this type.
     wxTreeListEvent(wxEventType evtType,
                     wxTreeListCtrl* treelist,
     // Ctor is private, only wxTreeListCtrl can create events of this type.
     wxTreeListEvent(wxEventType evtType,
                     wxTreeListCtrl* treelist,


@@ -479,9 +491,7 @@ private:
     {
         SetEventObject(treelist);
 
     {
         SetEventObject(treelist);
 

-        m_column = static_cast<unsigned>(-1);
-
-        m_oldCheckedState = wxCHK_UNDETERMINED;
+        Init();

     }
 
     // Set the checkbox state before this event for ITEM_CHECKED events.
     }
 
     // Set the checkbox state before this event for ITEM_CHECKED events.


@@ -505,7 +515,7 @@ private:
 
     friend class wxTreeListCtrl;
 
 
     friend class wxTreeListCtrl;
 

-    wxDECLARE_ABSTRACT_CLASS(wxTreeListEvent);
+    wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxTreeListEvent);

 };
 
 // Event types and event table macros.
 };
 
 // Event types and event table macros.


@@ -516,11 +526,11 @@ typedef void (wxEvtHandler::*wxTreeListEventFunction)(wxTreeListEvent&);
     wxEVENT_HANDLER_CAST(wxTreeListEventFunction, func)
 
 #define wxEVT_TREELIST_GENERIC(name, id, fn) \
     wxEVENT_HANDLER_CAST(wxTreeListEventFunction, func)
 
 #define wxEVT_TREELIST_GENERIC(name, id, fn) \

-    wx__DECLARE_EVT1(wxEVT_COMMAND_TREELIST_##name, id, wxTreeListEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_TREELIST_##name, id, wxTreeListEventHandler(fn))

 
 #define wxDECLARE_TREELIST_EVENT(name) \
     wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, \
 
 #define wxDECLARE_TREELIST_EVENT(name) \
     wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, \

-                              wxEVT_COMMAND_TREELIST_##name, \
+                              wxEVT_TREELIST_##name, \

                               wxTreeListEvent)
 
 wxDECLARE_TREELIST_EVENT(SELECTION_CHANGED);
                               wxTreeListEvent)
 
 wxDECLARE_TREELIST_EVENT(SELECTION_CHANGED);


@@ -553,6 +563,15 @@ wxDECLARE_TREELIST_EVENT(COLUMN_SORTED);
 
 #undef wxDECLARE_TREELIST_EVENT
 
 
 #undef wxDECLARE_TREELIST_EVENT
 

+// old wxEVT_COMMAND_* constants
+#define wxEVT_COMMAND_TREELIST_SELECTION_CHANGED   wxEVT_TREELIST_SELECTION_CHANGED
+#define wxEVT_COMMAND_TREELIST_ITEM_EXPANDING      wxEVT_TREELIST_ITEM_EXPANDING
+#define wxEVT_COMMAND_TREELIST_ITEM_EXPANDED       wxEVT_TREELIST_ITEM_EXPANDED
+#define wxEVT_COMMAND_TREELIST_ITEM_CHECKED        wxEVT_TREELIST_ITEM_CHECKED
+#define wxEVT_COMMAND_TREELIST_ITEM_ACTIVATED      wxEVT_TREELIST_ITEM_ACTIVATED
+#define wxEVT_COMMAND_TREELIST_ITEM_CONTEXT_MENU   wxEVT_TREELIST_ITEM_CONTEXT_MENU
+#define wxEVT_COMMAND_TREELIST_COLUMN_SORTED       wxEVT_TREELIST_COLUMN_SORTED
+

 #endif // wxUSE_TREELISTCTRL
 
 #endif // _WX_TREELIST_H_
 #endif // wxUSE_TREELISTCTRL
 
 #endif // _WX_TREELIST_H_