Tried to add sorting to wxTreeCtrl

[wxWidgets.git] / src / gtk / stattext.cpp

diff --git a/src/gtk/stattext.cpp b/src/gtk/stattext.cpp
index 48a31738201d88a7ea5c7137c6b4db60d4fc5081..fd3c5ee83d3ba2fd19499e75e93023ea46792340 100644 (file)
--- a/src/gtk/stattext.cpp
+++ b/src/gtk/stattext.cpp
@@ -54,41 +54,46 @@ bool wxStaticText::Create( wxWindow *parent, wxWindowID id, const wxString &labe
   gtk_label_set_justify(GTK_LABEL(m_widget), justify);
   
    int y = 1;
   gtk_label_set_justify(GTK_LABEL(m_widget), justify);
   
    int y = 1;

-   if (newSize.x == -1) {
+   if (newSize.x == -1) 
+   {

      char *s = WXSTRINGCAST m_label;
      char *nl = strchr(s, '\n');
      char *s = WXSTRINGCAST m_label;
      char *nl = strchr(s, '\n');

-     if (nl) {
-       do {
+     if (nl) 
+     {
+       do 
+       {

          *nl = 0;
          *nl = 0;

-         int x = gdk_string_measure( m_widget->style->font, s );
-         if (x > newSize.x) {
-           newSize.x = x;
-         }
+         int x = gdk_string_measure( m_widget->style->font, s ) + 4;
+         if (x > newSize.x) newSize.x = x;

          *nl++ = '\n';
          *nl++ = '\n';

-         if ((nl = strchr(s = nl, '\n'))) {
-           ++y;
-         } else {
-           int x = gdk_string_measure( m_widget->style->font, s );
-           if (x > newSize.x) {
-             newSize.x = x;
-           }
+         ++y;
+         if (! (nl = strchr(s = nl, '\n'))) 
+         {
+        
+           int x = gdk_string_measure( m_widget->style->font, s ) + 4;
+           if (x > newSize.x) newSize.x = x;

          }
        } while (nl);
          }
        } while (nl);

-     } else {
-       newSize.x = gdk_string_measure( m_widget->style->font, label );
+     } 
+     else 
+     {
+       newSize.x = gdk_string_measure( m_widget->style->font, label ) + 4;

      }
    }
      }
    }

-   if (newSize.y == -1) {
-     if (y == 1) {
+   if (newSize.y == -1) 
+   {
+     if (y == 1) 

        newSize.y = 26;
        newSize.y = 26;

-     } else {
-       newSize.y
-         = y * (m_widget->style->font->ascent +m_widget->style->font->descent);
-     }
+     else
+       newSize.y = 4 + y * (m_widget->style->font->ascent + m_widget->style->font->descent + 2);

    }
   
   SetSize( newSize.x, newSize.y );
   
    }
   
   SetSize( newSize.x, newSize.y );
   

+  m_parent->AddChild( this );
+
+  (m_parent->m_insertCallback)( m_parent, this );
+  

   PostCreation();
   
   SetBackgroundColour( parent->GetBackgroundColour() );
   PostCreation();
   
   SetBackgroundColour( parent->GetBackgroundColour() );