MSW Caret is now destroyed and recreated when resized.

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

diff --git a/src/os2/clipbrd.cpp b/src/os2/clipbrd.cpp
index ca6319b54fc1fa21baa55594b3523dc9a4f044a8..fc902957b47abe5835beda473bd4ba65758acb67 100644 (file)
--- a/src/os2/clipbrd.cpp
+++ b/src/os2/clipbrd.cpp
@@ -37,10 +37,6 @@
 
 #include <string.h>
 
 
 #include <string.h>
 

-#define INCL_DOS
-#define INCL_PM
-#include <os2.h>
-

 #include "wx/os2/private.h"
 
 // wxDataObject is tied to OLE/drag and drop implementation,
 #include "wx/os2/private.h"
 
 // wxDataObject is tied to OLE/drag and drop implementation,


@@ -436,8 +432,6 @@ bool wxGetClipboardFormatName(wxDataFormat dataFormat,
 
 IMPLEMENT_DYNAMIC_CLASS(wxClipboard, wxObject)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxClipboard, wxObject)
 

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

 wxClipboard::wxClipboard()
 {
 }
 wxClipboard::wxClipboard()
 {
 }


@@ -451,11 +445,22 @@ void wxClipboard::Clear()
 {
 }
 
 {
 }
 

+bool wxClipboard::Flush()
+{
+    // TODO:
+    return FALSE;
+}
+

 bool wxClipboard::Open()
 {
     return wxOpenClipboard();
 }
 
 bool wxClipboard::Open()
 {
     return wxOpenClipboard();
 }
 

+bool wxClipboard::IsOpened() const
+{
+    return wxIsClipboardOpened();
+}
+

 bool wxClipboard::SetData( wxDataObject *data )
 {
     (void)wxEmptyClipboard();
 bool wxClipboard::SetData( wxDataObject *data )
 {
     (void)wxEmptyClipboard();


@@ -604,25 +609,6 @@ bool wxClipboard::GetData( wxDataObject *data )
 #endif
 }
 
 #endif
 }
 

-//-----------------------------------------------------------------------------
-// wxClipboardModule
-//-----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxClipboardModule,wxModule)
-
-bool wxClipboardModule::OnInit()
-{
-    wxTheClipboard = new wxClipboard();
-
-    return TRUE;
-}
-
-void wxClipboardModule::OnExit()
-{
-    if (wxTheClipboard) delete wxTheClipboard;
-    wxTheClipboard = (wxClipboard*) NULL;
-}
-

 #else
     #error "Please turn wxUSE_CLIPBOARD on to compile this file."
 #endif // wxUSE_CLIPBOARD
 #else
     #error "Please turn wxUSE_CLIPBOARD on to compile this file."
 #endif // wxUSE_CLIPBOARD