Fix compilation in !wxUSE_LOG_DEBUG && !HAVE_VARIADIC_MACROS case.

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

diff --git a/include/wx/treelist.h b/include/wx/treelist.h
index 1b33b5abccf4f07020700491f4fec279fea7d1fc..6684a26bb328c605d40859ce2a35df2ebd8d32fc 100644 (file)
--- a/include/wx/treelist.h
+++ b/include/wx/treelist.h
@@ -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;


@@ -456,6 +456,9 @@ private:
 class wxTreeListEvent : public wxNotifyEvent
 {
 public:
 class wxTreeListEvent : public wxNotifyEvent
 {
 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 +473,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 +490,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 +514,7 @@ private:
 
     friend class wxTreeListCtrl;
 
 
     friend class wxTreeListCtrl;
 

-    wxDECLARE_ABSTRACT_CLASS(wxTreeListEvent);
+    wxDECLARE_DYNAMIC_CLASS(wxTreeListEvent);

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