Added wxDataViewColumn

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

diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp
index a1f8c33629daf9988083309acd2d0c81af8759e1..7654b4b86282455c5365a3c213c075e3f556127b 100644 (file)
--- a/src/html/htmlwin.cpp
+++ b/src/html/htmlwin.cpp
@@ -135,10 +135,10 @@ private:
 //-----------------------------------------------------------------------------
 
 WX_DECLARE_OBJARRAY(wxHtmlHistoryItem, wxHtmlHistoryArray);
 //-----------------------------------------------------------------------------
 
 WX_DECLARE_OBJARRAY(wxHtmlHistoryItem, wxHtmlHistoryArray);

-WX_DEFINE_OBJARRAY(wxHtmlHistoryArray);
+WX_DEFINE_OBJARRAY(wxHtmlHistoryArray)

 
 WX_DECLARE_LIST(wxHtmlProcessor, wxHtmlProcessorList);
 
 WX_DECLARE_LIST(wxHtmlProcessor, wxHtmlProcessorList);

-WX_DEFINE_LIST(wxHtmlProcessorList);
+WX_DEFINE_LIST(wxHtmlProcessorList)

 
 //-----------------------------------------------------------------------------
 // wxHtmlWindow
 
 //-----------------------------------------------------------------------------
 // wxHtmlWindow


@@ -1306,8 +1306,7 @@ void wxHtmlWindow::OnMouseLeave(wxMouseEvent& event)
 
 void wxHtmlWindow::OnKeyUp(wxKeyEvent& event)
 {
 
 void wxHtmlWindow::OnKeyUp(wxKeyEvent& event)
 {

-    if ( IsSelectionEnabled() &&
-         event.GetKeyCode() == 'C' && event.ControlDown() )
+    if ( IsSelectionEnabled() && event.GetKeyCode() == 'C' && event.CmdDown() )

     {
         (void) CopySelection();
     }
     {
         (void) CopySelection();
     }