compate charset names case-insensitively in GetEncodingFromName()

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

diff --git a/samples/listbox/lboxtest.cpp b/samples/listbox/lboxtest.cpp
index 85e68327519f857cac5d08802d9b521e00119a30..8f92c1920a46b2b74f9863058c72aadbdd618967 100644 (file)
--- a/samples/listbox/lboxtest.cpp
+++ b/samples/listbox/lboxtest.cpp
@@ -20,11 +20,6 @@
 // declarations
 // ============================================================================
 
 // declarations
 // ============================================================================
 

-#ifdef __GNUG__
-    #pragma implementation "lboxtest.cpp"
-    #pragma interface "lboxtest.cpp"
-#endif
-

 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------


@@ -38,6 +33,7 @@
 
 // for all others, include the necessary headers
 #ifndef WX_PRECOMP
 
 // for all others, include the necessary headers
 #ifndef WX_PRECOMP

+    #include "wx/wx.h"

     #include "wx/app.h"
     #include "wx/frame.h"
     #include "wx/dcclient.h"
     #include "wx/app.h"
     #include "wx/frame.h"
     #include "wx/dcclient.h"


@@ -73,7 +69,9 @@ enum
     LboxTest_AddSeveral,
     LboxTest_AddMany,
     LboxTest_Clear,
     LboxTest_AddSeveral,
     LboxTest_AddMany,
     LboxTest_Clear,

+#if wxUSE_LOG

     LboxTest_ClearLog,
     LboxTest_ClearLog,

+#endif // wxUSE_LOG

     LboxTest_Change,
     LboxTest_ChangeText,
     LboxTest_Delete,
     LboxTest_Change,
     LboxTest_ChangeText,
     LboxTest_Delete,


@@ -116,7 +114,9 @@ protected:
     void OnButtonDelete(wxCommandEvent& event);
     void OnButtonDeleteSel(wxCommandEvent& event);
     void OnButtonClear(wxCommandEvent& event);
     void OnButtonDelete(wxCommandEvent& event);
     void OnButtonDeleteSel(wxCommandEvent& event);
     void OnButtonClear(wxCommandEvent& event);

+#if wxUSE_LOG

     void OnButtonClearLog(wxCommandEvent& event);
     void OnButtonClearLog(wxCommandEvent& event);

+#endif // wxUSE_LOG

     void OnButtonAdd(wxCommandEvent& event);
     void OnButtonAddSeveral(wxCommandEvent& event);
     void OnButtonAddMany(wxCommandEvent& event);
     void OnButtonAdd(wxCommandEvent& event);
     void OnButtonAddSeveral(wxCommandEvent& event);
     void OnButtonAddMany(wxCommandEvent& event);


@@ -175,8 +175,10 @@ protected:
     wxListBox *m_lbox;
     wxSizer *m_sizerLbox;
 
     wxListBox *m_lbox;
     wxSizer *m_sizerLbox;
 

+#if wxUSE_LOG

     // the listbox for logging messages
     wxListBox *m_lboxLog;
     // the listbox for logging messages
     wxListBox *m_lboxLog;

+#endif // wxUSE_LOG

 
     // the text entries for "Add/change string" and "Delete" buttons
     wxTextCtrl *m_textAdd,
 
     // the text entries for "Add/change string" and "Delete" buttons
     wxTextCtrl *m_textAdd,


@@ -184,13 +186,16 @@ protected:
                *m_textDelete;
 
 private:
                *m_textDelete;
 
 private:

+#if wxUSE_LOG

     // the log target we use to redirect messages to the listbox
     wxLog *m_logTarget;
     // the log target we use to redirect messages to the listbox
     wxLog *m_logTarget;

+#endif // wxUSE_LOG

 
 

-    // any class wishing to process wxWindows events must use this macro
+    // any class wishing to process wxWidgets events must use this macro

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 

+#if wxUSE_LOG

 // A log target which just redirects the messages to a listbox
 class LboxLogger : public wxLog
 {
 // A log target which just redirects the messages to a listbox
 class LboxLogger : public wxLog
 {


@@ -227,7 +232,7 @@ private:
         }
     }
 
         }
     }
 

-    virtual void DoLogString(const wxChar *szString, time_t t)
+    virtual void DoLogString(const wxChar *szString, time_t WXUNUSED(t))

     {
         wxString msg;
         TimeStamp(&msg);
     {
         wxString msg;
         TimeStamp(&msg);


@@ -250,6 +255,7 @@ private:
     // the old log target
     wxLog *m_logOld;
 };
     // the old log target
     wxLog *m_logOld;
 };

+#endif // wxUSE_LOG

 
 // ----------------------------------------------------------------------------
 // misc macros
 
 // ----------------------------------------------------------------------------
 // misc macros


@@ -257,11 +263,6 @@ private:
 
 IMPLEMENT_APP(LboxTestApp)
 
 
 IMPLEMENT_APP(LboxTestApp)
 

-#ifdef __WXUNIVERSAL__
-    WX_USE_THEME(win32);
-    WX_USE_THEME(gtk);
-#endif // __WXUNIVERSAL__
-

 // ----------------------------------------------------------------------------
 // event tables
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // event tables
 // ----------------------------------------------------------------------------


@@ -273,7 +274,9 @@ BEGIN_EVENT_TABLE(LboxTestFrame, wxFrame)
     EVT_BUTTON(LboxTest_Delete, LboxTestFrame::OnButtonDelete)
     EVT_BUTTON(LboxTest_DeleteSel, LboxTestFrame::OnButtonDeleteSel)
     EVT_BUTTON(LboxTest_Clear, LboxTestFrame::OnButtonClear)
     EVT_BUTTON(LboxTest_Delete, LboxTestFrame::OnButtonDelete)
     EVT_BUTTON(LboxTest_DeleteSel, LboxTestFrame::OnButtonDeleteSel)
     EVT_BUTTON(LboxTest_Clear, LboxTestFrame::OnButtonClear)

+#if wxUSE_LOG

     EVT_BUTTON(LboxTest_ClearLog, LboxTestFrame::OnButtonClearLog)
     EVT_BUTTON(LboxTest_ClearLog, LboxTestFrame::OnButtonClearLog)

+#endif // wxUSE_LOG

     EVT_BUTTON(LboxTest_Add, LboxTestFrame::OnButtonAdd)
     EVT_BUTTON(LboxTest_AddSeveral, LboxTestFrame::OnButtonAddSeveral)
     EVT_BUTTON(LboxTest_AddMany, LboxTestFrame::OnButtonAddMany)
     EVT_BUTTON(LboxTest_Add, LboxTestFrame::OnButtonAdd)
     EVT_BUTTON(LboxTest_AddSeveral, LboxTestFrame::OnButtonAddSeveral)
     EVT_BUTTON(LboxTest_AddMany, LboxTestFrame::OnButtonAddMany)


@@ -294,9 +297,9 @@ BEGIN_EVENT_TABLE(LboxTestFrame, wxFrame)
     EVT_UPDATE_UI(LboxTest_DeleteSel, LboxTestFrame::OnUpdateUIDeleteSelButton)
 
     EVT_LISTBOX(LboxTest_Listbox, LboxTestFrame::OnListbox)
     EVT_UPDATE_UI(LboxTest_DeleteSel, LboxTestFrame::OnUpdateUIDeleteSelButton)
 
     EVT_LISTBOX(LboxTest_Listbox, LboxTestFrame::OnListbox)

-    EVT_LISTBOX_DCLICK(-1, LboxTestFrame::OnListboxDClick)
-    EVT_CHECKBOX(-1, LboxTestFrame::OnCheckOrRadioBox)
-    EVT_RADIOBOX(-1, LboxTestFrame::OnCheckOrRadioBox)
+    EVT_LISTBOX_DCLICK(wxID_ANY, LboxTestFrame::OnListboxDClick)
+    EVT_CHECKBOX(wxID_ANY, LboxTestFrame::OnCheckOrRadioBox)
+    EVT_RADIOBOX(wxID_ANY, LboxTestFrame::OnCheckOrRadioBox)

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


@@ -312,10 +315,12 @@ bool LboxTestApp::OnInit()
     wxFrame *frame = new LboxTestFrame(_T("wxListBox sample"));
     frame->Show();
 
     wxFrame *frame = new LboxTestFrame(_T("wxListBox sample"));
     frame->Show();
 

+#if wxUSE_LOG

     //wxLog::AddTraceMask(_T("listbox"));
     wxLog::AddTraceMask(_T("scrollbar"));
     //wxLog::AddTraceMask(_T("listbox"));
     wxLog::AddTraceMask(_T("scrollbar"));

+#endif // wxUSE_LOG

 
 

-    return TRUE;
+    return true;

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


@@ -323,23 +328,27 @@ bool LboxTestApp::OnInit()
 // ----------------------------------------------------------------------------
 
 LboxTestFrame::LboxTestFrame(const wxString& title)
 // ----------------------------------------------------------------------------
 
 LboxTestFrame::LboxTestFrame(const wxString& title)

-             : wxFrame(NULL, -1, title, wxPoint(100, 100))
+             : wxFrame(NULL, wxID_ANY, title, wxPoint(100, 100))

 {
     // init everything
 {
     // init everything

-    m_dirty = FALSE;
+    m_dirty = false;

     m_radioSelMode = (wxRadioBox *)NULL;
 
     m_chkVScroll =
     m_chkHScroll =
     m_chkSort = (wxCheckBox *)NULL;
 
     m_radioSelMode = (wxRadioBox *)NULL;
 
     m_chkVScroll =
     m_chkHScroll =
     m_chkSort = (wxCheckBox *)NULL;
 

-    m_lbox =
+    m_lbox = (wxListBox *)NULL;
+#if wxUSE_LOG

     m_lboxLog = (wxListBox *)NULL;
     m_lboxLog = (wxListBox *)NULL;

+#endif // wxUSE_LOG

     m_sizerLbox = (wxSizer *)NULL;
 
     m_sizerLbox = (wxSizer *)NULL;
 

+#if wxUSE_LOG

     m_logTarget = (wxLog *)NULL;
     m_logTarget = (wxLog *)NULL;

+#endif // wxUSE_LOG

 
 

-    wxPanel *panel = new wxPanel(this, -1);
+    wxPanel *panel = new wxPanel(this, wxID_ANY);

 
     /*
        What we create here is a frame having 3 panes: the explanatory pane to
 
     /*
        What we create here is a frame having 3 panes: the explanatory pane to


@@ -360,15 +369,15 @@ LboxTestFrame::LboxTestFrame(const wxString& title)
         _T("multiple"),
     };
 
         _T("multiple"),
     };
 

-    wxStaticBox *box = new wxStaticBox(panel, -1, _T("&Set listbox parameters"));
-    m_radioSelMode = new wxRadioBox(panel, -1, _T("Selection &mode:"),
+    wxStaticBox *box = new wxStaticBox(panel, wxID_ANY, _T("&Set listbox parameters"));
+    m_radioSelMode = new wxRadioBox(panel, wxID_ANY, _T("Selection &mode:"),

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

-    m_chkVScroll = new wxCheckBox(panel, -1, _T("Always show &vertical scrollbar"));
-    m_chkHScroll = new wxCheckBox(panel, -1, _T("Show &horizontal scrollbar"));
-    m_chkSort = new wxCheckBox(panel, -1, _T("&Sort items"));
+    m_chkVScroll = new wxCheckBox(panel, wxID_ANY, _T("Always show &vertical scrollbar"));
+    m_chkHScroll = new wxCheckBox(panel, wxID_ANY, _T("Show &horizontal scrollbar"));
+    m_chkSort = new wxCheckBox(panel, wxID_ANY, _T("&Sort items"));

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


@@ -386,7 +395,7 @@ LboxTestFrame::LboxTestFrame(const wxString& title)
     sizerLeft->Add(sizerBtn, 0, wxALIGN_CENTRE_HORIZONTAL | wxALL, 15);
 
     // middle pane
     sizerLeft->Add(sizerBtn, 0, wxALIGN_CENTRE_HORIZONTAL | wxALL, 15);
 
     // middle pane

-    wxStaticBox *box2 = new wxStaticBox(panel, -1, _T("&Change listbox contents"));
+    wxStaticBox *box2 = new wxStaticBox(panel, 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);


@@ -404,14 +413,14 @@ LboxTestFrame::LboxTestFrame(const wxString& title)
 
     sizerRow = new wxBoxSizer(wxHORIZONTAL);
     btn = new wxButton(panel, LboxTest_Change, _T("C&hange current"));
 
     sizerRow = new wxBoxSizer(wxHORIZONTAL);
     btn = new wxButton(panel, LboxTest_Change, _T("C&hange current"));

-    m_textChange = new wxTextCtrl(panel, LboxTest_ChangeText, _T(""));
+    m_textChange = new wxTextCtrl(panel, LboxTest_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(panel, LboxTest_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(panel, LboxTest_Delete, _T("&Delete this item"));

-    m_textDelete = new wxTextCtrl(panel, LboxTest_DeleteText, _T(""));
+    m_textDelete = new wxTextCtrl(panel, LboxTest_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);


@@ -437,17 +446,23 @@ LboxTestFrame::LboxTestFrame(const wxString& title)
     sizerUp->Add(sizerRight, 1, wxGROW | (wxALL & ~wxRIGHT), 10);
 
     // the lower one only has the log listbox and a button to clear it
     sizerUp->Add(sizerRight, 1, wxGROW | (wxALL & ~wxRIGHT), 10);
 
     // the lower one only has the log listbox and a button to clear it

+#if wxUSE_LOG

     wxSizer *sizerDown = new wxStaticBoxSizer
                              (
     wxSizer *sizerDown = new wxStaticBoxSizer
                              (

-                               new wxStaticBox(panel, -1, _T("&Log window")),
+                               new wxStaticBox(panel, wxID_ANY, _T("&Log window")),

                                wxVERTICAL
                              );
                                wxVERTICAL
                              );

-    m_lboxLog = new wxListBox(panel, -1);
+    m_lboxLog = new wxListBox(panel, wxID_ANY);

     sizerDown->Add(m_lboxLog, 1, wxGROW | wxALL, 5);
     sizerDown->Add(m_lboxLog, 1, wxGROW | wxALL, 5);

+#else
+    wxSizer *sizerDown = new wxBoxSizer(wxVERTICAL);
+#endif // wxUSE_LOG

     wxBoxSizer *sizerBtns = new wxBoxSizer(wxHORIZONTAL);
     wxBoxSizer *sizerBtns = new wxBoxSizer(wxHORIZONTAL);

+#if wxUSE_LOG

     btn = new wxButton(panel, LboxTest_ClearLog, _T("Clear &log"));
     sizerBtns->Add(btn);
     sizerBtns->Add(10, 0); // spacer
     btn = new wxButton(panel, LboxTest_ClearLog, _T("Clear &log"));
     sizerBtns->Add(btn);
     sizerBtns->Add(10, 0); // spacer

+#endif // wxUSE_LOG

     btn = new wxButton(panel, LboxTest_Quit, _T("E&xit"));
     sizerBtns->Add(btn);
     sizerDown->Add(sizerBtns, 0, wxALL | wxALIGN_RIGHT, 5);
     btn = new wxButton(panel, LboxTest_Quit, _T("E&xit"));
     sizerBtns->Add(btn);
     sizerDown->Add(sizerBtns, 0, wxALL | wxALIGN_RIGHT, 5);


@@ -459,23 +474,26 @@ LboxTestFrame::LboxTestFrame(const wxString& title)
 
     // final initialization
     Reset();
 
     // final initialization
     Reset();

-    m_dirty = FALSE;
+    m_dirty = false;

 
 

-    panel->SetAutoLayout(TRUE);

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

+#if wxUSE_LOG

     // now that everything is created we can redirect the log messages to the
     // listbox
     m_logTarget = new LboxLogger(m_lboxLog, wxLog::GetActiveTarget());
     wxLog::SetActiveTarget(m_logTarget);
     // now that everything is created we can redirect the log messages to the
     // listbox
     m_logTarget = new LboxLogger(m_lboxLog, wxLog::GetActiveTarget());
     wxLog::SetActiveTarget(m_logTarget);

+#endif // wxUSE_LOG

 }
 
 LboxTestFrame::~LboxTestFrame()
 {
 }
 
 LboxTestFrame::~LboxTestFrame()
 {

+#if wxUSE_LOG

     delete m_logTarget;
     delete m_logTarget;

+#endif // wxUSE_LOG

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


@@ -494,15 +512,16 @@ void LboxTestFrame::Reset()
     }
 
     m_radioSelMode->SetSelection(LboxSel_Single);
     }
 
     m_radioSelMode->SetSelection(LboxSel_Single);

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

 
 

-    m_dirty = TRUE;
+    m_dirty = true;

 }
 
 void LboxTestFrame::CreateLbox()
 {
 }
 
 void LboxTestFrame::CreateLbox()
 {

+    wxWindow *parent = m_lbox->GetParent();

     int flags = 0;
     switch ( m_radioSelMode->GetSelection() )
     {
     int flags = 0;
     switch ( m_radioSelMode->GetSelection() )
     {


@@ -522,19 +541,16 @@ void LboxTestFrame::CreateLbox()
         flags |= wxLB_SORT;
 
     wxArrayString items;
         flags |= wxLB_SORT;
 
     wxArrayString items;

-    if ( m_lbox )
+    int count = m_lbox->GetCount();
+    for ( int n = 0; n < count; n++ )

     {
     {

-        int count = m_lbox->GetCount();
-        for ( int n = 0; n < count; n++ )
-        {
-            items.Add(m_lbox->GetString(n));
-        }
-
-        m_sizerLbox->Remove(m_lbox);
-        delete m_lbox;
+        items.Add(m_lbox->GetString(n));

     }
 
     }
 

-    m_lbox = new wxListBox(this, -1,
+    m_sizerLbox->Detach(m_lbox);
+    delete m_lbox;
+
+    m_lbox = new wxListBox(parent, LboxTest_Listbox,

                            wxDefaultPosition, wxDefaultSize,
                            0, NULL,
                            flags);
                            wxDefaultPosition, wxDefaultSize,
                            0, NULL,
                            flags);


@@ -542,7 +558,7 @@ void LboxTestFrame::CreateLbox()
     m_sizerLbox->Add(m_lbox, 1, wxGROW | wxALL, 5);
     m_sizerLbox->Layout();
 
     m_sizerLbox->Add(m_lbox, 1, wxGROW | wxALL, 5);
     m_sizerLbox->Layout();
 

-    m_dirty = FALSE;
+    m_dirty = false;

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


@@ -597,17 +613,19 @@ void LboxTestFrame::OnButtonDeleteSel(wxCommandEvent& WXUNUSED(event))
     }
 }
 
     }
 }
 

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

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

-void LboxTestFrame::OnButtonClearLog(wxCommandEvent& event)
+#if wxUSE_LOG
+void LboxTestFrame::OnButtonClearLog(wxCommandEvent& WXUNUSED(event))

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

+#endif // wxUSE_LOG

 
 

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

 {
     static size_t s_item = 0;
 
 {
     static size_t s_item = 0;
 


@@ -630,7 +648,7 @@ void LboxTestFrame::OnButtonAddMany(wxCommandEvent& WXUNUSED(event))
     }
 }
 
     }
 }
 

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

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


@@ -670,18 +688,19 @@ void LboxTestFrame::OnUpdateUIAddSeveral(wxUpdateUIEvent& event)
 void LboxTestFrame::OnListbox(wxCommandEvent& event)
 {
     int sel = event.GetInt();
 void LboxTestFrame::OnListbox(wxCommandEvent& event)
 {
     int sel = event.GetInt();

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

 
     wxLogMessage(_T("Listbox item %d selected"), sel);
 }
 
 void LboxTestFrame::OnListboxDClick(wxCommandEvent& event)
 {
 
     wxLogMessage(_T("Listbox item %d selected"), sel);
 }
 
 void LboxTestFrame::OnListboxDClick(wxCommandEvent& event)
 {

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

 }
 
 }
 

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

 {
 {

-    m_dirty = TRUE;
+    m_dirty = true;

 }
 
 }