clipboard extension

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

diff --git a/include/wx/mac/bitmap.h b/include/wx/mac/bitmap.h
index dae1493b874960ffb55e76a93feb22f038c27f2f..0e1af6ead46991697f24e0cc99b6e29fcb1eb53b 100644 (file)
--- a/include/wx/mac/bitmap.h
+++ b/include/wx/mac/bitmap.h
@@ -193,16 +193,14 @@ public:
   inline bool operator != (const wxBitmap& bitmap) const { return m_refData != bitmap.m_refData; }
 
   static void InitStandardHandlers();
-protected:
-
-  // TODO: Implementation
 public:
-  void SetHBITMAP(WXHBITMAP bmp);
   WXHBITMAP GetHBITMAP() const;
-  void SetHICON(WXHICON ico);
   inline WXHICON GetHICON() const { return (M_BITMAPDATA ? M_BITMAPDATA->m_hIcon : 0); }
-  
-  WXHMETAFILE GetPict() const;
+  WXHMETAFILE GetPict(bool *created = NULL ) const;
+
+  void SetHBITMAP(WXHBITMAP bmp);
+  void SetHICON(WXHICON ico);
+  void SetPict( WXHMETAFILE pict ) ;
 
   bool FreeResource(bool force = FALSE);
 };

diff --git a/include/wx/mac/dataobj2.h b/include/wx/mac/dataobj2.h
index c6fd53689c9df909f3fe068deda83938a672805e..9286f844c6124636e09773b1104105eee2000f95 100644 (file)
--- a/include/wx/mac/dataobj2.h
+++ b/include/wx/mac/dataobj2.h
@@ -36,20 +36,16 @@ public:
     // implement base class pure virtuals
     // ----------------------------------
 
-    virtual size_t GetDataSize() const { return m_pngSize; }
-    virtual bool GetDataHere(void *buf) const;
+    virtual size_t GetDataSize() const ;
+    virtual bool GetDataHere(void *buf) const ;
     virtual bool SetData(size_t len, const void *buf);
 
-protected:
-    void Init() { m_pngData = (void *)NULL; m_pngSize = 0; }
-    void Clear() { free(m_pngData); }
-    void ClearAll() { Clear(); Init(); }
-
-    size_t      m_pngSize;
-    void       *m_pngData;
-
-    void DoConvertToPng();
-
+protected :
+       void Init() ;
+       void Clear() ;
+       
+       void* m_pictHandle ;
+       bool m_pictCreated ;
 private:
     // Virtual function hiding supression
     size_t GetDataSize(const wxDataFormat& rFormat) const

diff --git a/include/wx/mac/uma.h b/include/wx/mac/uma.h
index 188853e6c53b92c71137e1f8de1465f0272fc3a0..676c3736d129a5186d3cb68d9eb4ce1ba011fdc1 100644 (file)
--- a/include/wx/mac/uma.h
+++ b/include/wx/mac/uma.h
@@ -104,6 +104,10 @@ OSStatus UMAGetHelpMenu(
 
 OSStatus UMADrawThemePlacard( const Rect *inRect , ThemeDrawState inState ) ;
 
+// Clipboard support
+
+OSStatus UMAPutScrap( Size size , OSType type , void *data ) ;
+
 // accessor helpers
 
 #if !TARGET_CARBON