Make DoGetBestSize cache the value of GetSize() the first time it is called

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

diff --git a/src/os2/clipbrd.cpp b/src/os2/clipbrd.cpp
index b0a54e5f2431057d4efb2645ba0e7d69deb570e2..e27f3bc58a43b3fc9b509c5a4257d769b8bdac1f 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,


@@ -48,7 +44,7 @@
 #if wxUSE_DRAG_AND_DROP
     #include "wx/dataobj.h"
 
 #if wxUSE_DRAG_AND_DROP
     #include "wx/dataobj.h"
 

-    static bool wxSetClipboardData(wxDataObject *data);
+//    static bool wxSetClipboardData(wxDataObject *data);

 #endif
 
 // ===========================================================================
 #endif
 
 // ===========================================================================


@@ -128,6 +124,7 @@ bool wxIsClipboardFormatAvailable(wxDataFormat dataFormat)
     return FALSE;
 }
 
     return FALSE;
 }
 

+#if 0

 #if wxUSE_DRAG_AND_DROP
 static bool wxSetClipboardData(wxDataObject *data)
 {
 #if wxUSE_DRAG_AND_DROP
 static bool wxSetClipboardData(wxDataObject *data)
 {


@@ -161,6 +158,7 @@ static bool wxSetClipboardData(wxDataObject *data)
     return TRUE;
 }
 #endif // wxUSE_DRAG_AND_DROP
     return TRUE;
 }
 #endif // wxUSE_DRAG_AND_DROP

+#endif

 
 bool wxSetClipboardData(wxDataFormat dataFormat,
                         const void *data,
 
 bool wxSetClipboardData(wxDataFormat dataFormat,
                         const void *data,


@@ -285,7 +283,7 @@ bool wxSetClipboardData(wxDataFormat dataFormat,
 
 void *wxGetClipboardData(wxDataFormat dataFormat, long *len)
 {
 
 void *wxGetClipboardData(wxDataFormat dataFormat, long *len)
 {

-    void *retval = NULL;
+//  void *retval = NULL;

 // TODO:
 /*
     switch ( dataFormat )
 // TODO:
 /*
     switch ( dataFormat )


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

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

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


@@ -487,7 +483,7 @@ bool wxClipboard::AddData( wxDataObject *data )
 #if wxUSE_DRAG_AND_DROP
     wxCHECK_MSG( wxIsClipboardOpened(), FALSE, wxT("clipboard not open") );
 
 #if wxUSE_DRAG_AND_DROP
     wxCHECK_MSG( wxIsClipboardOpened(), FALSE, wxT("clipboard not open") );
 

-//    wxDataFormat format = data->GetFormat();
+//    wxDataFormat format = data->GetPreferredFormat();

 // TODO:
 /*
     switch ( format )
 // TODO:
 /*
     switch ( format )


@@ -505,7 +501,7 @@ bool wxClipboard::AddData( wxDataObject *data )
         {
             wxBitmapDataObject* bitmapDataObject = (wxBitmapDataObject*) data;
             wxBitmap bitmap(bitmapDataObject->GetBitmap());
         {
             wxBitmapDataObject* bitmapDataObject = (wxBitmapDataObject*) data;
             wxBitmap bitmap(bitmapDataObject->GetBitmap());

-            return wxSetClipboardData(data->GetFormat(), &bitmap);
+            return wxSetClipboardData(data->GetPreferredFormat(), &bitmap);

         }
 
 #if wxUSE_METAFILE
         }
 
 #if wxUSE_METAFILE


@@ -526,6 +522,8 @@ bool wxClipboard::AddData( wxDataObject *data )
 #else // !wxUSE_DRAG_AND_DROP
 */
     return FALSE;
 #else // !wxUSE_DRAG_AND_DROP
 */
     return FALSE;

+#else
+    return FALSE;

 #endif // wxUSE_DRAG_AND_DROP/!wxUSE_DRAG_AND_DROP
 }
 
 #endif // wxUSE_DRAG_AND_DROP/!wxUSE_DRAG_AND_DROP
 }
 


@@ -539,12 +537,12 @@ bool wxClipboard::IsSupported( wxDataFormat format )
     return wxIsClipboardFormatAvailable(format);
 }
 
     return wxIsClipboardFormatAvailable(format);
 }
 

-bool wxClipboard::GetData( wxDataObject *data )
+bool wxClipboard::GetData( wxDataObject& data )

 {
     wxCHECK_MSG( wxIsClipboardOpened(), FALSE, wxT("clipboard not open") );
 
 #if wxUSE_DRAG_AND_DROP
 {
     wxCHECK_MSG( wxIsClipboardOpened(), FALSE, wxT("clipboard not open") );
 
 #if wxUSE_DRAG_AND_DROP

-//    wxDataFormat format = data->GetFormat();
+//    wxDataFormat format = data.GetPreferredFormat();

     // TODO:
 /*
     switch ( format )
     // TODO:
 /*
     switch ( format )


@@ -552,11 +550,11 @@ bool wxClipboard::GetData( wxDataObject *data )
         case wxDF_TEXT:
         case wxDF_OEMTEXT:
         {
         case wxDF_TEXT:
         case wxDF_OEMTEXT:
         {

-            wxTextDataObject* textDataObject = (wxTextDataObject*) data;
+            wxTextDataObject& textDataObject = (wxTextDataObject&) data;

             char* s = (char*) wxGetClipboardData(format);
             if ( s )
             {
             char* s = (char*) wxGetClipboardData(format);
             if ( s )
             {

-                textDataObject->SetText(s);
+                textDataObject.SetText(s);

                 delete[] s;
                 return TRUE;
             }
                 delete[] s;
                 return TRUE;
             }


@@ -567,11 +565,11 @@ bool wxClipboard::GetData( wxDataObject *data )
         case wxDF_BITMAP:
         case wxDF_DIB:
         {
         case wxDF_BITMAP:
         case wxDF_DIB:
         {

-            wxBitmapDataObject* bitmapDataObject = (wxBitmapDataObject *)data;
-            wxBitmap* bitmap = (wxBitmap *)wxGetClipboardData(data->GetFormat());
+            wxBitmapDataObject& bitmapDataObject = (wxBitmapDataObject &)data;
+            wxBitmap* bitmap = (wxBitmap *)wxGetClipboardData(data->GetPreferredFormat());

             if (bitmap)
             {
             if (bitmap)
             {

-                bitmapDataObject->SetBitmap(* bitmap);
+                bitmapDataObject.SetBitmap(* bitmap);

                 delete bitmap;
                 return TRUE;
             }
                 delete bitmap;
                 return TRUE;
             }


@@ -581,11 +579,11 @@ bool wxClipboard::GetData( wxDataObject *data )
 #if wxUSE_METAFILE
         case wxDF_METAFILE:
         {
 #if wxUSE_METAFILE
         case wxDF_METAFILE:
         {

-            wxMetafileDataObject* metaFileDataObject = (wxMetafileDataObject *)data;
+            wxMetafileDataObject& metaFileDataObject = (wxMetafileDataObject &)data;

             wxMetafile* metaFile = (wxMetafile *)wxGetClipboardData(wxDF_METAFILE);
             if (metaFile)
             {
             wxMetafile* metaFile = (wxMetafile *)wxGetClipboardData(wxDF_METAFILE);
             if (metaFile)
             {

-                metaFileDataObject->SetMetafile(*metaFile);
+                metaFileDataObject.SetMetafile(*metaFile);

                 delete metaFile;
                 return TRUE;
             }
                 delete metaFile;
                 return TRUE;
             }


@@ -600,7 +598,7 @@ bool wxClipboard::GetData( wxDataObject *data )
                 if ( buf )
                 {
                     // FIXME this is for testing only!!
                 if ( buf )
                 {
                     // FIXME this is for testing only!!

-                    ((wxPrivateDataObject *)data)->SetData(buf, len);
+                    ((wxPrivateDataObject &)data).SetData(buf, len);

                     free(buf);
 
                     return TRUE;
                     free(buf);
 
                     return TRUE;


@@ -612,6 +610,8 @@ bool wxClipboard::GetData( wxDataObject *data )
 #else
 */
     return FALSE;
 #else
 */
     return FALSE;

+#else
+    return FALSE;

 #endif
 }
 
 #endif
 }