eliminate possibility of configure enabling gnomeprint with GTK3

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

diff --git a/samples/widgets/static.cpp b/samples/widgets/static.cpp
index 63cfb0d58367634938c31d675d7f43707b5c6e61..58a2d0610ecefd34201c8017e39f2e13b7ab91f1 100644 (file)
--- a/samples/widgets/static.cpp
+++ b/samples/widgets/static.cpp
@@ -6,7 +6,7 @@
 // Created:     11.04.01
 // Id:          $Id$
 // Copyright:   (c) 2001 Vadim Zeitlin
 // Created:     11.04.01
 // Id:          $Id$
 // Copyright:   (c) 2001 Vadim Zeitlin

-// License:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -40,6 +40,8 @@
 #include "wx/sizer.h"
 
 #include "wx/statline.h"
 #include "wx/sizer.h"
 
 #include "wx/statline.h"

+#include "wx/generic/stattextg.h"
+#include "wx/wupdlock.h"

 
 #include "widgets.h"
 #include "icons/statbox.xpm"
 
 #include "widgets.h"
 #include "icons/statbox.xpm"


@@ -51,9 +53,10 @@
 // control ids
 enum
 {
 // control ids
 enum
 {

-    StaticPage_Reset = 100,
+    StaticPage_Reset = wxID_HIGHEST,

     StaticPage_BoxText,
     StaticPage_BoxText,

-    StaticPage_LabelText
+    StaticPage_LabelText,
+    StaticPage_LabelTextWithMarkup

 };
 
 // alignment radiobox values
 };
 
 // alignment radiobox values


@@ -73,64 +76,13 @@ enum
     StaticVAlign_Max
 };
 
     StaticVAlign_Max
 };
 

-// ----------------------------------------------------------------------------
-// MyStaticText and MyStaticBox
-// ----------------------------------------------------------------------------
-
-// these 2 classes simply show that the static controls can get the mouse
-// clicks too -- this used to be broken under MSW but works now
-
-class MyStaticText : public wxStaticText
-{
-public:
-    MyStaticText(wxWindow* parent,
-                      wxWindowID id,
-                      const wxString& label,
-                      const wxPoint& pos = wxDefaultPosition,
-                      const wxSize& size = wxDefaultSize,
-                      long style = 0)
-        : wxStaticText(parent, id, label, pos, size, style)
-    {
-    }
-
-protected:
-    void OnMouseEvent(wxMouseEvent& WXUNUSED(event))
-    {
-        wxLogMessage(wxT("Clicked on static text"));
-    }
-
-    DECLARE_EVENT_TABLE()
-};
-
-class MyStaticBox : public wxStaticBox
+enum

 {
 {

-public:
-    MyStaticBox(wxWindow* parent,
-                wxWindowID id,
-                const wxString& label,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = 0)
-        : wxStaticBox(parent, id, label, pos, size, style)
-    {
-    }
-
-protected:
-    void OnMouseEvent(wxMouseEvent& WXUNUSED(event))
-    {
-        wxLogMessage(wxT("Clicked on static box"));
-    }
-
-    DECLARE_EVENT_TABLE()
+    StaticEllipsize_Start,
+    StaticEllipsize_Middle,
+    StaticEllipsize_End

 };
 
 };
 

-BEGIN_EVENT_TABLE(MyStaticText, wxStaticText)
-    EVT_LEFT_UP(MyStaticText::OnMouseEvent)
-END_EVENT_TABLE()
-
-BEGIN_EVENT_TABLE(MyStaticBox, wxStaticBox)
-    EVT_LEFT_UP(MyStaticBox::OnMouseEvent)
-END_EVENT_TABLE()

 
 // ----------------------------------------------------------------------------
 // StaticWidgetsPage
 
 // ----------------------------------------------------------------------------
 // StaticWidgetsPage


@@ -139,10 +91,28 @@ END_EVENT_TABLE()
 class StaticWidgetsPage : public WidgetsPage
 {
 public:
 class StaticWidgetsPage : public WidgetsPage
 {
 public:

-    StaticWidgetsPage(wxBookCtrl *book, wxImageList *imaglist);
+    StaticWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);

     virtual ~StaticWidgetsPage(){};
 
     virtual wxControl *GetWidget() const { return m_statText; }
     virtual ~StaticWidgetsPage(){};
 
     virtual wxControl *GetWidget() const { return m_statText; }

+    virtual Widgets GetWidgets() const
+    {
+        Widgets widgets;
+        widgets.push_back(m_sizerStatBox->GetStaticBox());
+        widgets.push_back(m_statText);
+#if wxUSE_MARKUP
+        widgets.push_back(m_statMarkup);
+#endif // wxUSE_MARKUP
+#if wxUSE_STATLINE
+        widgets.push_back(m_statLine);
+#endif // wxUSE_STATLINE
+
+        return widgets;
+    }
+    virtual void RecreateWidget() { CreateStatic(); }
+
+    // lazy creation of the content
+    virtual void CreateContent();

 
 protected:
     // event handlers
 
 protected:
     // event handlers


@@ -151,6 +121,10 @@ protected:
     void OnButtonReset(wxCommandEvent& event);
     void OnButtonBoxText(wxCommandEvent& event);
     void OnButtonLabelText(wxCommandEvent& event);
     void OnButtonReset(wxCommandEvent& event);
     void OnButtonBoxText(wxCommandEvent& event);
     void OnButtonLabelText(wxCommandEvent& event);

+#if wxUSE_MARKUP
+    void OnButtonLabelWithMarkupText(wxCommandEvent& event);
+#endif // wxUSE_MARKUP
+    void OnMouseEvent(wxMouseEvent& event);

 
     // reset all parameters
     void Reset();
 
     // reset all parameters
     void Reset();


@@ -163,15 +137,27 @@ protected:
 
     // the check/radio boxes for styles
     wxCheckBox *m_chkVert,
 
     // the check/radio boxes for styles
     wxCheckBox *m_chkVert,

-               *m_chkAutoResize;
+               *m_chkGeneric,
+               *m_chkAutoResize,
+               *m_chkEllipsize;
+
+#if wxUSE_MARKUP
+    wxCheckBox *m_chkMarkup,
+               *m_chkGreen;
+#endif // wxUSE_MARKUP

 
     wxRadioBox *m_radioHAlign,
 
     wxRadioBox *m_radioHAlign,

-               *m_radioVAlign;
+               *m_radioVAlign,
+               *m_radioEllipsize;

 
     // the controls and the sizer containing them
 
     // the controls and the sizer containing them

-    wxStaticBox *m_staticBox;

     wxStaticBoxSizer *m_sizerStatBox;
     wxStaticBoxSizer *m_sizerStatBox;

-    wxStaticText *m_statText;
+    wxStaticTextBase *m_statText;
+
+#if wxUSE_MARKUP
+    wxStaticTextBase *m_statMarkup;
+#endif // wxUSE_MARKUP
+

 #if wxUSE_STATLINE
     wxStaticLine *m_statLine;
 #endif // wxUSE_STATLINE
 #if wxUSE_STATLINE
     wxStaticLine *m_statLine;
 #endif // wxUSE_STATLINE


@@ -181,6 +167,10 @@ protected:
     wxTextCtrl *m_textBox,
                *m_textLabel;
 
     wxTextCtrl *m_textBox,
                *m_textLabel;
 

+#if wxUSE_MARKUP
+    wxTextCtrl *m_textLabelWithMarkup;
+#endif // wxUSE_MARKUP
+

 private:
     DECLARE_EVENT_TABLE()
     DECLARE_WIDGETS_PAGE(StaticWidgetsPage)
 private:
     DECLARE_EVENT_TABLE()
     DECLARE_WIDGETS_PAGE(StaticWidgetsPage)


@@ -193,6 +183,9 @@ private:
 BEGIN_EVENT_TABLE(StaticWidgetsPage, WidgetsPage)
     EVT_BUTTON(StaticPage_Reset, StaticWidgetsPage::OnButtonReset)
     EVT_BUTTON(StaticPage_LabelText, StaticWidgetsPage::OnButtonLabelText)
 BEGIN_EVENT_TABLE(StaticWidgetsPage, WidgetsPage)
     EVT_BUTTON(StaticPage_Reset, StaticWidgetsPage::OnButtonReset)
     EVT_BUTTON(StaticPage_LabelText, StaticWidgetsPage::OnButtonLabelText)

+#if wxUSE_MARKUP
+    EVT_BUTTON(StaticPage_LabelTextWithMarkup, StaticWidgetsPage::OnButtonLabelWithMarkupText)
+#endif // wxUSE_MARKUP

     EVT_BUTTON(StaticPage_BoxText, StaticWidgetsPage::OnButtonBoxText)
 
     EVT_CHECKBOX(wxID_ANY, StaticWidgetsPage::OnCheckOrRadioBox)
     EVT_BUTTON(StaticPage_BoxText, StaticWidgetsPage::OnButtonBoxText)
 
     EVT_CHECKBOX(wxID_ANY, StaticWidgetsPage::OnCheckOrRadioBox)


@@ -203,17 +196,22 @@ END_EVENT_TABLE()
 // implementation
 // ============================================================================
 
 // implementation
 // ============================================================================
 

-IMPLEMENT_WIDGETS_PAGE(StaticWidgetsPage, _T("Static"));
+IMPLEMENT_WIDGETS_PAGE(StaticWidgetsPage, wxT("Static"),
+                       (int)wxPlatform(GENERIC_CTRLS).If(wxOS_WINDOWS,NATIVE_CTRLS)
+                       );

 
 

-StaticWidgetsPage::StaticWidgetsPage(wxBookCtrl *book,
+StaticWidgetsPage::StaticWidgetsPage(WidgetsBookCtrl *book,

                                      wxImageList *imaglist)
                                      wxImageList *imaglist)

-                  : WidgetsPage(book)
+                  : WidgetsPage(book, imaglist, statbox_xpm)

 {
 {

-    imaglist->Add(wxBitmap(statbox_xpm));
-

     // init everything
     m_chkVert =
     // init everything
     m_chkVert =

-    m_chkAutoResize = (wxCheckBox *)NULL;
+    m_chkAutoResize =
+    m_chkGeneric =
+#if wxUSE_MARKUP
+    m_chkGreen =
+#endif // wxUSE_MARKUP
+                NULL;

 
     m_radioHAlign =
     m_radioVAlign = (wxRadioBox *)NULL;
 
     m_radioHAlign =
     m_radioVAlign = (wxRadioBox *)NULL;


@@ -221,68 +219,131 @@ StaticWidgetsPage::StaticWidgetsPage(wxBookCtrl *book,
 #if wxUSE_STATLINE
     m_statLine = (wxStaticLine *)NULL;
 #endif // wxUSE_STATLINE
 #if wxUSE_STATLINE
     m_statLine = (wxStaticLine *)NULL;
 #endif // wxUSE_STATLINE

-    m_statText = (wxStaticText *)NULL;
+#if wxUSE_MARKUP
+    m_statText = m_statMarkup = NULL;
+#endif // wxUSE_MARKUP

 
 

-    m_staticBox = (wxStaticBox *)NULL;

     m_sizerStatBox = (wxStaticBoxSizer *)NULL;
     m_sizerStatic = (wxSizer *)NULL;
 
     m_sizerStatBox = (wxStaticBoxSizer *)NULL;
     m_sizerStatic = (wxSizer *)NULL;
 

+    m_textBox =
+    m_textLabel =
+#if wxUSE_MARKUP
+    m_textLabelWithMarkup =
+#endif // wxUSE_MARKUP
+                            NULL;
+}
+
+void StaticWidgetsPage::CreateContent()
+{

     wxSizer *sizerTop = new wxBoxSizer(wxHORIZONTAL);
 
     // left pane
     wxSizer *sizerTop = new wxBoxSizer(wxHORIZONTAL);
 
     // left pane

-    wxStaticBox *box = new wxStaticBox(this, wxID_ANY, _T("&Set style"));
-
-    wxSizer *sizerLeft = new wxStaticBoxSizer(box, wxVERTICAL);
+    wxSizer *sizerLeft = new wxStaticBoxSizer(wxVERTICAL, this, "&Set style");

 
 

-    m_chkVert = CreateCheckBoxAndAddToSizer(sizerLeft, _T("&Vertical line"));
-    m_chkAutoResize = CreateCheckBoxAndAddToSizer(sizerLeft, _T("&Fit to text"));
+    m_chkGeneric = CreateCheckBoxAndAddToSizer(sizerLeft,
+                                               "&Generic wxStaticText");
+    m_chkVert = CreateCheckBoxAndAddToSizer(sizerLeft, "&Vertical line");
+    m_chkAutoResize = CreateCheckBoxAndAddToSizer(sizerLeft, "&Fit to text");

     sizerLeft->Add(5, 5, 0, wxGROW | wxALL, 5); // spacer
 
     static const wxString halign[] =
     {
     sizerLeft->Add(5, 5, 0, wxGROW | wxALL, 5); // spacer
 
     static const wxString halign[] =
     {

-        _T("left"),
-        _T("centre"),
-        _T("right"),
+        wxT("left"),
+        wxT("centre"),
+        wxT("right"),

     };
 
     static const wxString valign[] =
     {
     };
 
     static const wxString valign[] =
     {

-        _T("top"),
-        _T("centre"),
-        _T("bottom"),
+        wxT("top"),
+        wxT("centre"),
+        wxT("bottom"),

     };
 
     };
 

-    m_radioHAlign = new wxRadioBox(this, wxID_ANY, _T("&Horz alignment"),
+    m_radioHAlign = new wxRadioBox(this, wxID_ANY, wxT("&Horz alignment"),

                                    wxDefaultPosition, wxDefaultSize,
                                    wxDefaultPosition, wxDefaultSize,

-                                   WXSIZEOF(halign), halign);
-    m_radioVAlign = new wxRadioBox(this, wxID_ANY, _T("&Vert alignment"),
+                                   WXSIZEOF(halign), halign, 3);
+    m_radioVAlign = new wxRadioBox(this, wxID_ANY, wxT("&Vert alignment"),

                                    wxDefaultPosition, wxDefaultSize,
                                    wxDefaultPosition, wxDefaultSize,

-                                   WXSIZEOF(valign), valign);
+                                   WXSIZEOF(valign), valign, 3);

 
     sizerLeft->Add(m_radioHAlign, 0, wxGROW | wxALL, 5);
     sizerLeft->Add(m_radioVAlign, 0, wxGROW | wxALL, 5);
 
 
     sizerLeft->Add(m_radioHAlign, 0, wxGROW | wxALL, 5);
     sizerLeft->Add(m_radioVAlign, 0, wxGROW | wxALL, 5);
 

-    wxButton *btn = new wxButton(this, StaticPage_Reset, _T("&Reset"));
-    sizerLeft->Add(btn, 0, wxALIGN_CENTRE_HORIZONTAL | wxALL, 15);

 
 

-    // middle pane
-    wxStaticBox *box2 = new wxStaticBox(this, wxID_ANY, _T("&Change labels"));
-    wxSizer *sizerMiddle = new wxStaticBoxSizer(box2, wxVERTICAL);
+    sizerLeft->Add(5, 5, 0, wxGROW | wxALL, 5); // spacer

 
 

-    wxSizer *sizerRow;
+    m_chkEllipsize = CreateCheckBoxAndAddToSizer(sizerLeft, wxT("&Ellipsize"));
+
+    static const wxString ellipsizeMode[] =
+    {
+        wxT("&start"),
+        wxT("&middle"),
+        wxT("&end"),
+    };

 
 

-    sizerRow = CreateSizerWithTextAndButton(StaticPage_BoxText,
-                                            _T("Change &box label"),
-                                            wxID_ANY, &m_textBox);
-    sizerMiddle->Add(sizerRow, 0, wxGROW | wxALL, 5);
+    m_radioEllipsize = new wxRadioBox(this, wxID_ANY, wxT("&Ellipsize mode"),
+                                      wxDefaultPosition, wxDefaultSize,
+                                      WXSIZEOF(ellipsizeMode), ellipsizeMode,
+                                      3);
+
+    sizerLeft->Add(m_radioEllipsize, 0, wxGROW | wxALL, 5);
+
+    wxButton *btn = new wxButton(this, StaticPage_Reset, wxT("&Reset"));
+    sizerLeft->Add(btn, 0, wxALIGN_CENTRE_HORIZONTAL | wxALL, 15);
+
+    // middle pane
+    wxSizer *sizerMiddle = new wxStaticBoxSizer(wxVERTICAL, this,
+                                                "&Change labels");
+
+    m_textBox = new wxTextCtrl(this, wxID_ANY, wxEmptyString);
+    wxButton *b1 = new wxButton(this, wxID_ANY, "Change &box label");
+    b1->Connect(wxEVT_COMMAND_BUTTON_CLICKED,
+                wxCommandEventHandler(StaticWidgetsPage::OnButtonBoxText),
+                NULL, this);
+    sizerMiddle->Add(m_textBox, 0, wxEXPAND|wxALL, 5);
+    sizerMiddle->Add(b1, 0, wxLEFT|wxBOTTOM, 5);
+
+    m_textLabel = new wxTextCtrl(this, wxID_ANY, wxEmptyString,
+                                 wxDefaultPosition, wxDefaultSize,
+                                 wxTE_MULTILINE|wxHSCROLL);
+    wxButton *b2 = new wxButton(this, wxID_ANY, "Change &text label");
+    b2->Connect(wxEVT_COMMAND_BUTTON_CLICKED,
+                wxCommandEventHandler(StaticWidgetsPage::OnButtonLabelText),
+                NULL, this);
+    sizerMiddle->Add(m_textLabel, 0, wxEXPAND|wxALL, 5);
+    sizerMiddle->Add(b2, 0, wxLEFT|wxBOTTOM, 5);
+
+#if wxUSE_MARKUP
+    m_textLabelWithMarkup = new wxTextCtrl(this, wxID_ANY, wxEmptyString,
+                                           wxDefaultPosition, wxDefaultSize,
+                                           wxTE_MULTILINE|wxHSCROLL);
+
+    wxButton *b3 = new wxButton(this, wxID_ANY, "Change decorated text label");
+    b3->Connect(wxEVT_COMMAND_BUTTON_CLICKED,
+                wxCommandEventHandler(StaticWidgetsPage::OnButtonLabelWithMarkupText),
+                NULL, this);
+    sizerMiddle->Add(m_textLabelWithMarkup, 0, wxEXPAND|wxALL, 5);
+    sizerMiddle->Add(b3, 0, wxLEFT|wxBOTTOM, 5);
+
+    m_chkGreen = CreateCheckBoxAndAddToSizer(sizerMiddle,
+                                             "Decorated label on g&reen");
+#endif // wxUSE_MARKUP

 
 

-    sizerRow = CreateSizerWithTextAndButton(StaticPage_LabelText,
-                                            _T("Change &text label"),
-                                            wxID_ANY, &m_textLabel);
-    sizerMiddle->Add(sizerRow, 0, wxGROW | wxALL, 5);
+    // final initializations
+    // NB: must be done _before_ calling CreateStatic()
+    Reset();

 
 

-    m_textBox->SetValue(_T("This is a box"));
-    m_textLabel->SetValue(_T("And this is a label\ninside the box"));
+    m_textBox->SetValue(wxT("This is a &box"));
+    m_textLabel->SetValue(wxT("And this is a\n\tlabel inside the box with a &mnemonic.\n")
+                          wxT("Only this text is affected by the ellipsize settings."));
+#if wxUSE_MARKUP
+    m_textLabelWithMarkup->SetValue(wxT("Another label, this time <b>decorated</b> ")
+                                    wxT("with <u>markup</u>; here you need entities ")
+                                    wxT("for the symbols: &lt; &gt; &amp; &apos; &quot; ")
+                                    wxT(" but you can still place &mnemonics..."));
+#endif // wxUSE_MARKUP

 
     // right pane
     wxSizer *sizerRight = new wxBoxSizer(wxHORIZONTAL);
 
     // right pane
     wxSizer *sizerRight = new wxBoxSizer(wxHORIZONTAL);


@@ -296,12 +357,7 @@ StaticWidgetsPage::StaticWidgetsPage(wxBookCtrl *book,
     sizerTop->Add(sizerMiddle, 0, wxGROW | wxALL, 10);
     sizerTop->Add(sizerRight, 1, wxGROW | (wxALL & ~wxRIGHT), 10);
 
     sizerTop->Add(sizerMiddle, 0, wxGROW | wxALL, 10);
     sizerTop->Add(sizerRight, 1, wxGROW | (wxALL & ~wxRIGHT), 10);
 

-    // final initializations
-    Reset();
-

     SetSizer(sizerTop);
     SetSizer(sizerTop);

-
-    sizerTop->Fit(this);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -310,8 +366,10 @@ StaticWidgetsPage::StaticWidgetsPage(wxBookCtrl *book,
 
 void StaticWidgetsPage::Reset()
 {
 
 void StaticWidgetsPage::Reset()
 {

+    m_chkGeneric->SetValue(false);

     m_chkVert->SetValue(false);
     m_chkAutoResize->SetValue(true);
     m_chkVert->SetValue(false);
     m_chkAutoResize->SetValue(true);

+    m_chkEllipsize->SetValue(true);

 
     m_radioHAlign->SetSelection(StaticHAlign_Left);
     m_radioVAlign->SetSelection(StaticVAlign_Top);
 
     m_radioHAlign->SetSelection(StaticHAlign_Left);
     m_radioVAlign->SetSelection(StaticVAlign_Top);


@@ -319,32 +377,38 @@ void StaticWidgetsPage::Reset()
 
 void StaticWidgetsPage::CreateStatic()
 {
 
 void StaticWidgetsPage::CreateStatic()
 {

+    wxWindowUpdateLocker lock(this);
+

     bool isVert = m_chkVert->GetValue();
 
     if ( m_sizerStatBox )
     {
     bool isVert = m_chkVert->GetValue();
 
     if ( m_sizerStatBox )
     {

-        delete m_staticBox;

         // delete m_sizerStatBox; -- deleted by Remove()
         m_sizerStatic->Remove(m_sizerStatBox);
         delete m_statText;
         // delete m_sizerStatBox; -- deleted by Remove()
         m_sizerStatic->Remove(m_sizerStatBox);
         delete m_statText;

+#if wxUSE_MARKUP
+        delete m_statMarkup;
+#endif // wxUSE_MARKUP

 #if wxUSE_STATLINE
         delete m_statLine;
 #endif // wxUSE_STATLINE
     }
 
     int flagsBox = 0,
 #if wxUSE_STATLINE
         delete m_statLine;
 #endif // wxUSE_STATLINE
     }
 
     int flagsBox = 0,

-        flagsText = 0;
+        flagsText = ms_defaultFlags,
+        flagsDummyText = ms_defaultFlags;

 
     if ( !m_chkAutoResize->GetValue() )
     {
         flagsText |= wxST_NO_AUTORESIZE;
 
     if ( !m_chkAutoResize->GetValue() )
     {
         flagsText |= wxST_NO_AUTORESIZE;

+        flagsDummyText |= wxST_NO_AUTORESIZE;

     }
 
     int align = 0;
     switch ( m_radioHAlign->GetSelection() )
     {
         default:
     }
 
     int align = 0;
     switch ( m_radioHAlign->GetSelection() )
     {
         default:

-            wxFAIL_MSG(_T("unexpected radiobox selection"));
+            wxFAIL_MSG(wxT("unexpected radiobox selection"));

             // fall through
 
         case StaticHAlign_Left:
             // fall through
 
         case StaticHAlign_Left:


@@ -363,7 +427,7 @@ void StaticWidgetsPage::CreateStatic()
     switch ( m_radioVAlign->GetSelection() )
     {
         default:
     switch ( m_radioVAlign->GetSelection() )
     {
         default:

-            wxFAIL_MSG(_T("unexpected radiobox selection"));
+            wxFAIL_MSG(wxT("unexpected radiobox selection"));

             // fall through
 
         case StaticVAlign_Top:
             // fall through
 
         case StaticVAlign_Top:


@@ -379,18 +443,72 @@ void StaticWidgetsPage::CreateStatic()
             break;
     }
 
             break;
     }
 

+    if ( m_chkEllipsize->GetValue() )
+    {
+        switch ( m_radioEllipsize->GetSelection() )
+        {
+            default:
+                wxFAIL_MSG(wxT("unexpected radiobox selection"));
+                // fall through
+
+            case StaticEllipsize_Start:
+                flagsDummyText |= wxST_ELLIPSIZE_START;
+                break;
+
+            case StaticEllipsize_Middle:
+                flagsDummyText |= wxST_ELLIPSIZE_MIDDLE;
+                break;
+
+            case StaticEllipsize_End:
+                flagsDummyText |= wxST_ELLIPSIZE_END;
+                break;
+        }
+    }
+
+    flagsDummyText |= align;

     flagsText |= align;
     flagsBox |= align;
 
     flagsText |= align;
     flagsBox |= align;
 

-    m_staticBox = new MyStaticBox(this, wxID_ANY, m_textBox->GetValue(),
-                                  wxDefaultPosition, wxDefaultSize,
-                                  flagsBox);
-    m_sizerStatBox = new wxStaticBoxSizer(m_staticBox, isVert ? wxHORIZONTAL
-                                                              : wxVERTICAL);
+    wxStaticBox *staticBox = new wxStaticBox(this, wxID_ANY,
+                                             m_textBox->GetValue(),
+                                             wxDefaultPosition, wxDefaultSize,
+                                             flagsBox);
+    m_sizerStatBox = new wxStaticBoxSizer(staticBox, isVert ? wxHORIZONTAL
+                                                            : wxVERTICAL);

 
 

-    m_statText = new MyStaticText(this, wxID_ANY, m_textLabel->GetValue(),
-                                  wxDefaultPosition, wxDefaultSize,
-                                  flagsText);
+    if ( m_chkGeneric->GetValue() )
+    {
+        m_statText = new wxGenericStaticText(this, wxID_ANY,
+                                             m_textLabel->GetValue(),
+                                             wxDefaultPosition, wxDefaultSize,
+                                             flagsDummyText);
+#if wxUSE_MARKUP
+        m_statMarkup = new wxGenericStaticText(this, wxID_ANY,
+                                             wxString(),
+                                             wxDefaultPosition, wxDefaultSize,
+                                             flagsText);
+#endif // wxUSE_MARKUP
+    }
+    else // use native versions
+    {
+        m_statText = new wxStaticText(this, wxID_ANY,
+                                      m_textLabel->GetValue(),
+                                      wxDefaultPosition, wxDefaultSize,
+                                      flagsDummyText);
+#if wxUSE_MARKUP
+        m_statMarkup = new wxStaticText(this, wxID_ANY,
+                                        wxString(),
+                                        wxDefaultPosition, wxDefaultSize,
+                                        flagsText);
+#endif // wxUSE_MARKUP
+    }
+
+#if wxUSE_MARKUP
+    m_statMarkup->SetLabelMarkup(m_textLabelWithMarkup->GetValue());
+
+    if ( m_chkGreen->GetValue() )
+        m_statMarkup->SetBackgroundColour(*wxGREEN);
+#endif // wxUSE_MARKUP

 
 #if wxUSE_STATLINE
     m_statLine = new wxStaticLine(this, wxID_ANY,
 
 #if wxUSE_STATLINE
     m_statLine = new wxStaticLine(this, wxID_ANY,


@@ -402,11 +520,20 @@ void StaticWidgetsPage::CreateStatic()
 #if wxUSE_STATLINE
     m_sizerStatBox->Add(m_statLine, 0, wxGROW | wxALL, 5);
 #endif // wxUSE_STATLINE
 #if wxUSE_STATLINE
     m_sizerStatBox->Add(m_statLine, 0, wxGROW | wxALL, 5);
 #endif // wxUSE_STATLINE

-    m_sizerStatBox->Add(0, 0, 1);
+#if wxUSE_MARKUP
+    m_sizerStatBox->Add(m_statMarkup, 1, wxGROW | wxALL, 5);
+#endif // wxUSE_MARKUP

 
     m_sizerStatic->Add(m_sizerStatBox, 1, wxGROW);
 
     m_sizerStatic->Layout();
 
     m_sizerStatic->Add(m_sizerStatBox, 1, wxGROW);
 
     m_sizerStatic->Layout();

+
+    m_statText->Connect(wxEVT_LEFT_UP,
+                        wxMouseEventHandler(StaticWidgetsPage::OnMouseEvent),
+                        NULL, this);
+    staticBox->Connect(wxEVT_LEFT_UP,
+                       wxMouseEventHandler(StaticWidgetsPage::OnMouseEvent),
+                       NULL, this);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -420,8 +547,13 @@ void StaticWidgetsPage::OnButtonReset(wxCommandEvent& WXUNUSED(event))
     CreateStatic();
 }
 
     CreateStatic();
 }
 

-void StaticWidgetsPage::OnCheckOrRadioBox(wxCommandEvent& WXUNUSED(event))
+void StaticWidgetsPage::OnCheckOrRadioBox(wxCommandEvent& event)

 {
 {

+    if (event.GetEventObject() == static_cast<wxObject*>(m_chkEllipsize))
+    {
+        m_radioEllipsize->Enable(event.IsChecked());
+    }
+

     CreateStatic();
 }
 
     CreateStatic();
 }
 


@@ -433,5 +565,40 @@ void StaticWidgetsPage::OnButtonBoxText(wxCommandEvent& WXUNUSED(event))
 void StaticWidgetsPage::OnButtonLabelText(wxCommandEvent& WXUNUSED(event))
 {
     m_statText->SetLabel(m_textLabel->GetValue());
 void StaticWidgetsPage::OnButtonLabelText(wxCommandEvent& WXUNUSED(event))
 {
     m_statText->SetLabel(m_textLabel->GetValue());

+
+    // test GetLabel() and GetLabelText(); the first should return the
+    // label as it is written in the relative text control; the second should
+    // return the label as it's shown in the wxStaticText
+    wxLogMessage(wxT("The original label should be '%s'"),
+                 m_statText->GetLabel());
+    wxLogMessage(wxT("The label text is '%s'"),
+                 m_statText->GetLabelText());
+}
+
+#if wxUSE_MARKUP
+void StaticWidgetsPage::OnButtonLabelWithMarkupText(wxCommandEvent& WXUNUSED(event))
+{
+    m_statMarkup->SetLabelMarkup(m_textLabelWithMarkup->GetValue());
+
+    // test GetLabel() and GetLabelText(); the first should return the
+    // label as it is written in the relative text control; the second should
+    // return the label as it's shown in the wxStaticText
+    wxLogMessage(wxT("The original label should be '%s'"),
+                 m_statMarkup->GetLabel());
+    wxLogMessage(wxT("The label text is '%s'"),
+                 m_statMarkup->GetLabelText());
+}
+#endif // wxUSE_MARKUP
+
+void StaticWidgetsPage::OnMouseEvent(wxMouseEvent& event)
+{
+    if ( event.GetEventObject() == m_statText )
+    {
+        wxLogMessage("Clicked on static text");
+    }
+    else
+    {
+        wxLogMessage("Clicked on static box");
+    }

 }
 
 }