disable warning about data truncation (810) for icc (this is a useful warning and...

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

diff --git a/samples/htlbox/htlbox.cpp b/samples/htlbox/htlbox.cpp
index 1a87b03df6f7c544cc9363f5b75a8065ff7a887f..419def086c366901d807e35190d8bced58af3968 100644 (file)
--- a/samples/htlbox/htlbox.cpp
+++ b/samples/htlbox/htlbox.cpp
@@ -1,11 +1,11 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        htmllbox.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        htmllbox.cpp

-// Purpose:     HtmlLbox wxWindows sample
+// Purpose:     HtmlLbox wxWidgets sample

 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     31.05.03
 // RCS-ID:      $Id$
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     31.05.03
 // RCS-ID:      $Id$

-// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -37,9 +37,11 @@
     #include "wx/textctrl.h"
 
     #include "wx/dc.h"
     #include "wx/textctrl.h"
 
     #include "wx/dc.h"

+    #include "wx/icon.h"

 #endif
 
 #include "wx/colordlg.h"
 #endif
 
 #include "wx/colordlg.h"

+#include "wx/numdlg.h"

 
 #include "wx/htmllbox.h"
 
 
 #include "wx/htmllbox.h"
 


@@ -50,14 +52,7 @@
     #include "wx/textfile.h"
 #endif
 
     #include "wx/textfile.h"
 #endif
 

-// ----------------------------------------------------------------------------
-// resources
-// ----------------------------------------------------------------------------
-
-// the application icon (under Windows and OS/2 it is in resources)
-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) || defined(__WXX11__)
-    #include "mondrian.xpm"
-#endif
+#include "../sample.xpm"

 
 // ----------------------------------------------------------------------------
 // private classes
 
 // ----------------------------------------------------------------------------
 // private classes


@@ -71,19 +66,32 @@ public:
     MyHtmlListBox(wxWindow *parent, bool multi = false);
 
     void SetChangeSelFg(bool change) { m_change = change; }
     MyHtmlListBox(wxWindow *parent, bool multi = false);
 
     void SetChangeSelFg(bool change) { m_change = change; }

+    void UpdateFirstItem();

 
 protected:
 
 protected:

+    // override this method to return data to be shown in the listbox (this is
+    // mandatory)

     virtual wxString OnGetItem(size_t n) const;
 
     virtual wxString OnGetItem(size_t n) const;
 

-    // change the appearance by overriding these functions
+    // change the appearance by overriding these functions (this is optional)

     virtual void OnDrawSeparator(wxDC& dc, wxRect& rect, size_t n) const;
     virtual wxColour GetSelectedTextColour(const wxColour& colFg) const;
 
     virtual void OnDrawSeparator(wxDC& dc, wxRect& rect, size_t n) const;
     virtual wxColour GetSelectedTextColour(const wxColour& colFg) const;
 

+
+    // flag telling us whether we should use fg colour even for the selected
+    // item

     bool m_change;
 
     bool m_change;
 

+    // flag which we toggle to update the first items text in OnGetItem()
+    bool m_firstItemUpdated;
+
+
+

 #ifdef USE_HTML_FILE
     wxTextFile m_file;
 #endif
 #ifdef USE_HTML_FILE
     wxTextFile m_file;
 #endif

+
+    DECLARE_NO_COPY_CLASS(MyHtmlListBox)

 };
 
 class MyFrame : public wxFrame
 };
 
 class MyFrame : public wxFrame


@@ -100,6 +108,7 @@ public:
     void OnDrawSeparator(wxCommandEvent&) { m_hlbox->RefreshAll(); }
     void OnToggleMulti(wxCommandEvent& event);
     void OnSelectAll(wxCommandEvent& event);
     void OnDrawSeparator(wxCommandEvent&) { m_hlbox->RefreshAll(); }
     void OnToggleMulti(wxCommandEvent& event);
     void OnSelectAll(wxCommandEvent& event);

+    void OnUpdateItem(wxCommandEvent& event);

 
     void OnSetBgCol(wxCommandEvent& event);
     void OnSetSelBgCol(wxCommandEvent& event);
 
     void OnSetBgCol(wxCommandEvent& event);
     void OnSetSelBgCol(wxCommandEvent& event);


@@ -117,14 +126,14 @@ public:
 private:
     MyHtmlListBox *m_hlbox;
 
 private:
     MyHtmlListBox *m_hlbox;
 

-    // 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()
 };
 
 class MyApp : public wxApp
 {
 public:
     DECLARE_EVENT_TABLE()
 };
 
 class MyApp : public wxApp
 {
 public:

-    virtual bool OnInit() { (new MyFrame())->Show(); return TRUE; }
+    virtual bool OnInit() { (new MyFrame())->Show(); return true; }

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -141,6 +150,7 @@ enum
     HtmlLbox_DrawSeparator,
     HtmlLbox_ToggleMulti,
     HtmlLbox_SelectAll,
     HtmlLbox_DrawSeparator,
     HtmlLbox_ToggleMulti,
     HtmlLbox_SelectAll,

+    HtmlLbox_UpdateItem,

 
     HtmlLbox_SetBgCol,
     HtmlLbox_SetSelBgCol,
 
     HtmlLbox_SetBgCol,
     HtmlLbox_SetSelBgCol,


@@ -153,7 +163,7 @@ enum
 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------

-// event tables and other macros for wxWindows
+// event tables and other macros for wxWidgets

 // ----------------------------------------------------------------------------
 
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 // ----------------------------------------------------------------------------
 
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)


@@ -163,6 +173,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(HtmlLbox_DrawSeparator, MyFrame::OnDrawSeparator)
     EVT_MENU(HtmlLbox_ToggleMulti, MyFrame::OnToggleMulti)
     EVT_MENU(HtmlLbox_SelectAll, MyFrame::OnSelectAll)
     EVT_MENU(HtmlLbox_DrawSeparator, MyFrame::OnDrawSeparator)
     EVT_MENU(HtmlLbox_ToggleMulti, MyFrame::OnToggleMulti)
     EVT_MENU(HtmlLbox_SelectAll, MyFrame::OnSelectAll)

+    EVT_MENU(HtmlLbox_UpdateItem, MyFrame::OnUpdateItem)

 
     EVT_MENU(HtmlLbox_About, MyFrame::OnAbout)
 
 
     EVT_MENU(HtmlLbox_About, MyFrame::OnAbout)
 


@@ -189,11 +200,11 @@ IMPLEMENT_APP(MyApp)
 
 // frame constructor
 MyFrame::MyFrame()
 
 // frame constructor
 MyFrame::MyFrame()

-       : wxFrame(NULL, -1, _T("HtmlLbox wxWindows Sample"),
+       : wxFrame(NULL, wxID_ANY, _T("HtmlLbox wxWidgets Sample"),

                  wxDefaultPosition, wxSize(400, 500))
 {
     // set the frame icon
                  wxDefaultPosition, wxSize(400, 500))
 {
     // set the frame icon

-    SetIcon(wxICON(mondrian));
+    SetIcon(wxIcon(sample_xpm));

 
 #if wxUSE_MENUS
     // create a menu bar
 
 #if wxUSE_MENUS
     // create a menu bar


@@ -214,6 +225,7 @@ MyFrame::MyFrame()
                                _T("Toggle multiple selection on/off"));
     menuHLbox->AppendSeparator();
     menuHLbox->Append(HtmlLbox_SelectAll, _T("Select &all items\tCtrl-A"));
                                _T("Toggle multiple selection on/off"));
     menuHLbox->AppendSeparator();
     menuHLbox->Append(HtmlLbox_SelectAll, _T("Select &all items\tCtrl-A"));

+    menuHLbox->Append(HtmlLbox_UpdateItem, _T("Update &first item\tCtrl-U"));

     menuHLbox->AppendSeparator();
     menuHLbox->Append(HtmlLbox_SetBgCol, _T("Set &background...\tCtrl-B"));
     menuHLbox->Append(HtmlLbox_SetSelBgCol,
     menuHLbox->AppendSeparator();
     menuHLbox->Append(HtmlLbox_SetBgCol, _T("Set &background...\tCtrl-B"));
     menuHLbox->Append(HtmlLbox_SetSelBgCol,


@@ -240,12 +252,12 @@ MyFrame::MyFrame()
 #if wxUSE_STATUSBAR
     // create a status bar just for fun (by default with 1 pane only)
     CreateStatusBar(2);
 #if wxUSE_STATUSBAR
     // create a status bar just for fun (by default with 1 pane only)
     CreateStatusBar(2);

-    SetStatusText(_T("Welcome to wxWindows!"));
+    SetStatusText(_T("Welcome to wxWidgets!"));

 #endif // wxUSE_STATUSBAR
 
     // create the child controls
     m_hlbox = new MyHtmlListBox(this);
 #endif // wxUSE_STATUSBAR
 
     // create the child controls
     m_hlbox = new MyHtmlListBox(this);

-    wxTextCtrl *text = new wxTextCtrl(this, -1, _T(""),
+    wxTextCtrl *text = new wxTextCtrl(this, wxID_ANY, _T(""),

                                       wxDefaultPosition, wxDefaultSize,
                                       wxTE_MULTILINE);
     delete wxLog::SetActiveTarget(new wxLogTextCtrl(text));
                                       wxDefaultPosition, wxDefaultSize,
                                       wxTE_MULTILINE);
     delete wxLog::SetActiveTarget(new wxLogTextCtrl(text));


@@ -269,15 +281,15 @@ MyFrame::~MyFrame()
 
 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {

-    // TRUE is to force the frame to close
-    Close(TRUE);
+    // true is to force the frame to close
+    Close(true);

 }
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
     wxMessageBox(_T("This sample shows wxHtmlListBox class.\n")
                  _T("\n")
 }
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
     wxMessageBox(_T("This sample shows wxHtmlListBox class.\n")
                  _T("\n")

-                 _T("© 2003 Vadim Zeitlin"),
+                 _T("(c) 2003 Vadim Zeitlin"),

                  _T("About HtmlLbox"),
                  wxOK | wxICON_INFORMATION,
                  this);
                  _T("About HtmlLbox"),
                  wxOK | wxICON_INFORMATION,
                  this);


@@ -324,6 +336,11 @@ void MyFrame::OnUpdateUISelectAll(wxUpdateUIEvent& event)
     event.Enable( m_hlbox && m_hlbox->HasMultipleSelection() );
 }
 
     event.Enable( m_hlbox && m_hlbox->HasMultipleSelection() );
 }
 

+void MyFrame::OnUpdateItem(wxCommandEvent& WXUNUSED(event))
+{
+    m_hlbox->UpdateFirstItem();
+}
+

 void MyFrame::OnSetBgCol(wxCommandEvent& WXUNUSED(event))
 {
     wxColour col = wxGetColourFromUser(this, m_hlbox->GetBackgroundColour());
 void MyFrame::OnSetBgCol(wxCommandEvent& WXUNUSED(event))
 {
     wxColour col = wxGetColourFromUser(this, m_hlbox->GetBackgroundColour());


@@ -332,7 +349,9 @@ void MyFrame::OnSetBgCol(wxCommandEvent& WXUNUSED(event))
         m_hlbox->SetBackgroundColour(col);
         m_hlbox->Refresh();
 
         m_hlbox->SetBackgroundColour(col);
         m_hlbox->Refresh();
 

+#if wxUSE_STATUSBAR

         SetStatusText(_T("Background colour changed."));
         SetStatusText(_T("Background colour changed."));

+#endif // wxUSE_STATUSBAR

     }
 }
 
     }
 }
 


@@ -344,7 +363,9 @@ void MyFrame::OnSetSelBgCol(wxCommandEvent& WXUNUSED(event))
         m_hlbox->SetSelectionBackground(col);
         m_hlbox->Refresh();
 
         m_hlbox->SetSelectionBackground(col);
         m_hlbox->Refresh();
 

+#if wxUSE_STATUSBAR

         SetStatusText(_T("Selection background colour changed."));
         SetStatusText(_T("Selection background colour changed."));

+#endif // wxUSE_STATUSBAR

     }
 }
 
     }
 }
 


@@ -384,10 +405,12 @@ void MyFrame::OnLboxSelect(wxCommandEvent& event)
             wxLogMessage(_T("Selected items: %s"), s.c_str());
     }
 
             wxLogMessage(_T("Selected items: %s"), s.c_str());
     }
 

+#if wxUSE_STATUSBAR

     SetStatusText(wxString::Format(
                     _T("# items selected = %lu"),
                     (unsigned long)m_hlbox->GetSelectedCount()
                   ));
     SetStatusText(wxString::Format(
                     _T("# items selected = %lu"),
                     (unsigned long)m_hlbox->GetSelectedCount()
                   ));

+#endif // wxUSE_STATUSBAR

 }
 
 // ============================================================================
 }
 
 // ============================================================================


@@ -395,17 +418,19 @@ void MyFrame::OnLboxSelect(wxCommandEvent& event)
 // ============================================================================
 
 MyHtmlListBox::MyHtmlListBox(wxWindow *parent, bool multi)
 // ============================================================================
 
 MyHtmlListBox::MyHtmlListBox(wxWindow *parent, bool multi)

-             : wxHtmlListBox(parent, -1, wxDefaultPosition, wxDefaultSize,
+             : wxHtmlListBox(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize,

                              multi ? wxLB_MULTIPLE : 0)
 {
     m_change = true;
                              multi ? wxLB_MULTIPLE : 0)
 {
     m_change = true;

+    m_firstItemUpdated = false;
+

 
     SetMargins(5, 5);
 
 #ifdef USE_HTML_FILE
 
     SetMargins(5, 5);
 
 #ifdef USE_HTML_FILE

-    if ( !m_file.Open("results") )
+    if ( !m_file.Open(_T("results")) )

     {
     {

-        wxLogError("Failed to open results file");
+        wxLogError(_T("Failed to open results file"));

     }
     else
     {
     }
     else
     {


@@ -431,6 +456,11 @@ void MyHtmlListBox::OnDrawSeparator(wxDC& dc, wxRect& rect, size_t) const
 
 wxString MyHtmlListBox::OnGetItem(size_t n) const
 {
 
 wxString MyHtmlListBox::OnGetItem(size_t n) const
 {

+    if ( !n && m_firstItemUpdated )
+    {
+        return wxString::Format(_T("<h1><b>Just updated</b></h1>"));
+    }
+

 #ifdef USE_HTML_FILE
     wxString s;
     if ( m_file.IsOpened() )
 #ifdef USE_HTML_FILE
     wxString s;
     if ( m_file.IsOpened() )


@@ -443,9 +473,9 @@ wxString MyHtmlListBox::OnGetItem(size_t n) const
                             _T("Item</font> <b>%lu</b>")
                             _T("</h%d>"),
                             level,
                             _T("Item</font> <b>%lu</b>")
                             _T("</h%d>"),
                             level,

-                            abs(n - 192) % 256,
-                            abs(n - 256) % 256,
-                            abs(n - 128) % 256,
+                            abs((int)n - 192) % 256,
+                            abs((int)n - 256) % 256,
+                            abs((int)n - 128) % 256,

                             (unsigned long)n, level);
 #endif
 }
                             (unsigned long)n, level);
 #endif
 }


@@ -455,3 +485,10 @@ wxColour MyHtmlListBox::GetSelectedTextColour(const wxColour& colFg) const
     return m_change ? wxHtmlListBox::GetSelectedTextColour(colFg) : colFg;
 }
 
     return m_change ? wxHtmlListBox::GetSelectedTextColour(colFg) : colFg;
 }
 

+void MyHtmlListBox::UpdateFirstItem()
+{
+    m_firstItemUpdated = !m_firstItemUpdated;
+
+    RefreshLine(0);
+}
+