(should) fix unix compilation...

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

diff --git a/samples/widgets/listbox.cpp b/samples/widgets/listbox.cpp
index dc145a775710b177e14d1c1ed9321b6a6d94ef7d..fa373865323505e84bee4a43e88f177de320883c 100644 (file)
--- a/samples/widgets/listbox.cpp
+++ b/samples/widgets/listbox.cpp
@@ -28,6 +28,7 @@
 #ifndef WX_PRECOMP
     #include "wx/log.h"
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"
 

+    #include "wx/bitmap.h"

     #include "wx/button.h"
     #include "wx/checkbox.h"
     #include "wx/combobox.h"
     #include "wx/button.h"
     #include "wx/checkbox.h"
     #include "wx/combobox.h"


@@ -178,8 +179,8 @@ BEGIN_EVENT_TABLE(ListboxWidgetsPage, WidgetsPage)
     EVT_LISTBOX_DCLICK(ListboxPage_Listbox, ListboxWidgetsPage::OnListboxDClick)
     EVT_CHECKLISTBOX(ListboxPage_Listbox, ListboxWidgetsPage::OnCheckListbox)
 
     EVT_LISTBOX_DCLICK(ListboxPage_Listbox, ListboxWidgetsPage::OnListboxDClick)
     EVT_CHECKLISTBOX(ListboxPage_Listbox, ListboxWidgetsPage::OnCheckListbox)
 

-    EVT_CHECKBOX(-1, ListboxWidgetsPage::OnCheckOrRadioBox)
-    EVT_RADIOBOX(-1, ListboxWidgetsPage::OnCheckOrRadioBox)
+    EVT_CHECKBOX(wxID_ANY, ListboxWidgetsPage::OnCheckOrRadioBox)
+    EVT_RADIOBOX(wxID_ANY, ListboxWidgetsPage::OnCheckOrRadioBox)

 END_EVENT_TABLE()
 
 // ============================================================================
 END_EVENT_TABLE()
 
 // ============================================================================


@@ -214,7 +215,8 @@ ListboxWidgetsPage::ListboxWidgetsPage(wxNotebook *notebook,
     wxSizer *sizerTop = new wxBoxSizer(wxHORIZONTAL);
 
     // left pane
     wxSizer *sizerTop = new wxBoxSizer(wxHORIZONTAL);
 
     // left pane

-    wxStaticBox *box = new wxStaticBox(this, -1, _T("&Set listbox parameters"));
+    wxStaticBox *box = new wxStaticBox(this, wxID_ANY,
+        _T("&Set listbox parameters"));

     wxSizer *sizerLeft = new wxStaticBoxSizer(box, wxVERTICAL);
 
     static const wxString modes[] =
     wxSizer *sizerLeft = new wxStaticBoxSizer(box, wxVERTICAL);
 
     static const wxString modes[] =


@@ -224,7 +226,7 @@ ListboxWidgetsPage::ListboxWidgetsPage(wxNotebook *notebook,
         _T("multiple"),
     };
 
         _T("multiple"),
     };
 

-    m_radioSelMode = new wxRadioBox(this, -1, _T("Selection &mode:"),
+    m_radioSelMode = new wxRadioBox(this, wxID_ANY, _T("Selection &mode:"),

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


@@ -249,7 +251,8 @@ ListboxWidgetsPage::ListboxWidgetsPage(wxNotebook *notebook,
     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, -1, _T("&Change listbox contents"));
+    wxStaticBox *box2 = new wxStaticBox(this, wxID_ANY,
+        _T("&Change listbox contents"));

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


@@ -267,14 +270,14 @@ ListboxWidgetsPage::ListboxWidgetsPage(wxNotebook *notebook,
 
     sizerRow = new wxBoxSizer(wxHORIZONTAL);
     btn = new wxButton(this, ListboxPage_Change, _T("C&hange current"));
 
     sizerRow = new wxBoxSizer(wxHORIZONTAL);
     btn = new wxButton(this, ListboxPage_Change, _T("C&hange current"));

-    m_textChange = new wxTextCtrl(this, ListboxPage_ChangeText, _T(""));
+    m_textChange = new wxTextCtrl(this, ListboxPage_ChangeText, wxEmptyString);

     sizerRow->Add(btn, 0, wxRIGHT, 5);
     sizerRow->Add(m_textChange, 1, wxLEFT, 5);
     sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5);
 
     sizerRow = new wxBoxSizer(wxHORIZONTAL);
     btn = new wxButton(this, ListboxPage_Delete, _T("&Delete this item"));
     sizerRow->Add(btn, 0, wxRIGHT, 5);
     sizerRow->Add(m_textChange, 1, wxLEFT, 5);
     sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5);
 
     sizerRow = new wxBoxSizer(wxHORIZONTAL);
     btn = new wxButton(this, ListboxPage_Delete, _T("&Delete this item"));

-    m_textDelete = new wxTextCtrl(this, ListboxPage_DeleteText, _T(""));
+    m_textDelete = new wxTextCtrl(this, ListboxPage_DeleteText, wxEmptyString);

     sizerRow->Add(btn, 0, wxRIGHT, 5);
     sizerRow->Add(m_textDelete, 1, wxLEFT, 5);
     sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5);
     sizerRow->Add(btn, 0, wxRIGHT, 5);
     sizerRow->Add(m_textDelete, 1, wxLEFT, 5);
     sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5);


@@ -303,7 +306,6 @@ ListboxWidgetsPage::ListboxWidgetsPage(wxNotebook *notebook,
     // final initializations
     Reset();
 
     // final initializations
     Reset();
 

-    SetAutoLayout(TRUE);

     SetSizer(sizerTop);
 
     sizerTop->Fit(this);
     SetSizer(sizerTop);
 
     sizerTop->Fit(this);


@@ -316,10 +318,10 @@ ListboxWidgetsPage::ListboxWidgetsPage(wxNotebook *notebook,
 void ListboxWidgetsPage::Reset()
 {
     m_radioSelMode->SetSelection(LboxSel_Single);
 void ListboxWidgetsPage::Reset()
 {
     m_radioSelMode->SetSelection(LboxSel_Single);

-    m_chkSort->SetValue(FALSE);
-    m_chkCheck->SetValue(FALSE);
-    m_chkHScroll->SetValue(TRUE);
-    m_chkVScroll->SetValue(FALSE);
+    m_chkSort->SetValue(false);
+    m_chkCheck->SetValue(false);
+    m_chkHScroll->SetValue(true);
+    m_chkVScroll->SetValue(false);

 }
 
 void ListboxWidgetsPage::CreateLbox()
 }
 
 void ListboxWidgetsPage::CreateLbox()


@@ -351,7 +353,7 @@ void ListboxWidgetsPage::CreateLbox()
             items.Add(m_lbox->GetString(n));
         }
 
             items.Add(m_lbox->GetString(n));
         }
 

-        m_sizerLbox->Remove(m_lbox);
+        m_sizerLbox->Detach( m_lbox );

         delete m_lbox;
     }
 
         delete m_lbox;
     }
 


@@ -421,14 +423,14 @@ void ListboxWidgetsPage::OnButtonDeleteSel(wxCommandEvent& WXUNUSED(event))
     }
 }
 
     }
 }
 

-void ListboxWidgetsPage::OnButtonClear(wxCommandEvent& event)
+void ListboxWidgetsPage::OnButtonClear(wxCommandEvent& WXUNUSED(event))

 {
     m_lbox->Clear();
 }
 
 {
     m_lbox->Clear();
 }
 

-void ListboxWidgetsPage::OnButtonAdd(wxCommandEvent& event)
+void ListboxWidgetsPage::OnButtonAdd(wxCommandEvent& WXUNUSED(event))

 {
 {

-    static size_t s_item = 0;
+    static unsigned int s_item = 0;

 
     wxString s = m_textAdd->GetValue();
     if ( !m_textAdd->IsModified() )
 
     wxString s = m_textAdd->GetValue();
     if ( !m_textAdd->IsModified() )


@@ -443,13 +445,13 @@ void ListboxWidgetsPage::OnButtonAdd(wxCommandEvent& event)
 void ListboxWidgetsPage::OnButtonAddMany(wxCommandEvent& WXUNUSED(event))
 {
     // "many" means 1000 here
 void ListboxWidgetsPage::OnButtonAddMany(wxCommandEvent& WXUNUSED(event))
 {
     // "many" means 1000 here

-    for ( size_t n = 0; n < 1000; n++ )
+    for ( unsigned int n = 0; n < 1000; n++ )

     {
         m_lbox->Append(wxString::Format(_T("item #%u"), n));
     }
 }
 
     {
         m_lbox->Append(wxString::Format(_T("item #%u"), n));
     }
 }
 

-void ListboxWidgetsPage::OnButtonAddSeveral(wxCommandEvent& event)
+void ListboxWidgetsPage::OnButtonAddSeveral(wxCommandEvent& WXUNUSED(event))

 {
     wxArrayString items;
     items.Add(_T("First"));
 {
     wxArrayString items;
     items.Add(_T("First"));


@@ -491,25 +493,25 @@ void ListboxWidgetsPage::OnUpdateUIAddSeveral(wxUpdateUIEvent& event)
 
 void ListboxWidgetsPage::OnListbox(wxCommandEvent& event)
 {
 
 void ListboxWidgetsPage::OnListbox(wxCommandEvent& event)
 {

-    int sel = event.GetInt();
+    long sel = event.GetInt();

     m_textDelete->SetValue(wxString::Format(_T("%ld"), sel));
 
     m_textDelete->SetValue(wxString::Format(_T("%ld"), sel));
 

-    wxLogMessage(_T("Listbox item %d selected"), sel);
+    wxLogMessage(_T("Listbox item %ld selected"), sel);

 }
 
 void ListboxWidgetsPage::OnListboxDClick(wxCommandEvent& event)
 {
 }
 
 void ListboxWidgetsPage::OnListboxDClick(wxCommandEvent& event)
 {

-    wxLogMessage(_T("Listbox item %d double clicked"), event.GetInt());
+    wxLogMessage( _T("Listbox item %ld double clicked"), event.GetInt() );

 }
 
 void ListboxWidgetsPage::OnCheckListbox(wxCommandEvent& event)
 {
 }
 
 void ListboxWidgetsPage::OnCheckListbox(wxCommandEvent& event)
 {

-    wxLogMessage(_T("Listbox item %d toggled"), event.GetInt());
+    wxLogMessage( _T("Listbox item %ld toggled"), event.GetInt() );

 }
 
 }
 

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

 {
     CreateLbox();
 }
 
 {
     CreateLbox();
 }
 

-#endif
\ No newline at end of file
+#endif