Applied patch [ 853031 ] Japanese po file

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

diff --git a/samples/checklst/checklst.cpp b/samples/checklst/checklst.cpp
index 039e1402265600f41a636b377de44245fbf74cd5..635a13df623bffdd5f1bb82c4e6f6058eb20cab2 100644 (file)
--- a/samples/checklst/checklst.cpp
+++ b/samples/checklst/checklst.cpp
@@ -46,24 +46,36 @@ class CheckListBoxFrame : public wxFrame
 {
 public:
     // ctor & dtor
 {
 public:
     // ctor & dtor

-    CheckListBoxFrame(wxFrame *frame, const char *title,
-            int x, int y, int w, int h);
-    ~CheckListBoxFrame();
+    CheckListBoxFrame(wxFrame *frame, const wxChar *title,
+                      int x, int y, int w, int h);
+    virtual ~CheckListBoxFrame();

 
     // notifications
 
     // notifications

-    void OnQuit           (wxCommandEvent& event);
-    void OnAbout          (wxCommandEvent& event);
-    void OnListboxSelect  (wxCommandEvent& event);
-    void OnCheckboxToggle (wxCommandEvent& event);
+    void OnQuit(wxCommandEvent& event);
+    void OnAbout(wxCommandEvent& event);
+
+    void OnCheckFirstItem(wxCommandEvent& event);
+    void OnUncheckFirstItem(wxCommandEvent& event);
+    void OnToggleFirstItem(wxCommandEvent& event);
+    void OnToggleSelection(wxCommandEvent& event);
+    void OnAddItems(wxCommandEvent& event);
+
+    void OnListboxSelect(wxCommandEvent& event);
+    void OnCheckboxToggle(wxCommandEvent& event);

     void OnListboxDblClick(wxCommandEvent& event);
     void OnListboxDblClick(wxCommandEvent& event);

-    void OnButtonUp       (wxCommandEvent& event);
-    void OnButtonDown     (wxCommandEvent& event);
+
+    void OnButtonUp(wxCommandEvent& event);
+    void OnButtonDown(wxCommandEvent& event);

 
 private:
 
 private:

+    void CreateCheckListbox(long flags = 0);
+

     void OnButtonMove(bool up);
 
     void AdjustColour(size_t index);
 
     void OnButtonMove(bool up);
 
     void AdjustColour(size_t index);
 

+    wxPanel *m_panel;
+

     wxCheckListBox *m_pListBox;
 
     DECLARE_EVENT_TABLE()
     wxCheckListBox *m_pListBox;
 
     DECLARE_EVENT_TABLE()


@@ -71,7 +83,15 @@ private:
 
 enum
 {
 
 enum
 {

-    Menu_Quit = 1,
+    Menu_About = 100,
+    Menu_Quit,
+
+    Menu_CheckFirst,
+    Menu_UncheckFirst,
+    Menu_ToggleFirst,
+    Menu_Selection,
+    Menu_AddItems,
+

     Control_First = 1000,
     Control_Listbox,
     Btn_Up,
     Control_First = 1000,
     Control_Listbox,
     Btn_Up,


@@ -79,8 +99,15 @@ enum
 };
 
 BEGIN_EVENT_TABLE(CheckListBoxFrame, wxFrame)
 };
 
 BEGIN_EVENT_TABLE(CheckListBoxFrame, wxFrame)

+    EVT_MENU(Menu_About, CheckListBoxFrame::OnAbout)

     EVT_MENU(Menu_Quit, CheckListBoxFrame::OnQuit)
 
     EVT_MENU(Menu_Quit, CheckListBoxFrame::OnQuit)
 

+    EVT_MENU(Menu_CheckFirst, CheckListBoxFrame::OnCheckFirstItem)
+    EVT_MENU(Menu_UncheckFirst, CheckListBoxFrame::OnUncheckFirstItem)
+    EVT_MENU(Menu_ToggleFirst, CheckListBoxFrame::OnToggleFirstItem)
+    EVT_MENU(Menu_Selection, CheckListBoxFrame::OnToggleSelection)
+    EVT_MENU(Menu_AddItems, CheckListBoxFrame::OnAddItems)
+

     EVT_LISTBOX(Control_Listbox, CheckListBoxFrame::OnListboxSelect)
     EVT_CHECKLISTBOX(Control_Listbox, CheckListBoxFrame::OnCheckboxToggle)
     EVT_LISTBOX_DCLICK(Control_Listbox, CheckListBoxFrame::OnListboxDblClick)
     EVT_LISTBOX(Control_Listbox, CheckListBoxFrame::OnListboxSelect)
     EVT_CHECKLISTBOX(Control_Listbox, CheckListBoxFrame::OnCheckboxToggle)
     EVT_LISTBOX_DCLICK(Control_Listbox, CheckListBoxFrame::OnListboxDblClick)


@@ -97,7 +124,7 @@ bool CheckListBoxApp::OnInit(void)
     CheckListBoxFrame *pFrame = new CheckListBoxFrame
                                     (
                                      NULL,
     CheckListBoxFrame *pFrame = new CheckListBoxFrame
                                     (
                                      NULL,

-                                     "wxWindows Checklistbox Sample",
+                                     _T("wxWindows Checklistbox Sample"),

                                      50, 50, 480, 320
                                     );
     SetTopWindow(pFrame);
                                      50, 50, 480, 320
                                     );
     SetTopWindow(pFrame);


@@ -107,9 +134,9 @@ bool CheckListBoxApp::OnInit(void)
 
 // main frame constructor
 CheckListBoxFrame::CheckListBoxFrame(wxFrame *frame,
 
 // main frame constructor
 CheckListBoxFrame::CheckListBoxFrame(wxFrame *frame,

-        const char *title,
-        int x, int y, int w, int h)
-: wxFrame(frame, -1, title, wxPoint(x, y), wxSize(w, h))
+                                     const wxChar *title,
+                                     int x, int y, int w, int h)
+                 : wxFrame(frame, -1, title, wxPoint(x, y), wxSize(w, h))

 {
     // create the status line
     const int widths[] = { -1, 60 };
 {
     // create the status line
     const int widths[] = { -1, 60 };


@@ -118,26 +145,71 @@ CheckListBoxFrame::CheckListBoxFrame(wxFrame *frame,
     wxLogStatus(this, _T("no selection"));
 
     // Make a menubar
     wxLogStatus(this, _T("no selection"));
 
     // Make a menubar

-    wxMenu *file_menu = new wxMenu;
-
-    // construct submenu
-    file_menu->Append(Menu_Quit, "E&xit");
-
+    // --------------
+
+    // file submenu
+    wxMenu *menuFile = new wxMenu;
+    menuFile->Append(Menu_About, _T("&About...\tF1"));
+    menuFile->AppendSeparator();
+    menuFile->Append(Menu_Quit, _T("E&xit\tAlt-X"));
+
+    // listbox submenu
+    wxMenu *menuList = new wxMenu;
+    menuList->Append(Menu_CheckFirst, _T("Check the first item\tCtrl-C"));
+    menuList->Append(Menu_UncheckFirst, _T("Uncheck the first item\tCtrl-U"));
+    menuList->Append(Menu_ToggleFirst, _T("Toggle the first item\tCtrl-T"));
+    menuList->AppendSeparator();
+    menuList->AppendCheckItem(Menu_AddItems, _T("Add more items\tCtrl-A"));
+    menuList->AppendSeparator();
+    menuList->AppendCheckItem(Menu_Selection, _T("Multiple selection\tCtrl-M"));
+
+    // put it all together

     wxMenuBar *menu_bar = new wxMenuBar;
     wxMenuBar *menu_bar = new wxMenuBar;

-    menu_bar->Append(file_menu, "&File");
+    menu_bar->Append(menuFile, _T("&File"));
+    menu_bar->Append(menuList, _T("&List"));

     SetMenuBar(menu_bar);
 
     // make a panel with some controls
     SetMenuBar(menu_bar);
 
     // make a panel with some controls

-    wxPanel *panel = new wxPanel(this, -1, wxPoint(0, 0),
-                                 wxSize(400, 200), wxTAB_TRAVERSAL);
+    m_panel = new wxPanel(this, -1, wxPoint(0, 0),
+                          wxSize(400, 200), wxTAB_TRAVERSAL);
+
+    CreateCheckListbox();
+
+    // create buttons for moving the items around
+    wxButton *button1 = new wxButton(m_panel, Btn_Up, _T("   &Up  "), wxPoint(420, 90));
+    wxButton *button2 = new wxButton(m_panel, Btn_Down, _T("&Down"), wxPoint(420, 120));
+
+
+    wxBoxSizer *mainsizer = new wxBoxSizer( wxVERTICAL );
+
+    mainsizer->Add( m_pListBox, 1, wxGROW|wxALL, 10 );

 
 

+    wxBoxSizer *bottomsizer = new wxBoxSizer( wxHORIZONTAL );
+
+    bottomsizer->Add( button1, 0, wxALL, 10 );
+    bottomsizer->Add( button2, 0, wxALL, 10 );
+
+    mainsizer->Add( bottomsizer, 0, wxCENTER );
+
+    // tell frame to make use of sizer (or constraints, if any)
+    m_panel->SetAutoLayout( TRUE );
+    m_panel->SetSizer( mainsizer );
+
+    // don't allow frame to get smaller than what the sizers tell ye
+    mainsizer->SetSizeHints( this );
+
+    Show(TRUE);
+}
+
+void CheckListBoxFrame::CreateCheckListbox(long flags)
+{

     // check list box
     // check list box

-    static const char* aszChoices[] =
+    static const wxChar *aszChoices[] =

     {
     {

-        "Zeroth",
-        "First", "Second", "Third",
-        "Fourth", "Fifth", "Sixth",
-        "Seventh", "Eighth", "Nineth"
+        _T("Zeroth"),
+        _T("First"), _T("Second"), _T("Third"),
+        _T("Fourth"), _T("Fifth"), _T("Sixth"),
+        _T("Seventh"), _T("Eighth"), _T("Nineth")

     };
 
     wxString *astrChoices = new wxString[WXSIZEOF(aszChoices)];
     };
 
     wxString *astrChoices = new wxString[WXSIZEOF(aszChoices)];


@@ -147,12 +219,13 @@ CheckListBoxFrame::CheckListBoxFrame(wxFrame *frame,
 
     m_pListBox = new wxCheckListBox
         (
 
     m_pListBox = new wxCheckListBox
         (

-         panel,                 // parent
+         m_panel,               // parent

          Control_Listbox,       // control id
          wxPoint(10, 10),       // listbox poistion
          wxSize(400, 100),      // listbox size
          WXSIZEOF(aszChoices),  // number of strings
          Control_Listbox,       // control id
          wxPoint(10, 10),       // listbox poistion
          wxSize(400, 100),      // listbox size
          WXSIZEOF(aszChoices),  // number of strings

-         astrChoices            // array of strings
+         astrChoices,           // array of strings
+         flags

         );
 
     //m_pListBox->SetBackgroundColour(*wxGREEN);
         );
 
     //m_pListBox->SetBackgroundColour(*wxGREEN);


@@ -165,32 +238,7 @@ CheckListBoxFrame::CheckListBoxFrame(wxFrame *frame,
     }
 
     m_pListBox->Check(2);
     }
 
     m_pListBox->Check(2);

-
-    // create buttons for moving the items around
-    wxButton *button1 = new wxButton(panel, Btn_Up, "   &Up  ", wxPoint(420, 90));
-    wxButton *button2 = new wxButton(panel, Btn_Down, "&Down", wxPoint(420, 120));
-
-
-    wxBoxSizer *mainsizer = new wxBoxSizer( wxVERTICAL );
-  
-    mainsizer->Add( m_pListBox, 1, wxGROW|wxALL, 10 );
-    
-    wxBoxSizer *bottomsizer = new wxBoxSizer( wxHORIZONTAL );
-    
-    bottomsizer->Add( button1, 0, wxALL, 10 );
-    bottomsizer->Add( button2, 0, wxALL, 10 );
-
-    mainsizer->Add( bottomsizer, 0, wxCENTER );
-  
-    // tell frame to make use of sizer (or constraints, if any)
-    panel->SetAutoLayout( TRUE );
-    panel->SetSizer( mainsizer );
-
-    // don't allow frame to get smaller than what the sizers tell ye
-    mainsizer->SetSizeHints( this );  
-
-  
-    Show(TRUE);
+    m_pListBox->Select(3);

 }
 
 CheckListBoxFrame::~CheckListBoxFrame()
 }
 
 CheckListBoxFrame::~CheckListBoxFrame()


@@ -204,24 +252,66 @@ void CheckListBoxFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 
 void CheckListBoxFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
 
 void CheckListBoxFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {

-    wxMessageBox(_T("Demo of wxCheckListBox control\n"
-                    "© Vadim Zeitlin 1998-1999"),
-                 _T("About wxCheckListBox"),
+    wxMessageBox(wxT("Demo of wxCheckListBox control\n© Vadim Zeitlin 1998-2002"),
+                 wxT("About wxCheckListBox"),

                  wxICON_INFORMATION, this);
 }
 
                  wxICON_INFORMATION, this);
 }
 

+void CheckListBoxFrame::OnCheckFirstItem(wxCommandEvent& WXUNUSED(event))
+{
+    if ( !m_pListBox->IsEmpty() )
+        m_pListBox->Check(0);
+}
+
+void CheckListBoxFrame::OnUncheckFirstItem(wxCommandEvent& WXUNUSED(event))
+{
+    if ( !m_pListBox->IsEmpty() )
+        m_pListBox->Check(0, FALSE);
+}
+
+void CheckListBoxFrame::OnToggleFirstItem(wxCommandEvent& WXUNUSED(event))
+{
+    if ( !m_pListBox->IsEmpty() )
+        m_pListBox->Check(0, !m_pListBox->IsChecked(0));
+}
+
+void CheckListBoxFrame::OnAddItems(wxCommandEvent& WXUNUSED(event))
+{
+    static size_t s_nItem = 0;
+    wxArrayString items;
+    items.Add(wxString::Format(_T("New item %lu"), (unsigned long)++s_nItem));
+    items.Add(wxString::Format(_T("New item %lu"), (unsigned long)++s_nItem));
+    items.Add(wxString::Format(_T("New item %lu"), (unsigned long)++s_nItem));
+
+    m_pListBox->InsertItems(items, 0);//m_pListBox->GetCount());
+}
+
+void CheckListBoxFrame::OnToggleSelection(wxCommandEvent& event)
+{
+    wxSizer *sizer = m_panel->GetSizer();
+
+    sizer->Detach( m_pListBox );
+    delete m_pListBox;
+
+    CreateCheckListbox(event.IsChecked() ? wxLB_EXTENDED : 0);
+
+    sizer->Insert(0, m_pListBox, 1, wxGROW | wxALL, 10);
+
+    m_panel->Layout();
+}
+

 void CheckListBoxFrame::OnListboxSelect(wxCommandEvent& event)
 {
     int nSel = event.GetSelection();
 void CheckListBoxFrame::OnListboxSelect(wxCommandEvent& event)
 {
     int nSel = event.GetSelection();

-    wxLogStatus(this, _T("item %d selected (%schecked)"), nSel,
-                      m_pListBox->IsChecked(nSel) ? _T("") : _T("not "));
+    wxLogStatus(this, wxT("Item %d selected (%schecked)"), nSel,
+                      m_pListBox->IsChecked(nSel) ? _T("") : wxT("not "));

 }
 
 void CheckListBoxFrame::OnListboxDblClick(wxCommandEvent& WXUNUSED(event))
 {
     wxString strSelection;
 }
 
 void CheckListBoxFrame::OnListboxDblClick(wxCommandEvent& WXUNUSED(event))
 {
     wxString strSelection;

-    strSelection.sprintf(_T("item %d double clicked"), m_pListBox->GetSelection());
-    wxMessageDialog dialog(this, strSelection);
+    strSelection.Printf(wxT("Item %d double clicked"), m_pListBox->GetSelection());
+    wxMessageDialog dialog(this, strSelection, wxT("wxCheckListBox message"), wxICON_INFORMATION);

     dialog.ShowModal();
 }
 
     dialog.ShowModal();
 }
 


@@ -229,8 +319,8 @@ void CheckListBoxFrame::OnCheckboxToggle(wxCommandEvent& event)
 {
     unsigned int nItem = event.GetInt();
 
 {
     unsigned int nItem = event.GetInt();
 

-    wxLogStatus(this, _T("item %d was %schecked"), nItem,
-                      m_pListBox->IsChecked(nItem) ? _T("") : _T("un"));
+    wxLogStatus(this, wxT("item %d was %schecked"), nItem,
+                      m_pListBox->IsChecked(nItem) ? wxT("") : wxT("un"));

 }
 
 void CheckListBoxFrame::OnButtonUp(wxCommandEvent& WXUNUSED(event))
 }
 
 void CheckListBoxFrame::OnButtonUp(wxCommandEvent& WXUNUSED(event))


@@ -253,7 +343,7 @@ void CheckListBoxFrame::OnButtonMove(bool up)
         int positionNew = up ? selection - 1 : selection + 2;
         if ( positionNew < 0 || positionNew > m_pListBox->GetCount() )
         {
         int positionNew = up ? selection - 1 : selection + 2;
         if ( positionNew < 0 || positionNew > m_pListBox->GetCount() )
         {

-            wxLogStatus(this, _T("Can't move this item %s"), up ? _T("up") : _T("down"));
+            wxLogStatus(this, wxT("Can't move this item %s"), up ? wxT("up") : wxT("down"));

         }
         else
         {
         }
         else
         {


@@ -274,19 +364,19 @@ void CheckListBoxFrame::OnButtonMove(bool up)
             AdjustColour(selection);
             AdjustColour(selectionNew);
 
             AdjustColour(selection);
             AdjustColour(selectionNew);
 

-            wxLogStatus(this, _T("Item moved %s"), up ? _T("up") : _T("down"));
+            wxLogStatus(this, wxT("Item moved %s"), up ? wxT("up") : wxT("down"));

         }
     }
     else
     {
         }
     }
     else
     {

-        wxLogStatus(this, _T("Please select an item"));
+        wxLogStatus(this, wxT("Please select an item"));

     }
 }
 
 void CheckListBoxFrame::AdjustColour(size_t index)
 {
     }
 }
 
 void CheckListBoxFrame::AdjustColour(size_t index)
 {

-    // not implemented in other ports yet
-#ifdef __WXMSW__
+    // not implemented in ports other than (native) MSW yet
+#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)

     // even items have grey backround, odd ones - white
     unsigned char c = index % 2 ? 255 : 200;
     m_pListBox->GetItem(index)->SetBackgroundColour(wxColor(c, c, c));
     // even items have grey backround, odd ones - white
     unsigned char c = index % 2 ? 255 : 200;
     m_pListBox->GetItem(index)->SetBackgroundColour(wxColor(c, c, c));