*** empty log message ***

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

diff --git a/include/wx/msw/metafile.h b/include/wx/msw/metafile.h
index 828851eb1b84d0cb67584edd3e5ed198adfb54b7..d5f6f3f8db4e7099c61bac4381dec2984d2b3c65 100644 (file)
--- a/include/wx/msw/metafile.h
+++ b/include/wx/msw/metafile.h
@@ -176,3 +176,4 @@ private:
 #endif // wxUSE_METAFILE
 #endif
     // _WX_METAFIILE_H_
 #endif // wxUSE_METAFILE
 #endif
     // _WX_METAFIILE_H_

+

diff --git a/include/wx/msw/ole/dataobj.h b/include/wx/msw/ole/dataobj.h
index 2863c15dd3579ef0546276baf8d2b611c976d00d..2699d3cbc43b4774aeacc4606abdd489984243cc 100644 (file)
--- 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
 // ----------------------------------------------------------------------------
 
 // wxMetaFileDataObject: see metafile.h is a specialization of wxDataObject for bitmap data
 // ----------------------------------------------------------------------------
 

+TODO: wxFileDataObject.
+

 #endif  //_WX_OLEDATAOBJ_H
 
 #endif  //_WX_OLEDATAOBJ_H
 

diff --git a/samples/dnd/dnd.cpp b/samples/dnd/dnd.cpp
index c8fb42eb4a00233f1a331e8dbf1410bdb280dede..6fdeb7b2da1c611934a65ddd3d24acc384b9e4de 100644 (file)
--- a/samples/dnd/dnd.cpp
+++ b/samples/dnd/dnd.cpp
@@ -29,7 +29,7 @@
 #endif
 
 // ----------------------------------------------------------------------------
 #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
 // file names) we drop on them
 // ----------------------------------------------------------------------------
 class DnDText : public wxTextDropTarget

diff --git a/src/msw/clipbrd.cpp b/src/msw/clipbrd.cpp
index cf27849739a59c73e06f5084b9b7313cda0e557b..4ea1d858757c6c20c4c5c0e0df22fa6dc7fd7e17 100644 (file)
--- a/src/msw/clipbrd.cpp
+++ b/src/msw/clipbrd.cpp
@@ -480,4 +480,3 @@ bool wxClipboard::GetData( wxDataObject *data )
 }
 
 #endif // wxUSE_CLIPBOARD
 }
 
 #endif // wxUSE_CLIPBOARD

-

diff --git a/src/msw/makefile.nt b/src/msw/makefile.nt
index fb4cc24e9b398404d63d594d5b422c5448b379a6..f8697d07ed47109a843df504aab946a1d0ea01d4 100644 (file)
--- 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"
 # 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 d3a3f36c94eefa490148e2004a45784f1779547e..921cac0ab584e35cc25b9fbf6634fd8ce0880230 100644 (file)
--- 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
 }
 
 #endif // wxUSE_METAFILE

+

diff --git a/src/msw/ole/dataobj.cpp b/src/msw/ole/dataobj.cpp
index 2718e36bbe214cd65cbd9486cfdf913613cb4476..2d202e39eb7bcd1e55465fab0eb781acfdfe60ad 100644 (file)
--- 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
 
 #endif