Use SYSTEMTIME instead of DOS time when converting to/from VARIANTS.

[wxWidgets.git] / src / html / htmlwin.cpp

diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp
index 058804ae6d00824fe7730c47c2c16502cda5a356..8fedf6c9992b44812f81037e31d592039e661525 100644 (file)
--- a/src/html/htmlwin.cpp
+++ b/src/html/htmlwin.cpp
@@ -247,7 +247,7 @@ bool wxHtmlWindowMouseHelper::OnCellClicked(wxHtmlCell *cell,
     {
         // if the event wasn't handled, do the default processing here:
 
     {
         // if the event wasn't handled, do the default processing here:
 

-        wxASSERT_MSG( cell, _T("can't be called with NULL cell") );
+        wxASSERT_MSG( cell, wxT("can't be called with NULL cell") );

 
         cell->ProcessMouseClick(m_interface, ev.GetPoint(), ev.GetMouseEvent());
     }
 
         cell->ProcessMouseClick(m_interface, ev.GetPoint(), ev.GetMouseEvent());
     }


@@ -467,11 +467,8 @@ bool wxHtmlWindow::DoSetPage(const wxString& source)
     SetBackgroundImage(wxNullBitmap);
 
     m_Parser->SetDC(dc);
     SetBackgroundImage(wxNullBitmap);
 
     m_Parser->SetDC(dc);

-    if (m_Cell)
-    {
-        delete m_Cell;
-        m_Cell = NULL;
-    }
+
+    delete m_Cell;

     m_Cell = (wxHtmlContainerCell*) m_Parser->Parse(newsrc);
     delete dc;
     m_Cell->SetIndent(m_Borders, wxHTML_INDENT_ALL, wxHTML_UNITS_PIXELS);
     m_Cell = (wxHtmlContainerCell*) m_Parser->Parse(newsrc);
     delete dc;
     m_Cell->SetIndent(m_Borders, wxHTML_INDENT_ALL, wxHTML_UNITS_PIXELS);


@@ -964,7 +961,7 @@ bool wxHtmlWindow::CopySelection(ClipboardType t)
             const wxString txt(SelectionToText());
             wxTheClipboard->SetData(new wxTextDataObject(txt));
             wxTheClipboard->Close();
             const wxString txt(SelectionToText());
             wxTheClipboard->SetData(new wxTextDataObject(txt));
             wxTheClipboard->Close();

-            wxLogTrace(_T("wxhtmlselection"),
+            wxLogTrace(wxT("wxhtmlselection"),

                        _("Copied to clipboard:\"%s\""), txt.c_str());
 
             return true;
                        _("Copied to clipboard:\"%s\""), txt.c_str());
 
             return true;


@@ -1403,7 +1400,7 @@ void wxHtmlWindow::OnMouseLeave(wxMouseEvent& event)
                 // but seems to happen sometimes under wxMSW - maybe it's a bug
                 // there but for now just ignore it
 
                 // but seems to happen sometimes under wxMSW - maybe it's a bug
                 // there but for now just ignore it
 

-                //wxFAIL_MSG( _T("can't understand where has mouse gone") );
+                //wxFAIL_MSG( wxT("can't understand where has mouse gone") );

 
                 return;
             }
 
                 return;
             }