copy doc/ directory to builddir

[wxWidgets.git] / samples / toolbar / toolbar.cpp

diff --git a/samples/toolbar/toolbar.cpp b/samples/toolbar/toolbar.cpp
index 42d3096b6e923dcd48b17bcffe0c71f7bad2ad40..c13dc5050ee9e777a88df45682c2cbba6112937f 100644 (file)
--- a/samples/toolbar/toolbar.cpp
+++ b/samples/toolbar/toolbar.cpp
@@ -88,7 +88,7 @@ class MyFrame: public wxFrame
 {
 public:
     MyFrame(wxFrame *parent,
-            wxWindowID id = -1,
+            wxWindowID id = wxID_ANY,
             const wxString& title = _T("wxToolBar Sample"),
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
@@ -114,6 +114,7 @@ public:
     void OnInsertPrint(wxCommandEvent& event);
     void OnChangeToolTip(wxCommandEvent& event);
     void OnToggleHelp(wxCommandEvent& WXUNUSED(event)) { DoToggleHelp(); }
+    void OnToggleRadioBtn(wxCommandEvent& event);
 
     void OnToolbarStyle(wxCommandEvent& event);
 
@@ -124,6 +125,8 @@ public:
 
     void OnUpdateCopyAndCut(wxUpdateUIEvent& event);
     void OnUpdateToggleHorzText(wxUpdateUIEvent& event);
+    void OnUpdateToggleRadioBtn(wxUpdateUIEvent& event)
+        { event.Enable( m_tbar != NULL ); }
 
 #if USE_GENERIC_TBAR
     virtual wxToolBar *OnCreateToolBar(long style,
@@ -170,6 +173,9 @@ enum
     IDM_TOOLBAR_DELETEPRINT,
     IDM_TOOLBAR_INSERTPRINT,
     IDM_TOOLBAR_TOGGLEHELP,
+    IDM_TOOLBAR_TOGGLERADIOBTN1,
+    IDM_TOOLBAR_TOGGLERADIOBTN2,
+    IDM_TOOLBAR_TOGGLERADIOBTN3,
     IDM_TOOLBAR_TOGGLE_TOOLBAR,
     IDM_TOOLBAR_TOGGLE_HORIZONTAL_TEXT,
     IDM_TOOLBAR_TOGGLE_ANOTHER_TOOLBAR,
@@ -178,6 +184,10 @@ enum
     IDM_TOOLBAR_SHOW_ICONS,
     IDM_TOOLBAR_SHOW_BOTH,
 
+    IDM_TOOLBAR_OTHER_1,
+    IDM_TOOLBAR_OTHER_2,
+    IDM_TOOLBAR_OTHER_3,
+
     ID_COMBO = 1000
 };
 
@@ -206,12 +216,14 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(IDM_TOOLBAR_DELETEPRINT, MyFrame::OnDeletePrint)
     EVT_MENU(IDM_TOOLBAR_INSERTPRINT, MyFrame::OnInsertPrint)
     EVT_MENU(IDM_TOOLBAR_TOGGLEHELP, MyFrame::OnToggleHelp)
+    EVT_MENU_RANGE(IDM_TOOLBAR_TOGGLERADIOBTN1, IDM_TOOLBAR_TOGGLERADIOBTN3,
+                   MyFrame::OnToggleRadioBtn)
     EVT_MENU(IDM_TOOLBAR_CHANGE_TOOLTIP, MyFrame::OnChangeToolTip)
 
     EVT_MENU_RANGE(IDM_TOOLBAR_SHOW_TEXT, IDM_TOOLBAR_SHOW_BOTH,
                    MyFrame::OnToolbarStyle)
 
-    EVT_MENU(-1, MyFrame::OnToolLeftClick)
+    EVT_MENU(wxID_ANY, MyFrame::OnToolLeftClick)
 
     EVT_COMBOBOX(ID_COMBO, MyFrame::OnCombo)
 
@@ -220,6 +232,9 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_UPDATE_UI(wxID_COPY, MyFrame::OnUpdateCopyAndCut)
     EVT_UPDATE_UI(wxID_CUT, MyFrame::OnUpdateCopyAndCut)
 
+    EVT_UPDATE_UI_RANGE(IDM_TOOLBAR_TOGGLERADIOBTN1,
+                        IDM_TOOLBAR_TOGGLERADIOBTN3,
+                        MyFrame::OnUpdateToggleRadioBtn)
     EVT_UPDATE_UI(IDM_TOOLBAR_TOGGLE_HORIZONTAL_TEXT,
                   MyFrame::OnUpdateToggleHorzText)
 END_EVENT_TABLE()
@@ -239,22 +254,24 @@ IMPLEMENT_APP(MyApp)
 bool MyApp::OnInit()
 {
     // Create the main frame window
-    MyFrame* frame = new MyFrame((wxFrame *) NULL, -1,
+    MyFrame* frame = new MyFrame((wxFrame *) NULL, wxID_ANY,
                                  _T("wxToolBar Sample"),
 #ifdef __WXWINCE__
-                                 wxPoint(0, 0), wxDefaultSize, wxNO_BORDER
+                                 wxDefaultPosition, wxDefaultSize
 #else
                                  wxPoint(100, 100), wxSize(550, 300)
 #endif
                                  );
 
-    frame->Show(TRUE);
+    frame->Show(true);
 
-    frame->SetStatusText(_T("Hello, wxWindows"));
+#ifndef __SMARTPHONE__
+    frame->SetStatusText(_T("Hello, wxWidgets"));
+#endif
 
     SetTopWindow(frame);
 
-    return TRUE;
+    return true;
 }
 
 void MyFrame::RecreateToolbar()
@@ -326,7 +343,7 @@ void MyFrame::RecreateToolbar()
     // adding a combo to a vertical toolbar is not very smart
     if ( m_horzToolbar )
     {
-        wxComboBox *combo = new wxComboBox(toolBar, ID_COMBO, _T(""), wxDefaultPosition, wxSize(200,-1) );
+        wxComboBox *combo = new wxComboBox(toolBar, ID_COMBO, _T(""), wxDefaultPosition, wxSize(200,wxDefaultSize.y) );
         combo->Append(_T("This"));
         combo->Append(_T("is a"));
         combo->Append(_T("combobox"));
@@ -365,15 +382,14 @@ MyFrame::MyFrame(wxFrame* parent,
        : wxFrame(parent, id, title, pos, size, style)
 {
     m_tbar = NULL;
-    m_textWindow = new wxTextCtrl(this, -1, _T(""), wxPoint(0, 0), wxSize(-1, -1), wxTE_MULTILINE);
 
-    m_smallToolbar = TRUE;
-    m_horzToolbar = TRUE;
-    m_horzText = FALSE;
+    m_smallToolbar = true;
+    m_horzToolbar = true;
+    m_horzText = false;
     m_rows = 1;
     m_nPrint = 1;
 
-#ifndef __WXWINCE__
+#ifndef __SMARTPHONE__
     // Give it a status line
     CreateStatusBar();
 #endif
@@ -414,6 +430,10 @@ MyFrame::MyFrame(wxFrame* parent,
     tbarMenu->Append(IDM_TOOLBAR_INSERTPRINT, _T("&Insert print button\tCtrl-I"), _T(""));
     tbarMenu->Append(IDM_TOOLBAR_TOGGLEHELP, _T("Toggle &help button\tCtrl-T"), _T(""));
     tbarMenu->AppendSeparator();
+    tbarMenu->Append(IDM_TOOLBAR_TOGGLERADIOBTN1, _T("Toggle &1st radio button\tCtrl-1"), _T(""));
+    tbarMenu->Append(IDM_TOOLBAR_TOGGLERADIOBTN2, _T("Toggle &2nd radio button\tCtrl-2"), _T(""));
+    tbarMenu->Append(IDM_TOOLBAR_TOGGLERADIOBTN3, _T("Toggle &3rd radio button\tCtrl-3"), _T(""));
+    tbarMenu->AppendSeparator();
     tbarMenu->Append(IDM_TOOLBAR_CHANGE_TOOLTIP, _T("Change tool tip"), _T(""));
     tbarMenu->AppendSeparator();
     tbarMenu->AppendRadioItem(IDM_TOOLBAR_SHOW_TEXT, _T("Show &text\tAlt-T"));
@@ -435,10 +455,12 @@ MyFrame::MyFrame(wxFrame* parent,
     // Associate the menu bar with the frame
     SetMenuBar(menuBar);
 
-    menuBar->Check(IDM_TOOLBAR_SHOW_BOTH, TRUE);
+    menuBar->Check(IDM_TOOLBAR_SHOW_BOTH, true);
 
     // Create the toolbar
     RecreateToolbar();
+
+    m_textWindow = new wxTextCtrl(this, wxID_ANY, _T(""), wxPoint(0, 0), wxDefaultSize, wxTE_MULTILINE);
 }
 
 #if USE_GENERIC_TBAR
@@ -461,7 +483,7 @@ void MyFrame::LayoutChildren()
     int offset;
     if ( m_tbar )
     {
-        m_tbar->SetSize(-1, size.y);
+        m_tbar->SetSize(wxDefaultSize.x, size.y);
         m_tbar->Move(0, 0);
 
         offset = m_tbar->GetSize().x;
@@ -522,15 +544,15 @@ void MyFrame::OnToggleAnotherToolbar(wxCommandEvent& WXUNUSED(event))
         style &= ~wxTB_HORIZONTAL;
         style |= wxTB_VERTICAL;
 
-        m_tbar = new wxToolBar(this, -1,
+        m_tbar = new wxToolBar(this, wxID_ANY,
                                wxDefaultPosition, wxDefaultSize,
                                style);
 
         m_tbar->SetMargins(4, 4);
 
-        m_tbar->AddRadioTool(wxID_NEW, _T("First"), wxBITMAP(new));
-        m_tbar->AddRadioTool(wxID_OPEN, _T("Second"), wxBITMAP(open));
-        m_tbar->AddRadioTool(wxID_SAVE, _T("Third"), wxBITMAP(save));
+        m_tbar->AddRadioTool(IDM_TOOLBAR_OTHER_1, _T("First"), wxBITMAP(new));
+        m_tbar->AddRadioTool(IDM_TOOLBAR_OTHER_2, _T("Second"), wxBITMAP(open));
+        m_tbar->AddRadioTool(IDM_TOOLBAR_OTHER_3, _T("Third"), wxBITMAP(save));
         m_tbar->AddSeparator();
         m_tbar->AddTool(wxID_HELP, _T("Help"), wxBITMAP(help));
 
@@ -566,7 +588,7 @@ void MyFrame::OnToggleToolbarOrient(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {
-    Close(TRUE);
+    Close(true);
 }
 
 void MyFrame::OnAbout(wxCommandEvent& event)
@@ -576,7 +598,7 @@ void MyFrame::OnAbout(wxCommandEvent& event)
     else
         m_textWindow->WriteText( _T("Help button up now.\n") );
 
-    (void)wxMessageBox(_T("wxWindows toolbar sample"), _T("About wxToolBar"));
+    (void)wxMessageBox(_T("wxWidgets toolbar sample"), _T("About wxToolBar"));
 }
 
 void MyFrame::OnToolLeftClick(wxCommandEvent& event)
@@ -689,6 +711,7 @@ void MyFrame::OnInsertPrint(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnToolEnter(wxCommandEvent& event)
 {
+#ifndef __SMARTPHONE__
     if (event.GetSelection() > -1)
     {
         wxString str;
@@ -697,5 +720,15 @@ void MyFrame::OnToolEnter(wxCommandEvent& event)
     }
     else
         SetStatusText(_T(""));
+#endif
+}
+
+void MyFrame::OnToggleRadioBtn(wxCommandEvent& event)
+{
+    if ( m_tbar )
+    {
+        m_tbar->ToggleTool(IDM_TOOLBAR_OTHER_1 +
+                            event.GetId() - IDM_TOOLBAR_TOGGLERADIOBTN1, true);
+    }
 }