Patch by David Brinegar to fix menubar updating after modal dialog shown

[wxWidgets.git] / src / mac / carbon / treectrl.cpp

diff --git a/src/mac/carbon/treectrl.cpp b/src/mac/carbon/treectrl.cpp
index 137a885dbfa7e32c9096f78376146fda7cffaf68..0fa15e39ef86a659212c8c3bdf1b6b00a168ba0e 100644 (file)
--- a/src/mac/carbon/treectrl.cpp
+++ b/src/mac/carbon/treectrl.cpp
@@ -1,19 +1,22 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        treectrl.cpp
 // Purpose:     wxTreeCtrl. See also Robert's generic wxTreeCtrl.
-// Author:      AUTHOR
+// Author:      Stefan Csomor
 // Modified by:
-// Created:     ??/??/98
+// Created:     1998-01-01
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "treectrl.h"
 #endif
 
+#include "wx/wxprec.h"
+
 #include "wx/stubs/textctrl.h"
+#include "wx/treebase.h"
 #include "wx/stubs/treectrl.h"
 
 #if !USE_SHARED_LIBRARY
@@ -80,15 +83,15 @@ void wxTreeCtrl::SetIndent(int indent)
 
 wxImageList *wxTreeCtrl::GetImageList(int which) const
 {
-  if ( which == wxIMAGE_LIST_NORMAL )
+    if ( which == wxIMAGE_LIST_NORMAL )
     {
-    return m_imageListNormal;
-  }
-  else if ( which == wxIMAGE_LIST_STATE )
+        return m_imageListNormal;
+    }
+    else if ( which == wxIMAGE_LIST_STATE )
     {
-    return m_imageListState;
-  }
-  return NULL;
+        return m_imageListState;
+    }
+    return NULL;
 }
 
 void wxTreeCtrl::SetImageList(wxImageList *imageList, int which)
@@ -122,7 +125,7 @@ long wxTreeCtrl::GetChild(long item) const
     return 0;
 }
 
-long wxTreeCtrl::GetParent(long item) const
+long wxTreeCtrl::GetItemParent(long item) const
 {
     // TODO
     return 0;
@@ -273,50 +276,50 @@ bool wxTreeCtrl::DeleteItem(long item)
 bool wxTreeCtrl::ExpandItem(long item, int action)
 {
     // TODO
-  switch ( action )
-  {
+    switch ( action )
+    {
     case wxTREE_EXPAND_EXPAND:
-      break;
-
+        break;
+        
     case wxTREE_EXPAND_COLLAPSE:
-      break;
-
+        break;
+        
     case wxTREE_EXPAND_COLLAPSE_RESET:
-      break;
-
+        break;
+        
     case wxTREE_EXPAND_TOGGLE:
-      break;
-
+        break;
+        
     default:
-      wxFAIL_MSG("unknown action in wxTreeCtrl::ExpandItem");
-  }
-
-  bool bOk = FALSE; // TODO expand item
-
-  // May not send messages, so emulate them
-  if ( bOk ) {
-    wxTreeEvent event(wxEVT_NULL, m_windowId);
-    event.m_item.m_itemId  = item;
-    event.m_item.m_mask      =
-    event.m_item.m_stateMask = 0xffff; // get all
-    GetItem(event.m_item);
-
-    bool bIsExpanded = (event.m_item.m_state & wxTREE_STATE_EXPANDED) != 0;
-
-    event.m_code = action;
-    event.SetEventObject(this);
-
-    // @@@ return values of {EXPAND|COLLAPS}ING event handler is discarded
-    event.SetEventType(bIsExpanded ? wxEVT_COMMAND_TREE_ITEM_EXPANDING
-                                   : wxEVT_COMMAND_TREE_ITEM_COLLAPSING);
-    GetEventHandler()->ProcessEvent(event);
-
-    event.SetEventType(bIsExpanded ? wxEVT_COMMAND_TREE_ITEM_EXPANDED
-                                   : wxEVT_COMMAND_TREE_ITEM_COLLAPSED);
-    GetEventHandler()->ProcessEvent(event);
-  }
-
-  return bOk;
+        wxFAIL_MSG("unknown action in wxTreeCtrl::ExpandItem");
+    }
+    
+    bool bOk = FALSE; // TODO expand item
+    
+    // May not send messages, so emulate them
+    if ( bOk ) {
+        wxTreeEvent event(wxEVT_NULL, m_windowId);
+        event.m_item.m_itemId  = item;
+        event.m_item.m_mask      =
+            event.m_item.m_stateMask = 0xffff; // get all
+        GetItem(event.m_item);
+        
+        bool bIsExpanded = (event.m_item.m_state & wxTREE_STATE_EXPANDED) != 0;
+        
+        event.m_code = action;
+        event.SetEventObject(this);
+        
+        // @@@ return values of {EXPAND|COLLAPS}ING event handler is discarded
+        event.SetEventType(bIsExpanded ? wxEVT_COMMAND_TREE_ITEM_EXPANDING
+            : wxEVT_COMMAND_TREE_ITEM_COLLAPSING);
+        GetEventHandler()->ProcessEvent(event);
+        
+        event.SetEventType(bIsExpanded ? wxEVT_COMMAND_TREE_ITEM_EXPANDED
+            : wxEVT_COMMAND_TREE_ITEM_COLLAPSED);
+        GetEventHandler()->ProcessEvent(event);
+    }
+    
+    return bOk;
 }
 
 long wxTreeCtrl::InsertItem(long parent, wxTreeItem& info, long insertAfter)