Applied patch #840643 from Ian Brown with some modifications:

[wxWidgets.git] / src / generic / treectlg.cpp

diff --git a/src/generic/treectlg.cpp b/src/generic/treectlg.cpp
index 89e2ff097ee4c3b04d2bda1784c95d9a0556fbf9..3e40803ef194907438301218808703905266b6a9 100644 (file)
--- a/src/generic/treectlg.cpp
+++ b/src/generic/treectlg.cpp
@@ -17,7 +17,7 @@
 // headers
 // -----------------------------------------------------------------------------
 
 // headers
 // -----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

   #pragma implementation "treectlg.h"
 #endif
 
   #pragma implementation "treectlg.h"
 #endif
 


@@ -46,7 +46,7 @@
 
 class WXDLLEXPORT wxGenericTreeItem;
 
 
 class WXDLLEXPORT wxGenericTreeItem;
 

-WX_DEFINE_EXPORTED_ARRAY_NO_PTR(wxGenericTreeItem *, wxArrayGenericTreeItems);
+WX_DEFINE_EXPORTED_ARRAY_PTR(wxGenericTreeItem *, wxArrayGenericTreeItems);

 
 // ----------------------------------------------------------------------------
 // constants
 
 // ----------------------------------------------------------------------------
 // constants


@@ -569,11 +569,19 @@ wxGenericTreeItem *wxGenericTreeItem::HitTest(const wxPoint& point,
             else
                 flags |= wxTREE_HITTEST_ONITEMLOWERPART;
 
             else
                 flags |= wxTREE_HITTEST_ONITEMLOWERPART;
 

-            // 5 is the size of the plus sign

             int xCross = m_x - theCtrl->GetSpacing();
             int xCross = m_x - theCtrl->GetSpacing();

+#ifdef __WXMAC__
+            // according to the drawing code the triangels are drawn
+            // at -4 , -4  from the position up to +10/+10 max
+            if ((point.x > xCross-4) && (point.x < xCross+10) &&
+                (point.y > y_mid-4) && (point.y < y_mid+10) &&
+                HasPlus() && theCtrl->HasButtons() )
+#else
+            // 5 is the size of the plus sign

             if ((point.x > xCross-5) && (point.x < xCross+5) &&
                 (point.y > y_mid-5) && (point.y < y_mid+5) &&
                 HasPlus() && theCtrl->HasButtons() )
             if ((point.x > xCross-5) && (point.x < xCross+5) &&
                 (point.y > y_mid-5) && (point.y < y_mid+5) &&
                 HasPlus() && theCtrl->HasButtons() )

+#endif

             {
                 flags |= wxTREE_HITTEST_ONITEMBUTTON;
                 return this;
             {
                 flags |= wxTREE_HITTEST_ONITEMBUTTON;
                 return this;


@@ -739,7 +747,7 @@ bool wxGenericTreeCtrl::Create(wxWindow *parent,
                                const wxPoint& pos,
                                const wxSize& size,
                                long style,
                                const wxPoint& pos,
                                const wxSize& size,
                                long style,

-                               const wxValidator &validator,
+                               const wxValidator& wxVALIDATOR_PARAM(validator),

                                const wxString& name )
 {
 #ifdef __WXMAC__
                                const wxString& name )
 {
 #ifdef __WXMAC__


@@ -1703,21 +1711,12 @@ bool wxGenericTreeCtrl::TagAllChildrenUntilLast(wxGenericTreeItem *crt_item, wxG
 
 void wxGenericTreeCtrl::SelectItemRange(wxGenericTreeItem *item1, wxGenericTreeItem *item2)
 {
 
 void wxGenericTreeCtrl::SelectItemRange(wxGenericTreeItem *item1, wxGenericTreeItem *item2)
 {

-    // item2 is not necessary after item1
-    wxGenericTreeItem *first=NULL, *last=NULL;

     m_select_me = NULL;
 
     m_select_me = NULL;
 

+    // item2 is not necessary after item1

     // choice first' and 'last' between item1 and item2
     // choice first' and 'last' between item1 and item2

-    if (item1->GetY()<item2->GetY())
-    {
-        first=item1;
-        last=item2;
-    }
-    else
-    {
-        first=item2;
-        last=item1;
-    }
+    wxGenericTreeItem *first= (item1->GetY()<item2->GetY()) ? item1 : item2;
+    wxGenericTreeItem *last = (item1->GetY()<item2->GetY()) ? item2 : item1;

 
     bool select = m_current->IsSelected();
 
 
     bool select = m_current->IsSelected();
 


@@ -2317,8 +2316,8 @@ void wxGenericTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxDC &dc, int level
             }
             else // no custom buttons
             {
             }
             else // no custom buttons
             {

-                static const int wImage = 10;
-                static const int hImage = 12;
+                static const int wImage = 9;
+                static const int hImage = 9;

 
                 wxRendererNative::Get().DrawTreeItemButton
                                         (
 
                 wxRendererNative::Get().DrawTreeItemButton
                                         (


@@ -2640,7 +2639,7 @@ void wxGenericTreeCtrl::OnChar( wxKeyEvent &event )
                     if (!next)
                     {
                         wxTreeItemId current = m_key_current;
                     if (!next)
                     {
                         wxTreeItemId current = m_key_current;

-                        while (current && !next)
+                        while (current.IsOk() && !next)

                         {
                             current = GetItemParent( current );
                             if (current) next = GetNextSibling( current );
                         {
                             current = GetItemParent( current );
                             if (current) next = GetNextSibling( current );