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 6cf0461b8d1101cce431bf3d38c42cfd10531b07..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
 // ----------------------------------------------------------------------------


@@ -74,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,


@@ -117,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);


@@ -176,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,


@@ -185,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 wxWidgets events must use this macro
     DECLARE_EVENT_TABLE()
 };
 
 
     // any class wishing to process wxWidgets events must use this macro
     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
 {


@@ -251,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


@@ -269,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)


@@ -308,8 +315,10 @@ 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;
 }


@@ -329,11 +338,15 @@ LboxTestFrame::LboxTestFrame(const wxString& title)
     m_chkHScroll =
     m_chkSort = (wxCheckBox *)NULL;
 
     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, wxID_ANY);
 
 
     wxPanel *panel = new wxPanel(this, wxID_ANY);
 


@@ -433,6 +446,7 @@ 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
                              (
                                new wxStaticBox(panel, wxID_ANY, _T("&Log window")),
     wxSizer *sizerDown = new wxStaticBoxSizer
                              (
                                new wxStaticBox(panel, wxID_ANY, _T("&Log window")),


@@ -440,10 +454,15 @@ LboxTestFrame::LboxTestFrame(const wxString& title)
                              );
     m_lboxLog = new wxListBox(panel, wxID_ANY);
     sizerDown->Add(m_lboxLog, 1, wxGROW | wxALL, 5);
                              );
     m_lboxLog = new wxListBox(panel, wxID_ANY);
     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);


@@ -462,15 +481,19 @@ LboxTestFrame::LboxTestFrame(const wxString& title)
     sizerTop->Fit(this);
     sizerTop->SetSizeHints(this);
 
     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

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


@@ -498,6 +521,7 @@ void LboxTestFrame::Reset()
 
 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() )
     {


@@ -517,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->Detach(m_lbox);
-        delete m_lbox;
+        items.Add(m_lbox->GetString(n));

     }
 
     }
 

-    m_lbox = new wxListBox(this, wxID_ANY,
+    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);


@@ -597,10 +618,12 @@ void LboxTestFrame::OnButtonClear(wxCommandEvent& WXUNUSED(event))
     m_lbox->Clear();
 }
 
     m_lbox->Clear();
 }
 

+#if wxUSE_LOG

 void LboxTestFrame::OnButtonClearLog(wxCommandEvent& WXUNUSED(event))
 {
     m_lboxLog->Clear();
 }
 void LboxTestFrame::OnButtonClearLog(wxCommandEvent& WXUNUSED(event))
 {
     m_lboxLog->Clear();
 }

+#endif // wxUSE_LOG

 
 void LboxTestFrame::OnButtonAdd(wxCommandEvent& WXUNUSED(event))
 {
 
 void LboxTestFrame::OnButtonAdd(wxCommandEvent& WXUNUSED(event))
 {