Added more keyboard handling to wxTreeCtrl

Fixed HitText wrt to items with an image
  changed size calculation in wxStatText


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1243 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

samples/controls/controls.cpp

@@ -400,7 +400,11 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) :
     "\n"
     "This is also supposed to demonstrate how\n"
     "to use static controls.\n",
-    wxPoint(208,25), wxSize(200, 100) );
+    wxPoint(208,25)
+#ifdef __WXMSW__ 
+    ,wxSize(210, 110)
+#endif
+    );
   m_spintext = new wxTextCtrl( panel, -1, "0", wxPoint(20,160), wxSize(80,-1) );
   m_spintext->SetBackgroundColour("wheat");
   m_spinbutton = new wxSpinButton( panel, ID_SPIN, wxPoint(103,159), wxSize(-1,-1) );

src/generic/treectrl.cpp

@@ -286,7 +286,10 @@ wxGenericTreeItem *wxGenericTreeItem::HitTest( const wxPoint& point,
       return this;
     }
     
-    if ((point.x > m_x) && (point.x < m_x+m_width))
+    int w = m_width;
+    if (m_image != -1) w += 20;
+
+    if ((point.x > m_x) && (point.x < m_x+w))
     {
       onButton = FALSE;
       return this;
@@ -884,6 +887,10 @@ void wxTreeCtrl::EnsureVisible(const wxTreeItemId& item)
     ViewStart( &start_x, &start_y );
     start_y *= 10;
     
+    int client_h = 0;
+    int client_w = 0;
+    GetClientSize( &client_w, &client_h );
+
     if (item_y < start_y+3)
     {
         int x = 0;
@@ -891,22 +898,18 @@ void wxTreeCtrl::EnsureVisible(const wxTreeItemId& item)
         m_anchor->GetSize( x, y );
         y += 2*m_lineHeight;
         int x_pos = GetScrollPos( wxHORIZONTAL );
-	SetScrollbars( 10, 10, x/10, y/10, x_pos, item_y/10 );
+	SetScrollbars( 10, 10, x/10, y/10, x_pos, (item_y-client_h/2)/10 );
         return;
     }
 
-    int w = 0;
+    if (item_y > start_y+client_h-16)
-    int h = 0;
-    GetClientSize( &w, &h );
-
-    if (item_y > start_y+h-26)
     {
        int x = 0;
        int y = 0;
        m_anchor->GetSize( x, y );
        y += 2*m_lineHeight;
        int x_pos = GetScrollPos( wxHORIZONTAL );
-       SetScrollbars( 10, 10, x/10, y/10, x_pos, (item_y-h+30)/10 );
+       SetScrollbars( 10, 10, x/10, y/10, x_pos, (item_y-client_h/2)/10 );
        return;
     }
 }
@@ -1255,8 +1258,38 @@ void wxTreeCtrl::OnChar( wxKeyEvent &event )
       }
       break;
 
-    case WXK_LEFT:
     case WXK_UP:
+      {
+        wxTreeItemId prev = GetPrevSibling( m_current );
+	if (!prev)
+	{
+	   prev = GetParent( m_current );
+	   long cockie = 0;
+	   wxTreeItemId current = m_current;
+	   if (current == GetFirstChild( prev, cockie ))
+	   {
+	      // otherwise we return to where we came from
+              SelectItem( prev );
+              EnsureVisible( prev );
+	      break;
+	   }
+	}
+	if (prev)
+	{
+	  while (IsExpanded(prev))
+	  {
+	    int c = (int)GetChildrenCount( prev, FALSE );
+	    long cockie = 0;
+	    prev = GetFirstChild( prev, cockie );
+	    for (int i = 0; i < c-1; i++)
+	      prev = GetNextSibling( prev );
+	  }
+          SelectItem( prev );
+          EnsureVisible( prev );
+	}
+      }
+      break;
+    case WXK_LEFT:
       {
         wxTreeItemId prev = GetPrevSibling( m_current );
         if (prev != 0)

src/gtk/stattext.cpp

@@ -53,40 +53,11 @@ bool wxStaticText::Create( wxWindow *parent, wxWindowID id, const wxString &labe
       justify = GTK_JUSTIFY_LEFT;
     gtk_label_set_justify(GTK_LABEL(m_widget), justify);
 
-   int y = 1;
+    GtkRequisition req;
-   if (newSize.x == -1) 
+    (* GTK_WIDGET_CLASS( GTK_OBJECT(m_widget)->klass )->size_request ) (m_widget, &req );
-   {
-     char *s = WXSTRINGCAST m_label;
-     char *nl = strchr(s, '\n');
-     if (nl) 
-     {
-       do 
-       {
-         *nl = 0;
-         int x = gdk_string_measure( m_widget->style->font, s ) + 4;
-         if (x > newSize.x) newSize.x = x;
-         *nl++ = '\n';
-         ++y;
-         if (! (nl = strchr(s = nl, '\n'))) 
-         {
     
-           int x = gdk_string_measure( m_widget->style->font, s ) + 4;
+    if (newSize.x == -1) newSize.x = req.width;
-           if (x > newSize.x) newSize.x = x;
+    if (newSize.y == -1) newSize.y = req.height;
-         }
-       } while (nl);
-     } 
-     else 
-     {
-       newSize.x = gdk_string_measure( m_widget->style->font, label ) + 4;
-     }
-   }
-   if (newSize.y == -1) 
-   {
-     if (y == 1) 
-       newSize.y = 26;
-     else
-       newSize.y = 4 + y * (m_widget->style->font->ascent + m_widget->style->font->descent + 2);
-   }
 	
     SetSize( newSize.x, newSize.y );
   

src/gtk1/stattext.cpp

@@ -53,40 +53,11 @@ bool wxStaticText::Create( wxWindow *parent, wxWindowID id, const wxString &labe
       justify = GTK_JUSTIFY_LEFT;
     gtk_label_set_justify(GTK_LABEL(m_widget), justify);
 
-   int y = 1;
+    GtkRequisition req;
-   if (newSize.x == -1) 
+    (* GTK_WIDGET_CLASS( GTK_OBJECT(m_widget)->klass )->size_request ) (m_widget, &req );
-   {
-     char *s = WXSTRINGCAST m_label;
-     char *nl = strchr(s, '\n');
-     if (nl) 
-     {
-       do 
-       {
-         *nl = 0;
-         int x = gdk_string_measure( m_widget->style->font, s ) + 4;
-         if (x > newSize.x) newSize.x = x;
-         *nl++ = '\n';
-         ++y;
-         if (! (nl = strchr(s = nl, '\n'))) 
-         {
     
-           int x = gdk_string_measure( m_widget->style->font, s ) + 4;
+    if (newSize.x == -1) newSize.x = req.width;
-           if (x > newSize.x) newSize.x = x;
+    if (newSize.y == -1) newSize.y = req.height;
-         }
-       } while (nl);
-     } 
-     else 
-     {
-       newSize.x = gdk_string_measure( m_widget->style->font, label ) + 4;
-     }
-   }
-   if (newSize.y == -1) 
-   {
-     if (y == 1) 
-       newSize.y = 26;
-     else
-       newSize.y = 4 + y * (m_widget->style->font->ascent + m_widget->style->font->descent + 2);
-   }
 	
     SetSize( newSize.x, newSize.y );