Added some makefiles to HTML samples; added help.ico for wxHTML;

make richedit sample compile (but without clipboard ops)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4283 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

samples/richedit/wxllist.cpp

@@ -2382,10 +2382,23 @@ wxLayoutList::FindObjectScreen(wxDC &dc, wxPoint const pos,
        cursorPos->y = line->GetLineNumber();
 
    bool foundinline = true;
+   long cx = 0;
+
    // Now, find the object in the line:
-   wxLOiterator i = line->FindObjectScreen(dc, this,
+   wxLOiterator i;
+
+   if (cursorPos)
+   {
+     i = line->FindObjectScreen(dc, this,
                                            pos.x,
-                                           cursorPos ? &cursorPos->x : NULL,
+                                           &cx,
+                                           &foundinline);
+     cursorPos->x = cx;
+   }
+   else
+     i = line->FindObjectScreen(dc, this,
+                                           pos.x,
+                                           NULL,
                                            &foundinline);
    if ( found )
       *found = didFind && foundinline;
@@ -2831,8 +2844,9 @@ wxLayoutList::GetSelection(wxLayoutDataObject *wxlo, bool invalidate)
             exp->content.object->Write(string);
          delete exp;
       }
-
+#if 0 // FIXME: DnD/Clipboard API has changed, what should this be?
       wxlo->SetData(string.c_str(), string.Length()+1);
+#endif
    }
    return llist;
 }

samples/richedit/wxllist.h

@@ -1215,12 +1215,14 @@ private:
    own format.
 
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-class wxLayoutDataObject : public wxPrivateDataObject
+class wxLayoutDataObject : public wxCustomDataObject
 {
 public:
    wxLayoutDataObject(void)
       {
+#if 0 // TODO: No longer exists, what should we do instead?
          SetId("application/wxlayoutlist");
+#endif
          //m_format.SetAtom((GdkAtom) 222222);
       }
 };

samples/richedit/wxlwindow.cpp

@@ -1099,7 +1099,7 @@ wxLayoutWindow::Paste(bool primary)
          wxTextDataObject data;
          if (wxTheClipboard->IsSupported( data.GetFormat() ))
          {
-            wxTheClipboard->GetData(&data);
+            wxTheClipboard->GetData(data);
             wxString text = data.GetText();
             wxLayoutImportText( m_llist, text);
             SetDirty();