VTK wrapper of vtkRenderWindow for wxPython. Tested on MSW so far.

[wxWidgets.git] / src / msw / clipbrd.cpp

diff --git a/src/msw/clipbrd.cpp b/src/msw/clipbrd.cpp
index ee67329e428838ac3700d8ff7ef7aaa427b5f48c..6b93ebf988cf1a203992265000026f1eea1f3382 100644 (file)
--- a/src/msw/clipbrd.cpp
+++ b/src/msw/clipbrd.cpp
@@ -419,8 +419,6 @@ bool wxGetClipboardFormatName(wxDataFormat dataFormat,
 
 IMPLEMENT_DYNAMIC_CLASS(wxClipboard, wxObject)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxClipboard, wxObject)
 

-wxClipboard* wxTheClipboard = (wxClipboard *)NULL;
-

 wxClipboard::wxClipboard()
 {
     m_clearOnExit = FALSE;
 wxClipboard::wxClipboard()
 {
     m_clearOnExit = FALSE;


@@ -485,7 +483,9 @@ bool wxClipboard::IsOpened() const
 
 bool wxClipboard::SetData( wxDataObject *data )
 {
 
 bool wxClipboard::SetData( wxDataObject *data )
 {

+#if !wxUSE_OLE_CLIPBOARD

     (void)wxEmptyClipboard();
     (void)wxEmptyClipboard();

+#endif // wxUSE_OLE_CLIPBOARD

 
     if ( data )
         return AddData(data);
 
     if ( data )
         return AddData(data);