Fix discrepancy between different ways of measuring text extents under Mac.

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

diff --git a/samples/widgets/radiobox.cpp b/samples/widgets/radiobox.cpp
index 1fd80178a4ad536e0ad786533408d9bd11e8fe2f..46e165ec15d6bdcdc217f00bdceae03a56fe7619 100644 (file)
--- a/samples/widgets/radiobox.cpp
+++ b/samples/widgets/radiobox.cpp
@@ -51,7 +51,7 @@
 // control ids
 enum
 {
 // control ids
 enum
 {

-    RadioPage_Reset = 100,
+    RadioPage_Reset = wxID_HIGHEST,

     RadioPage_Update,
     RadioPage_Selection,
     RadioPage_Label,
     RadioPage_Update,
     RadioPage_Selection,
     RadioPage_Label,


@@ -89,6 +89,9 @@ public:
     virtual wxControl *GetWidget() const { return m_radio; }
     virtual void RecreateWidget() { CreateRadio(); }
 
     virtual wxControl *GetWidget() const { return m_radio; }
     virtual void RecreateWidget() { CreateRadio(); }
 

+    // lazy creation of the content
+    virtual void CreateContent();
+

 protected:
     // event handlers
     void OnCheckOrRadioBox(wxCommandEvent& event);
 protected:
     // event handlers
     void OnCheckOrRadioBox(wxCommandEvent& event);


@@ -119,7 +122,7 @@ protected:
     // ------------
 
     // the check/radio boxes for styles
     // ------------
 
     // the check/radio boxes for styles

-    wxCheckBox *m_chkVert;
+    wxCheckBox *m_chkSpecifyRows;

     wxCheckBox *m_chkEnableItem;
     wxCheckBox *m_chkShowItem;
     wxRadioBox *m_radioDir;
     wxCheckBox *m_chkEnableItem;
     wxCheckBox *m_chkShowItem;
     wxRadioBox *m_radioDir;


@@ -173,19 +176,22 @@ END_EVENT_TABLE()
 // implementation
 // ============================================================================
 
 // implementation
 // ============================================================================
 

-IMPLEMENT_WIDGETS_PAGE(RadioWidgetsPage, _T("Radio"),
-                       (int)wxPlatform(GENERIC_CTRLS).If(wxMSW,NATIVE_CTRLS)
-                       | WITH_ITEMS_CTRLS
+#if defined(__WXUNIVERSAL__)
+    #define FAMILY_CTRLS UNIVERSAL_CTRLS
+#else
+    #define FAMILY_CTRLS NATIVE_CTRLS
+#endif
+
+IMPLEMENT_WIDGETS_PAGE(RadioWidgetsPage, wxT("Radio"),
+                       FAMILY_CTRLS | WITH_ITEMS_CTRLS

                        );
 
 RadioWidgetsPage::RadioWidgetsPage(WidgetsBookCtrl *book,
                                    wxImageList *imaglist)
                        );
 
 RadioWidgetsPage::RadioWidgetsPage(WidgetsBookCtrl *book,
                                    wxImageList *imaglist)

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

 {
 {

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

     // init everything
     // init everything

-    m_chkVert = (wxCheckBox *)NULL;
+    m_chkSpecifyRows = (wxCheckBox *)NULL;

     m_chkEnableItem = (wxCheckBox *)NULL;
     m_chkShowItem = (wxCheckBox *)NULL;
 
     m_chkEnableItem = (wxCheckBox *)NULL;
     m_chkShowItem = (wxCheckBox *)NULL;
 


@@ -196,24 +202,31 @@ RadioWidgetsPage::RadioWidgetsPage(WidgetsBookCtrl *book,
     m_radio =
     m_radioDir = (wxRadioBox *)NULL;
     m_sizerRadio = (wxSizer *)NULL;
     m_radio =
     m_radioDir = (wxRadioBox *)NULL;
     m_sizerRadio = (wxSizer *)NULL;

+}

 
 

+void RadioWidgetsPage::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"));
+    wxStaticBox *box = new wxStaticBox(this, wxID_ANY, wxT("&Set style"));

 
     wxSizer *sizerLeft = new wxStaticBoxSizer(box, wxVERTICAL);
 
 
     wxSizer *sizerLeft = new wxStaticBoxSizer(box, wxVERTICAL);
 

-    m_chkVert = CreateCheckBoxAndAddToSizer(sizerLeft, _T("&Vertical layout"));
+    m_chkSpecifyRows = CreateCheckBoxAndAddToSizer
+                       (
+                        sizerLeft,
+                        "Major specifies &rows count"
+                       );

 
     static const wxString layoutDir[] =
     {
 
     static const wxString layoutDir[] =
     {

-        _T("default"),
-        _T("left to right"),
-        _T("top to bottom")
+        wxT("default"),
+        wxT("left to right"),
+        wxT("top to bottom")

     };
 
     };
 

-    m_radioDir = new wxRadioBox(this, wxID_ANY, _T("Numbering:"),
+    m_radioDir = new wxRadioBox(this, wxID_ANY, wxT("Numbering:"),

                                 wxDefaultPosition, wxDefaultSize,
                                 WXSIZEOF(layoutDir), layoutDir,
                                 1, wxRA_SPECIFY_COLS);
                                 wxDefaultPosition, wxDefaultSize,
                                 WXSIZEOF(layoutDir), layoutDir,
                                 1, wxRA_SPECIFY_COLS);


@@ -225,57 +238,57 @@ RadioWidgetsPage::RadioWidgetsPage(WidgetsBookCtrl *book,
 #endif // wxRA_LEFTTORIGHT
 
     wxSizer *sizerRow;
 #endif // wxRA_LEFTTORIGHT
 
     wxSizer *sizerRow;

-    sizerRow = CreateSizerWithTextAndLabel(_T("&Major dimension:"),
+    sizerRow = CreateSizerWithTextAndLabel(wxT("&Major dimension:"),

                                            wxID_ANY,
                                            &m_textMajorDim);
     sizerLeft->Add(sizerRow, 0, wxGROW | wxALL, 5);
 
                                            wxID_ANY,
                                            &m_textMajorDim);
     sizerLeft->Add(sizerRow, 0, wxGROW | wxALL, 5);
 

-    sizerRow = CreateSizerWithTextAndLabel(_T("&Number of buttons:"),
+    sizerRow = CreateSizerWithTextAndLabel(wxT("&Number of buttons:"),

                                            wxID_ANY,
                                            &m_textNumBtns);
     sizerLeft->Add(sizerRow, 0, wxGROW | wxALL, 5);
 
     wxButton *btn;
                                            wxID_ANY,
                                            &m_textNumBtns);
     sizerLeft->Add(sizerRow, 0, wxGROW | wxALL, 5);
 
     wxButton *btn;

-    btn = new wxButton(this, RadioPage_Update, _T("&Update"));
+    btn = new wxButton(this, RadioPage_Update, wxT("&Update"));

     sizerLeft->Add(btn, 0, wxALIGN_CENTRE_HORIZONTAL | wxALL, 5);
 
     sizerLeft->Add(5, 5, 0, wxGROW | wxALL, 5); // spacer
 
     sizerLeft->Add(btn, 0, wxALIGN_CENTRE_HORIZONTAL | wxALL, 5);
 
     sizerLeft->Add(5, 5, 0, wxGROW | wxALL, 5); // spacer
 

-    btn = new wxButton(this, RadioPage_Reset, _T("&Reset"));
+    btn = new wxButton(this, RadioPage_Reset, wxT("&Reset"));

     sizerLeft->Add(btn, 0, wxALIGN_CENTRE_HORIZONTAL | wxALL, 15);
 
     // middle pane
     sizerLeft->Add(btn, 0, wxALIGN_CENTRE_HORIZONTAL | wxALL, 15);
 
     // middle pane

-    wxStaticBox *box2 = new wxStaticBox(this, wxID_ANY, _T("&Change parameters"));
+    wxStaticBox *box2 = new wxStaticBox(this, wxID_ANY, wxT("&Change parameters"));

     wxSizer *sizerMiddle = new wxStaticBoxSizer(box2, wxVERTICAL);
 
     wxSizer *sizerMiddle = new wxStaticBoxSizer(box2, wxVERTICAL);
 

-    sizerRow = CreateSizerWithTextAndLabel(_T("Current selection:"),
+    sizerRow = CreateSizerWithTextAndLabel(wxT("Current selection:"),

                                            wxID_ANY,
                                            &m_textCurSel);
     sizerMiddle->Add(sizerRow, 0, wxGROW | wxALL, 5);
 
     sizerRow = CreateSizerWithTextAndButton(RadioPage_Selection,
                                            wxID_ANY,
                                            &m_textCurSel);
     sizerMiddle->Add(sizerRow, 0, wxGROW | wxALL, 5);
 
     sizerRow = CreateSizerWithTextAndButton(RadioPage_Selection,

-                                            _T("&Change selection:"),
+                                            wxT("&Change selection:"),

                                            wxID_ANY,
                                            &m_textSel);
     sizerMiddle->Add(sizerRow, 0, wxGROW | wxALL, 5);
 
     sizerRow = CreateSizerWithTextAndButton(RadioPage_Label,
                                            wxID_ANY,
                                            &m_textSel);
     sizerMiddle->Add(sizerRow, 0, wxGROW | wxALL, 5);
 
     sizerRow = CreateSizerWithTextAndButton(RadioPage_Label,

-                                            _T("&Label for box:"),
+                                            wxT("&Label for box:"),

                                             wxID_ANY,
                                             &m_textLabel);
     sizerMiddle->Add(sizerRow, 0, wxGROW | wxALL, 5);
 
     sizerRow = CreateSizerWithTextAndButton(RadioPage_LabelBtn,
                                             wxID_ANY,
                                             &m_textLabel);
     sizerMiddle->Add(sizerRow, 0, wxGROW | wxALL, 5);
 
     sizerRow = CreateSizerWithTextAndButton(RadioPage_LabelBtn,

-                                            _T("&Label for buttons:"),
+                                            wxT("&Label for buttons:"),

                                             wxID_ANY,
                                             &m_textLabelBtns);
     sizerMiddle->Add(sizerRow, 0, wxGROW | wxALL, 5);
 
     m_chkEnableItem = CreateCheckBoxAndAddToSizer(sizerMiddle,
                                             wxID_ANY,
                                             &m_textLabelBtns);
     sizerMiddle->Add(sizerRow, 0, wxGROW | wxALL, 5);
 
     m_chkEnableItem = CreateCheckBoxAndAddToSizer(sizerMiddle,

-                                                  _T("Disable &2nd item"),
+                                                  wxT("Disable &2nd item"),

                                                   RadioPage_EnableItem);
     m_chkShowItem = CreateCheckBoxAndAddToSizer(sizerMiddle,
                                                   RadioPage_EnableItem);
     m_chkShowItem = CreateCheckBoxAndAddToSizer(sizerMiddle,

-                                                _T("Hide 2nd &item"),
+                                                wxT("Hide 2nd &item"),

                                                 RadioPage_ShowItem);
 
     // right pane
                                                 RadioPage_ShowItem);
 
     // right pane


@@ -293,8 +306,6 @@ RadioWidgetsPage::RadioWidgetsPage(WidgetsBookCtrl *book,
 
     // final initializations
     SetSizer(sizerTop);
 
     // final initializations
     SetSizer(sizerTop);

-
-    sizerTop->Fit(this);

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


@@ -303,12 +314,12 @@ RadioWidgetsPage::RadioWidgetsPage(WidgetsBookCtrl *book,
 
 void RadioWidgetsPage::Reset()
 {
 
 void RadioWidgetsPage::Reset()
 {

-    m_textMajorDim->SetValue(wxString::Format(_T("%u"), DEFAULT_MAJOR_DIM));
-    m_textNumBtns->SetValue(wxString::Format(_T("%u"), DEFAULT_NUM_ENTRIES));
-    m_textLabel->SetValue(_T("I'm a radiobox"));
-    m_textLabelBtns->SetValue(_T("item"));
+    m_textMajorDim->SetValue(wxString::Format(wxT("%u"), DEFAULT_MAJOR_DIM));
+    m_textNumBtns->SetValue(wxString::Format(wxT("%u"), DEFAULT_NUM_ENTRIES));
+    m_textLabel->SetValue(wxT("I'm a radiobox"));
+    m_textLabelBtns->SetValue(wxT("item"));

 
 

-    m_chkVert->SetValue(false);
+    m_chkSpecifyRows->SetValue(false);

     m_chkEnableItem->SetValue(true);
     m_chkShowItem->SetValue(true);
     m_radioDir->SetSelection(RadioDir_Default);
     m_chkEnableItem->SetValue(true);
     m_chkShowItem->SetValue(true);
     m_radioDir->SetSelection(RadioDir_Default);


@@ -333,7 +344,7 @@ void RadioWidgetsPage::CreateRadio()
     unsigned long count;
     if ( !m_textNumBtns->GetValue().ToULong(&count) )
     {
     unsigned long count;
     if ( !m_textNumBtns->GetValue().ToULong(&count) )
     {

-        wxLogWarning(_T("Should have a valid number for number of items."));
+        wxLogWarning(wxT("Should have a valid number for number of items."));

 
         // fall back to default
         count = DEFAULT_NUM_ENTRIES;
 
         // fall back to default
         count = DEFAULT_NUM_ENTRIES;


@@ -342,7 +353,7 @@ void RadioWidgetsPage::CreateRadio()
     unsigned long majorDim;
     if ( !m_textMajorDim->GetValue().ToULong(&majorDim) )
     {
     unsigned long majorDim;
     if ( !m_textMajorDim->GetValue().ToULong(&majorDim) )
     {

-        wxLogWarning(_T("Should have a valid major dimension number."));
+        wxLogWarning(wxT("Should have a valid major dimension number."));

 
         // fall back to default
         majorDim = DEFAULT_MAJOR_DIM;
 
         // fall back to default
         majorDim = DEFAULT_MAJOR_DIM;


@@ -353,12 +364,12 @@ void RadioWidgetsPage::CreateRadio()
     wxString labelBtn = m_textLabelBtns->GetValue();
     for ( size_t n = 0; n < count; n++ )
     {
     wxString labelBtn = m_textLabelBtns->GetValue();
     for ( size_t n = 0; n < count; n++ )
     {

-        items[n] = wxString::Format(_T("%s %lu"),
+        items[n] = wxString::Format(wxT("%s %lu"),

                                     labelBtn.c_str(), (unsigned long)n + 1);
     }
 
                                     labelBtn.c_str(), (unsigned long)n + 1);
     }
 

-    int flags = m_chkVert->GetValue() ? wxRA_VERTICAL
-                                      : wxRA_HORIZONTAL;
+    int flags = m_chkSpecifyRows->GetValue() ? wxRA_SPECIFY_ROWS
+                                             : wxRA_SPECIFY_COLS;

 
     flags |= ms_defaultFlags;
 
 
     flags |= ms_defaultFlags;
 


@@ -366,7 +377,7 @@ void RadioWidgetsPage::CreateRadio()
     switch ( m_radioDir->GetSelection() )
     {
         default:
     switch ( m_radioDir->GetSelection() )
     {
         default:

-            wxFAIL_MSG( _T("unexpected wxRadioBox layout direction") );
+            wxFAIL_MSG( wxT("unexpected wxRadioBox layout direction") );

             // fall through
 
         case RadioDir_Default:
             // fall through
 
         case RadioDir_Default:


@@ -425,12 +436,12 @@ void RadioWidgetsPage::OnRadioBox(wxCommandEvent& event)
     int event_sel = event.GetSelection();
     wxUnusedVar(event_sel);
 
     int event_sel = event.GetSelection();
     wxUnusedVar(event_sel);
 

-    wxLogMessage(_T("Radiobox selection changed, now %d"), sel);
+    wxLogMessage(wxT("Radiobox selection changed, now %d"), sel);

 
     wxASSERT_MSG( sel == event_sel,
 
     wxASSERT_MSG( sel == event_sel,

-                  _T("selection should be the same in event and radiobox") );
+                  wxT("selection should be the same in event and radiobox") );

 
 

-    m_textCurSel->SetValue(wxString::Format(_T("%d"), sel));
+    m_textCurSel->SetValue(wxString::Format(wxT("%d"), sel));

 }
 
 void RadioWidgetsPage::OnButtonRecreate(wxCommandEvent& WXUNUSED(event))
 }
 
 void RadioWidgetsPage::OnButtonRecreate(wxCommandEvent& WXUNUSED(event))


@@ -449,7 +460,7 @@ void RadioWidgetsPage::OnButtonSelection(wxCommandEvent& WXUNUSED(event))
     if ( !m_textSel->GetValue().ToULong(&sel) ||
             (sel >= (size_t)m_radio->GetCount()) )
     {
     if ( !m_textSel->GetValue().ToULong(&sel) ||
             (sel >= (size_t)m_radio->GetCount()) )
     {

-        wxLogWarning(_T("Invalid number specified as new selection."));
+        wxLogWarning(wxT("Invalid number specified as new selection."));

     }
     else
     {
     }
     else
     {


@@ -484,7 +495,7 @@ void RadioWidgetsPage::OnUpdateUISelection(wxUpdateUIEvent& event)
 void RadioWidgetsPage::OnUpdateUIReset(wxUpdateUIEvent& event)
 {
     // only enable it if something is not set to default
 void RadioWidgetsPage::OnUpdateUIReset(wxUpdateUIEvent& event)
 {
     // only enable it if something is not set to default

-    bool enable = m_chkVert->GetValue();
+    bool enable = m_chkSpecifyRows->GetValue();

 
     if ( !enable )
     {
 
     if ( !enable )
     {


@@ -507,14 +518,14 @@ void RadioWidgetsPage::OnUpdateUIReset(wxUpdateUIEvent& event)
 
 void RadioWidgetsPage::OnUpdateUIEnableItem(wxUpdateUIEvent& event)
 {
 
 void RadioWidgetsPage::OnUpdateUIEnableItem(wxUpdateUIEvent& event)
 {

-    event.SetText(m_radio->IsItemEnabled(TEST_BUTTON) ? _T("Disable &2nd item")
-                                                      : _T("Enable &2nd item"));
+    event.SetText(m_radio->IsItemEnabled(TEST_BUTTON) ? wxT("Disable &2nd item")
+                                                      : wxT("Enable &2nd item"));

 }
 
 void RadioWidgetsPage::OnUpdateUIShowItem(wxUpdateUIEvent& event)
 {
 }
 
 void RadioWidgetsPage::OnUpdateUIShowItem(wxUpdateUIEvent& event)
 {

-    event.SetText(m_radio->IsItemShown(TEST_BUTTON) ? _T("Hide 2nd &item")
-                                                    : _T("Show 2nd &item"));
+    event.SetText(m_radio->IsItemShown(TEST_BUTTON) ? wxT("Hide 2nd &item")
+                                                    : wxT("Show 2nd &item"));

 }
 
 #endif // wxUSE_RADIOBOX
 }
 
 #endif // wxUSE_RADIOBOX