remove file lists on exit

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

diff --git a/samples/checklst/checklst.cpp b/samples/checklst/checklst.cpp
index 553bf0760cd23d1bdc80549357950a7a8a99d330..bbf3d8b96ef76c605fb8dc0a5144b30102dd7dec 100644 (file)
--- a/samples/checklst/checklst.cpp
+++ b/samples/checklst/checklst.cpp
@@ -9,10 +9,6 @@
 // Licence:     wxWindows license
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows license
 ///////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-    //#pragma implementation
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -34,6 +30,10 @@
 #include  "wx/menuitem.h"
 #include  "wx/checklst.h"
 
 #include  "wx/menuitem.h"
 #include  "wx/checklst.h"
 

+#if !wxUSE_CHECKLISTBOX
+    #error "This sample can't be built without wxUSE_CHECKLISTBOX"
+#endif // wxUSE_CHECKLISTBOX
+

 // Define a new application type
 class CheckListBoxApp: public wxApp
 {
 // Define a new application type
 class CheckListBoxApp: public wxApp
 {


@@ -46,24 +46,46 @@ 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);
+    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 OnToggleSorting(wxCommandEvent& event);
+    void OnToggleExtended(wxCommandEvent& event);
+
+    void OnInsertItemsStart(wxCommandEvent& event);
+    void OnInsertItemsMiddle(wxCommandEvent& event);
+    void OnInsertItemsEnd(wxCommandEvent& event);
+    void OnAppendItems(wxCommandEvent& event);
+    void OnRemoveItems(wxCommandEvent& event);
+
+    void OnGetBestSize(wxCommandEvent& event);
+
+    void OnMakeItemFirst(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,16 +93,51 @@ private:
 
 enum
 {
 
 enum
 {

-    Menu_Quit = 1,
-    Control_First = 1000,
+    Menu_About = wxID_ABOUT,
+    Menu_Quit = wxID_EXIT,
+
+    Menu_CheckFirst = wxID_HIGHEST,
+    Menu_UncheckFirst,
+    Menu_ToggleFirst,
+    Menu_Selection,
+    Menu_Extended,
+    Menu_Sorting,
+    Menu_InsertItemsStart,
+    Menu_InsertItemsMiddle,
+    Menu_InsertItemsEnd,
+    Menu_AppendItems,
+    Menu_RemoveItems,
+    Menu_GetBestSize,
+    Menu_MakeItemFirst,
+
+    Control_First,

     Control_Listbox,
     Control_Listbox,

-    Btn_Up,
-    Btn_Down
+
+    Btn_Up = wxID_UP,
+    Btn_Down = wxID_DOWN

 };
 
 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_Extended, CheckListBoxFrame::OnToggleExtended)
+    EVT_MENU(Menu_Sorting, CheckListBoxFrame::OnToggleSorting)
+    
+    EVT_MENU(Menu_InsertItemsStart, CheckListBoxFrame::OnInsertItemsStart)
+    EVT_MENU(Menu_InsertItemsMiddle, CheckListBoxFrame::OnInsertItemsMiddle)
+    EVT_MENU(Menu_InsertItemsEnd, CheckListBoxFrame::OnInsertItemsEnd)
+    EVT_MENU(Menu_AppendItems, CheckListBoxFrame::OnAppendItems)
+    EVT_MENU(Menu_RemoveItems, CheckListBoxFrame::OnRemoveItems)
+
+    EVT_MENU(Menu_GetBestSize, CheckListBoxFrame::OnGetBestSize)
+
+    EVT_MENU(Menu_MakeItemFirst, CheckListBoxFrame::OnMakeItemFirst)
+

     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,47 +154,103 @@ bool CheckListBoxApp::OnInit(void)
     CheckListBoxFrame *pFrame = new CheckListBoxFrame
                                     (
                                      NULL,
     CheckListBoxFrame *pFrame = new CheckListBoxFrame
                                     (
                                      NULL,

-                                     "wxWindows Checklistbox Sample",
-                                     50, 50, 480, 320
+                                     _T("wxWidgets Checklistbox Sample")

                                     );
     SetTopWindow(pFrame);
 
                                     );
     SetTopWindow(pFrame);
 

-    return TRUE;
+    return true;

 }
 
 // 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)
+                 : wxFrame(frame, wxID_ANY, title)

 {
 {

+#if wxUSE_STATUSBAR

     // create the status line
     const int widths[] = { -1, 60 };
     CreateStatusBar(2);
     SetStatusWidths(2, widths);
     // create the status line
     const int widths[] = { -1, 60 };
     CreateStatusBar(2);
     SetStatusWidths(2, widths);

-    wxLogStatus(this, _T("no selection"));
+#endif // wxUSE_STATUSBAR

 
     // Make a menubar
 
     // 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->Append(Menu_InsertItemsStart, _T("Insert some item at the beginning"));
+    menuList->Append(Menu_InsertItemsMiddle, _T("Insert some item at the middle"));
+    menuList->Append(Menu_InsertItemsEnd, _T("Insert some item at the end"));
+    menuList->Append(Menu_AppendItems, _T("Append some items\tCtrl-A"));
+    menuList->Append(Menu_RemoveItems, _T("Remove some items"));
+    menuList->AppendSeparator();
+    menuList->AppendCheckItem(Menu_Selection, _T("Multiple selection\tCtrl-M"));
+    menuList->AppendCheckItem(Menu_Extended, _T("Extended selection"));
+    menuList->AppendCheckItem(Menu_Sorting, _T("Sorting"));
+    menuList->AppendSeparator();
+    menuList->Append(Menu_GetBestSize, _T("Get the best size of the checklistbox control"));
+    menuList->AppendSeparator();
+    menuList->Append(Menu_MakeItemFirst, _T("Make selected item the first item"));
+
+
+    // 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, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL);
+
+    CreateCheckListbox();
+
+    // create buttons for moving the items around
+    wxButton *button1 = new wxButton(m_panel, Btn_Up);
+    wxButton *button2 = new wxButton(m_panel, Btn_Down);
+
+
+    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 );
+
+#ifndef __WXWINCE__
+    // don't allow frame to get smaller than what the sizers tell ye
+    mainsizer->SetSizeHints( this );
+#endif
+
+    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 +260,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,61 +279,183 @@ CheckListBoxFrame::CheckListBoxFrame(wxFrame *frame,
     }
 
     m_pListBox->Check(2);
     }
 
     m_pListBox->Check(2);

+    m_pListBox->Select(3);
+}

 
 

-    // 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));
+void CheckListBoxFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
+{
+    Close(true);
+}

 
 

+void CheckListBoxFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
+{
+    wxMessageBox(wxT("Demo of wxCheckListBox control\n(c) Vadim Zeitlin 1998-2002"),
+                 wxT("About wxCheckListBox"),
+                 wxICON_INFORMATION, this);
+}

 
 

-    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 );
+void CheckListBoxFrame::OnCheckFirstItem(wxCommandEvent& WXUNUSED(event))
+{
+    if ( !m_pListBox->IsEmpty() )
+        m_pListBox->Check(0);
+}

 
 

-    mainsizer->Add( bottomsizer, 0, wxCENTER );
-  
-    // tell frame to make use of sizer (or constraints, if any)
-    panel->SetAutoLayout( TRUE );
-    panel->SetSizer( mainsizer );
+void CheckListBoxFrame::OnUncheckFirstItem(wxCommandEvent& WXUNUSED(event))
+{
+    if ( !m_pListBox->IsEmpty() )
+        m_pListBox->Check(0, false);
+}

 
 

-    // don't allow frame to get smaller than what the sizers tell ye
-    mainsizer->SetSizeHints( this );  
+void CheckListBoxFrame::OnToggleFirstItem(wxCommandEvent& WXUNUSED(event))
+{
+    if ( !m_pListBox->IsEmpty() )
+        m_pListBox->Check(0, !m_pListBox->IsChecked(0));
+}

 
 

-  
-    Show(TRUE);
+void CheckListBoxFrame::OnInsertItemsStart(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());

 }
 
 }
 

-CheckListBoxFrame::~CheckListBoxFrame()
+void CheckListBoxFrame::OnInsertItemsMiddle(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, m_pListBox->GetCount() ? 1 : 0);

 }
 
 }
 

-void CheckListBoxFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
+void CheckListBoxFrame::OnInsertItemsEnd(wxCommandEvent& WXUNUSED(event))

 {
 {

-    Close(TRUE);
+    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, m_pListBox->GetCount() );

 }
 
 }
 

-void CheckListBoxFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
+void CheckListBoxFrame::OnAppendItems(wxCommandEvent& WXUNUSED(event))

 {
 {

-    wxMessageBox(wxT("Demo of wxCheckListBox control\n© Vadim Zeitlin 1998-1999"),
-                 wxT("About wxCheckListBox"),
-                 wxICON_INFORMATION, this);
+    static size_t s_nItem = 0;
+    m_pListBox->Append(wxString::Format(_T("New item %lu"), (unsigned long)++s_nItem));
+    m_pListBox->Append(wxString::Format(_T("New item %lu"), (unsigned long)++s_nItem));
+    m_pListBox->Append(wxString::Format(_T("New item %lu"), (unsigned long)++s_nItem));
+}
+
+void CheckListBoxFrame::OnRemoveItems(wxCommandEvent& WXUNUSED(event))
+{
+    if(m_pListBox->GetCount())
+        m_pListBox->Delete(0);
+    if(m_pListBox->GetCount())
+        m_pListBox->Delete(0);
+    if(m_pListBox->GetCount())
+        m_pListBox->Delete(0);
+}
+
+void CheckListBoxFrame::OnGetBestSize(wxCommandEvent& WXUNUSED(event))
+{
+    wxSize bestSize = m_pListBox->GetBestSize();
+
+    wxMessageBox(wxString::Format(wxT("Best size of the checklistbox is:[%i,%i]"),
+                                  bestSize.x, bestSize.y
+                                 )
+                );
+}
+
+void CheckListBoxFrame::OnMakeItemFirst(wxCommandEvent& WXUNUSED(event))
+{
+    if(m_pListBox->GetSelection() != -1)
+        m_pListBox->SetFirstItem(m_pListBox->GetSelection());
+    else
+        wxMessageBox(wxT("Nothing selected!"));
+}
+
+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::OnToggleExtended(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::OnToggleSorting(wxCommandEvent& event)
+{
+    wxSizer *sizer = m_panel->GetSizer();
+
+    sizer->Detach( m_pListBox );
+    delete m_pListBox;
+
+    CreateCheckListbox(event.IsChecked() ? wxLB_SORT : 0);
+
+    sizer->Insert(0, m_pListBox, 1, wxGROW | wxALL, 10);
+
+    m_panel->Layout();    

 }
 
 void CheckListBoxFrame::OnListboxSelect(wxCommandEvent& event)
 {
     int nSel = event.GetSelection();
     wxLogStatus(this, wxT("Item %d selected (%schecked)"), nSel,
 }
 
 void CheckListBoxFrame::OnListboxSelect(wxCommandEvent& event)
 {
     int nSel = event.GetSelection();
     wxLogStatus(this, wxT("Item %d selected (%schecked)"), nSel,

-                      m_pListBox->IsChecked(nSel) ? _T("") : wxT("not "));
+                      m_pListBox->IsChecked(nSel) ? wxT("") : wxT("not "));

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

+    int selection = -1;
+    if(m_pListBox->GetWindowStyle() & wxLB_EXTENDED)
+    {
+        wxArrayInt list;
+        m_pListBox->GetSelections(list);
+        if(list.Count()==1)
+        {
+            selection = list.Item(0);
+        }
+    }
+    else
+    {
+        selection = m_pListBox->GetSelection();
+    }
+

     wxString strSelection;
     wxString strSelection;

-    strSelection.sprintf(wxT("Item %d double clicked"), m_pListBox->GetSelection());
+    if ( selection != -1 )
+    {
+        strSelection.Printf(wxT("Item %d double clicked"), selection);
+    }
+    else
+    {
+        strSelection = wxT("List double clicked in multiple selection mode");
+    }

     wxMessageDialog dialog(this, strSelection, wxT("wxCheckListBox message"), wxICON_INFORMATION);
     dialog.ShowModal();
 }
     wxMessageDialog dialog(this, strSelection, wxT("wxCheckListBox message"), wxICON_INFORMATION);
     dialog.ShowModal();
 }


@@ -234,23 +470,36 @@ void CheckListBoxFrame::OnCheckboxToggle(wxCommandEvent& event)
 
 void CheckListBoxFrame::OnButtonUp(wxCommandEvent& WXUNUSED(event))
 {
 
 void CheckListBoxFrame::OnButtonUp(wxCommandEvent& WXUNUSED(event))
 {

-    OnButtonMove(TRUE);
+    OnButtonMove(true);

 }
 
 void CheckListBoxFrame::OnButtonDown(wxCommandEvent& WXUNUSED(event))
 {
 }
 
 void CheckListBoxFrame::OnButtonDown(wxCommandEvent& WXUNUSED(event))
 {

-    OnButtonMove(FALSE);
+    OnButtonMove(false);

 }
 
 void CheckListBoxFrame::OnButtonMove(bool up)
 {
 }
 
 void CheckListBoxFrame::OnButtonMove(bool up)
 {

-    int selection = m_pListBox->GetSelection();
-    if ( selection != -1 )
+    int selection = -1;
+    if(m_pListBox->GetWindowStyle() & wxLB_EXTENDED)
+    {
+        wxArrayInt list;
+        m_pListBox->GetSelections(list);
+        if(list.Count()==1)
+        {
+            selection = list.Item(0);
+        }
+    }
+    else
+    {
+        selection = m_pListBox->GetSelection();
+    }
+    if ( selection != wxNOT_FOUND )

     {
         wxString label = m_pListBox->GetString(selection);
 
         int positionNew = up ? selection - 1 : selection + 2;
     {
         wxString label = m_pListBox->GetString(selection);
 
         int positionNew = up ? selection - 1 : selection + 2;

-        if ( positionNew < 0 || positionNew > m_pListBox->GetCount() )
+        if ( positionNew < 0 || positionNew > (int)m_pListBox->GetCount() )

         {
             wxLogStatus(this, wxT("Can't move this item %s"), up ? wxT("up") : wxT("down"));
         }
         {
             wxLogStatus(this, wxT("Can't move this item %s"), up ? wxT("up") : wxT("down"));
         }


@@ -269,6 +518,7 @@ void CheckListBoxFrame::OnButtonMove(bool up)
             int selectionNew = up ? positionNew : positionNew - 1;
             m_pListBox->Check(selectionNew, wasChecked);
             m_pListBox->SetSelection(selectionNew);
             int selectionNew = up ? positionNew : positionNew - 1;
             m_pListBox->Check(selectionNew, wasChecked);
             m_pListBox->SetSelection(selectionNew);

+            m_pListBox->SetFocus();

 
             AdjustColour(selection);
             AdjustColour(selectionNew);
 
             AdjustColour(selection);
             AdjustColour(selectionNew);


@@ -278,16 +528,20 @@ void CheckListBoxFrame::OnButtonMove(bool up)
     }
     else
     {
     }
     else
     {

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

     }
 }
 
     }
 }
 

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

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

-    // not implemented in other ports yet
-#ifdef __WXMSW__

     // 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));

-#endif // wxMSW

 }
 }

+#else
+void CheckListBoxFrame::AdjustColour(size_t WXUNUSED(index))
+{
+}
+#endif // wxMSW