From 2845ddc25c401eab92825563a27aade46f7cfe3d Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Wed, 13 Jan 1999 18:21:04 +0000 Subject: [PATCH] *** empty log message *** git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1398 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/msw/metafile.h | 1 + include/wx/msw/ole/dataobj.h | 2 ++ samples/dnd/dnd.cpp | 2 +- src/msw/clipbrd.cpp | 1 - src/msw/makefile.nt | 1 + src/msw/metafile.cpp | 1 + src/msw/ole/dataobj.cpp | 2 ++ 7 files changed, 8 insertions(+), 2 deletions(-) diff --git a/include/wx/msw/metafile.h b/include/wx/msw/metafile.h index 828851eb1b..d5f6f3f8db 100644 --- a/include/wx/msw/metafile.h +++ b/include/wx/msw/metafile.h @@ -176,3 +176,4 @@ private: #endif // wxUSE_METAFILE #endif // _WX_METAFIILE_H_ + diff --git a/include/wx/msw/ole/dataobj.h b/include/wx/msw/ole/dataobj.h index 2863c15dd3..2699d3cbc4 100644 --- a/include/wx/msw/ole/dataobj.h +++ b/include/wx/msw/ole/dataobj.h @@ -151,5 +151,7 @@ private: // wxMetaFileDataObject: see metafile.h is a specialization of wxDataObject for bitmap data // ---------------------------------------------------------------------------- +TODO: wxFileDataObject. + #endif //_WX_OLEDATAOBJ_H diff --git a/samples/dnd/dnd.cpp b/samples/dnd/dnd.cpp index c8fb42eb4a..6fdeb7b2da 100644 --- a/samples/dnd/dnd.cpp +++ b/samples/dnd/dnd.cpp @@ -29,7 +29,7 @@ #endif // ---------------------------------------------------------------------------- -// Derive 2 simple classes which just put in the listbox the strings (text or +// Derive two simple classes which just put in the listbox the strings (text or // file names) we drop on them // ---------------------------------------------------------------------------- class DnDText : public wxTextDropTarget diff --git a/src/msw/clipbrd.cpp b/src/msw/clipbrd.cpp index cf27849739..4ea1d85875 100644 --- a/src/msw/clipbrd.cpp +++ b/src/msw/clipbrd.cpp @@ -480,4 +480,3 @@ bool wxClipboard::GetData( wxDataObject *data ) } #endif // wxUSE_CLIPBOARD - diff --git a/src/msw/makefile.nt b/src/msw/makefile.nt index fb4cc24e9b..f8697d07ed 100644 --- a/src/msw/makefile.nt +++ b/src/msw/makefile.nt @@ -1734,3 +1734,4 @@ updatedocs: touchmanual alldocs # Office StartUp folder, and PDFMaker should be installed. updatepdf: # touchmanual pdfrtf start /w "winword d:\wx2\wxWindows\docs\latex\pdf\wx.rtf /mGeneratePDF" + diff --git a/src/msw/metafile.cpp b/src/msw/metafile.cpp index d3a3f36c94..921cac0ab5 100644 --- a/src/msw/metafile.cpp +++ b/src/msw/metafile.cpp @@ -412,3 +412,4 @@ bool wxMakeMetafilePlaceable(const wxString& filename, int x1, int y1, int x2, i } #endif // wxUSE_METAFILE + diff --git a/src/msw/ole/dataobj.cpp b/src/msw/ole/dataobj.cpp index 2718e36bbe..2d202e39eb 100644 --- a/src/msw/ole/dataobj.cpp +++ b/src/msw/ole/dataobj.cpp @@ -415,5 +415,7 @@ static const char *GetTymedName(DWORD tymed) } } +// TODO: OLE parts of wxBitmap/File/MetafileDataObject + #endif -- 2.45.2