From 11f9207e9ebbd8714e5879e5c5102a48278bc6d4 Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Fri, 16 May 2003 17:49:56 +0000
Subject: [PATCH] fixed compile errors for wxTreeListCtrl on OSX

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@20635 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 wxPython/contrib/gizmos/treelistctrl.cpp | 23 ++++++++++++-----------
 wxPython/contrib/gizmos/treelistctrl.h   |  6 ++++--
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/wxPython/contrib/gizmos/treelistctrl.cpp b/wxPython/contrib/gizmos/treelistctrl.cpp
index 4857e588c3..610439ba07 100644
--- a/wxPython/contrib/gizmos/treelistctrl.cpp
+++ b/wxPython/contrib/gizmos/treelistctrl.cpp
@@ -18,7 +18,7 @@
 // headers
 // ---------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
   #pragma implementation "treelistctrl.h"
 #endif
 
@@ -30,9 +30,6 @@
 #endif
 
 
-//#include "wx/gizmos/treelistctrl.h"
-#include "treelistctrl.h"
-
 #include <wx/treebase.h>
 #include <wx/timer.h>
 #include <wx/textctrl.h>
@@ -42,6 +39,10 @@
 #include <wx/dcscreen.h>
 #include <wx/scrolwin.h>
 
+//#include "wx/gizmos/treelistctrl.h"
+#include "treelistctrl.h"
+
+
 #ifdef __WXGTK__
     #include <gtk/gtk.h>
     #include <wx/gtk/win_gtk.h>
@@ -537,7 +538,7 @@ protected:
     size_t m_main_column; // ALB
 
     friend class wxTreeListItem;
-    friend class wxTreeRenameTimer;
+    friend class wxTreeListRenameTimer;
     friend class wxTreeListTextCtrl;
 
     wxFont               m_normalFont;
@@ -628,10 +629,10 @@ private:
 
 
 // timer used for enabling in-place edit
-class  wxTreeRenameTimer: public wxTimer
+class  wxTreeListRenameTimer: public wxTimer
 {
 public:
-    wxTreeRenameTimer( wxTreeListMainWindow *owner );
+    wxTreeListRenameTimer( wxTreeListMainWindow *owner );
 
     void Notify();
 
@@ -881,15 +882,15 @@ static void EventFlagsToSelType(long style,
 }
 
 // ---------------------------------------------------------------------------
-// wxTreeRenameTimer (internal)
+// wxTreeListRenameTimer (internal)
 // ---------------------------------------------------------------------------
 
-wxTreeRenameTimer::wxTreeRenameTimer( wxTreeListMainWindow *owner )
+wxTreeListRenameTimer::wxTreeListRenameTimer( wxTreeListMainWindow *owner )
 {
     m_owner = owner;
 }
 
-void wxTreeRenameTimer::Notify()
+void wxTreeListRenameTimer::Notify()
 {
     m_owner->OnRenameTimer();
 }
@@ -1764,7 +1765,7 @@ void wxTreeListMainWindow::Init()
     m_isDragging = FALSE;
     m_dropTarget = m_oldSelection = (wxTreeListItem *)NULL;
 
-    m_renameTimer = new wxTreeRenameTimer( this );
+    m_renameTimer = new wxTreeListRenameTimer( this );
     m_lastOnSame = FALSE;
 
     m_normalFont = wxSystemSettings::GetSystemFont( wxSYS_DEFAULT_GUI_FONT );
diff --git a/wxPython/contrib/gizmos/treelistctrl.h b/wxPython/contrib/gizmos/treelistctrl.h
index ea950451d2..3d61e5ad0a 100644
--- a/wxPython/contrib/gizmos/treelistctrl.h
+++ b/wxPython/contrib/gizmos/treelistctrl.h
@@ -10,10 +10,10 @@
 /////////////////////////////////////////////////////////////////////////////
 
 
-#ifndef TREELISRCTRL_H
+#ifndef TREELISTCTRL_H
 #define TREELISTCTRL_H
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "treelistctrl.h"
 #endif
 
@@ -60,6 +60,8 @@ public:
         m_alignment = alignment;
     }
 
+    ~wxTreeListColumnInfo() {}
+
     // getters
     wxTreeListColumnAlign GetAlignment() const { return m_alignment; }
     wxString GetText() const { return m_text; }