Add a test for a tooltip for a control inside a static box.

[wxWidgets.git] / samples / widgets / static.cpp

diff --git a/samples/widgets/static.cpp b/samples/widgets/static.cpp
index 3307ae047bf1bdb8ed81f653971c9aede99990d0..16e582f20300a30cf54601654ba9e4f8e6709c34 100644 (file)
--- a/samples/widgets/static.cpp
+++ b/samples/widgets/static.cpp
@@ -4,7 +4,6 @@
 // Purpose:     Part of the widgets sample showing various static controls
 // Author:      Vadim Zeitlin
 // Created:     11.04.01
-// Id:          $Id$
 // Copyright:   (c) 2001 Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -478,12 +477,12 @@ void StaticWidgetsPage::CreateStatic()
 
     if ( m_chkGeneric->GetValue() )
     {
-        m_statText = new wxGenericStaticText(this, wxID_ANY,
+        m_statText = new wxGenericStaticText(staticBox, wxID_ANY,
                                              m_textLabel->GetValue(),
                                              wxDefaultPosition, wxDefaultSize,
                                              flagsDummyText);
 #if wxUSE_MARKUP
-        m_statMarkup = new wxGenericStaticText(this, wxID_ANY,
+        m_statMarkup = new wxGenericStaticText(staticBox, wxID_ANY,
                                              wxString(),
                                              wxDefaultPosition, wxDefaultSize,
                                              flagsText);
@@ -491,18 +490,20 @@ void StaticWidgetsPage::CreateStatic()
     }
     else // use native versions
     {
-        m_statText = new wxStaticText(this, wxID_ANY,
+        m_statText = new wxStaticText(staticBox, wxID_ANY,
                                       m_textLabel->GetValue(),
                                       wxDefaultPosition, wxDefaultSize,
                                       flagsDummyText);
 #if wxUSE_MARKUP
-        m_statMarkup = new wxStaticText(this, wxID_ANY,
+        m_statMarkup = new wxStaticText(staticBox, wxID_ANY,
                                         wxString(),
                                         wxDefaultPosition, wxDefaultSize,
                                         flagsText);
 #endif // wxUSE_MARKUP
     }
 
+    m_statText->SetToolTip("Tooltip for a label inside the box");
+
 #if wxUSE_MARKUP
     m_statMarkup->SetLabelMarkup(m_textLabelWithMarkup->GetValue());
 
@@ -511,20 +512,20 @@ void StaticWidgetsPage::CreateStatic()
 #endif // wxUSE_MARKUP
 
 #if wxUSE_STATLINE
-    m_statLine = new wxStaticLine(this, wxID_ANY,
+    m_statLine = new wxStaticLine(staticBox, wxID_ANY,
                                   wxDefaultPosition, wxDefaultSize,
                                   isVert ? wxLI_VERTICAL : wxLI_HORIZONTAL);
 #endif // wxUSE_STATLINE
 
-    m_sizerStatBox->Add(m_statText, 1, wxGROW | wxALL, 5);
+    m_sizerStatBox->Add(m_statText, 0, wxGROW | wxALL, 5);
 #if wxUSE_STATLINE
     m_sizerStatBox->Add(m_statLine, 0, wxGROW | wxALL, 5);
 #endif // wxUSE_STATLINE
 #if wxUSE_MARKUP
-    m_sizerStatBox->Add(m_statMarkup, 1, wxGROW | wxALL, 5);
+    m_sizerStatBox->Add(m_statMarkup, 0, wxALL, 5);
 #endif // wxUSE_MARKUP
 
-    m_sizerStatic->Add(m_sizerStatBox, 1, wxGROW);
+    m_sizerStatic->Add(m_sizerStatBox, 0, wxGROW);
 
     m_sizerStatic->Layout();