Added wxMSW wxBitmapComboBox::DoGetBestSize(), which takes bitmap size into account.

[wxWidgets.git] / include / wx / msw / enhmeta.h

diff --git a/include/wx/msw/enhmeta.h b/include/wx/msw/enhmeta.h
index 74313bb9c98c0c2c3a370a03d7524f1f1fbcfd61..e4cd9b3284c71aa89a5867953b1c2ea2a6f59aa0 100644 (file)
--- a/include/wx/msw/enhmeta.h
+++ b/include/wx/msw/enhmeta.h
@@ -6,17 +6,14 @@
 // Created:     13.01.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Created:     13.01.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MSW_ENHMETA_H_
 #define _WX_MSW_ENHMETA_H_
 
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MSW_ENHMETA_H_
 #define _WX_MSW_ENHMETA_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "enhmeta.h"
-#endif
-

 #include "wx/dc.h"
 #include "wx/dc.h"

+#include "wx/gdiobj.h"

 
 #if wxUSE_DRAG_AND_DROP
     #include "wx/dataobj.h"
 
 #if wxUSE_DRAG_AND_DROP
     #include "wx/dataobj.h"


@@ -26,12 +23,12 @@
 // wxEnhMetaFile: encapsulation of Win32 HENHMETAFILE
 // ----------------------------------------------------------------------------
 
 // wxEnhMetaFile: encapsulation of Win32 HENHMETAFILE
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxEnhMetaFile : public wxObject
+class WXDLLIMPEXP_CORE wxEnhMetaFile : public wxGDIObject

 {
 public:
     wxEnhMetaFile(const wxString& file = wxEmptyString) : m_filename(file)
         { Init(); }
 {
 public:
     wxEnhMetaFile(const wxString& file = wxEmptyString) : m_filename(file)
         { Init(); }

-    wxEnhMetaFile(const wxEnhMetaFile& metafile)
+    wxEnhMetaFile(const wxEnhMetaFile& metafile) : wxGDIObject()

         { Init(); Assign(metafile); }
     wxEnhMetaFile& operator=(const wxEnhMetaFile& metafile)
         { Free(); Assign(metafile); return *this; }
         { Init(); Assign(metafile); }
     wxEnhMetaFile& operator=(const wxEnhMetaFile& metafile)
         { Free(); Assign(metafile); return *this; }


@@ -40,10 +37,10 @@ public:
         { Free(); }
 
     // display the picture stored in the metafile on the given DC
         { Free(); }
 
     // display the picture stored in the metafile on the given DC

-    bool Play(wxDC *dc, wxRect *rectBound = (wxRect *)NULL);
+    bool Play(wxDC *dc, wxRect *rectBound = NULL);

 
     // accessors
 
     // accessors

-    bool Ok() const { return m_hMF != 0; }
+    virtual bool IsOk() const { return m_hMF != 0; }

 
     wxSize GetSize() const;
     int GetWidth() const { return GetSize().x; }
 
     wxSize GetSize() const;
     int GetWidth() const { return GetSize().x; }


@@ -61,10 +58,15 @@ public:
     void SetHENHMETAFILE(WXHANDLE hMF) { Free(); m_hMF = hMF; }
 
 protected:
     void SetHENHMETAFILE(WXHANDLE hMF) { Free(); m_hMF = hMF; }
 
 protected:

-    void Init() { m_hMF = 0; }
+    void Init();

     void Free();
     void Assign(const wxEnhMetaFile& mf);
 
     void Free();
     void Assign(const wxEnhMetaFile& mf);
 

+    // we don't use these functions (but probably should) but have to implement
+    // them as they're pure virtual in the base class
+    virtual wxGDIRefData *CreateGDIRefData() const;
+    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
+

 private:
     wxString m_filename;
     WXHANDLE m_hMF;
 private:
     wxString m_filename;
     WXHANDLE m_hMF;


@@ -76,7 +78,7 @@ private:
 // wxEnhMetaFileDC: allows to create a wxEnhMetaFile
 // ----------------------------------------------------------------------------
 
 // wxEnhMetaFileDC: allows to create a wxEnhMetaFile
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxEnhMetaFileDC : public wxDC
+class WXDLLIMPEXP_CORE wxEnhMetaFileDC : public wxDC

 {
 public:
     // the ctor parameters specify the filename (empty for memory metafiles),
 {
 public:
     // the ctor parameters specify the filename (empty for memory metafiles),


@@ -85,7 +87,12 @@ public:
                     int width = 0, int height = 0,
                     const wxString& description = wxEmptyString);
 
                     int width = 0, int height = 0,
                     const wxString& description = wxEmptyString);
 

-    virtual ~wxEnhMetaFileDC();
+    // as above, but takes reference DC as first argument to take resolution,
+    // size, font metrics etc. from
+    wxEnhMetaFileDC(const wxDC& referenceDC,
+                    const wxString& filename = wxEmptyString,
+                    int width = 0, int height = 0,
+                    const wxString& description = wxEmptyString);

 
     // obtain a pointer to the new metafile (caller should delete it)
     wxEnhMetaFile *Close();
 
     // obtain a pointer to the new metafile (caller should delete it)
     wxEnhMetaFile *Close();


@@ -102,7 +109,7 @@ private:
 
 // notice that we want to support both CF_METAFILEPICT and CF_ENHMETAFILE and
 // so we derive from wxDataObject and not from wxDataObjectSimple
 
 // notice that we want to support both CF_METAFILEPICT and CF_ENHMETAFILE and
 // so we derive from wxDataObject and not from wxDataObjectSimple

-class WXDLLEXPORT wxEnhMetaFileDataObject : public wxDataObject
+class WXDLLIMPEXP_CORE wxEnhMetaFileDataObject : public wxDataObject

 {
 public:
     // ctors
 {
 public:
     // ctors


@@ -129,7 +136,7 @@ public:
 protected:
     wxEnhMetaFile m_metafile;
 
 protected:
     wxEnhMetaFile m_metafile;
 

-    DECLARE_NO_COPY_CLASS(wxEnhMetaFileDataObject)
+    wxDECLARE_NO_COPY_CLASS(wxEnhMetaFileDataObject);

 };
 
 
 };
 
 


@@ -140,7 +147,7 @@ protected:
 // CF_ENHMETAFILE
 // ----------------------------------------------------------------------------
 
 // CF_ENHMETAFILE
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxEnhMetaFileSimpleDataObject : public wxDataObjectSimple
+class WXDLLIMPEXP_CORE wxEnhMetaFileSimpleDataObject : public wxDataObjectSimple

 {
 public:
     // ctors
 {
 public:
     // ctors


@@ -172,7 +179,7 @@ public:
 protected:
     wxEnhMetaFile m_metafile;
 
 protected:
     wxEnhMetaFile m_metafile;
 

-    DECLARE_NO_COPY_CLASS(wxEnhMetaFileSimpleDataObject)
+    wxDECLARE_NO_COPY_CLASS(wxEnhMetaFileSimpleDataObject);

 };
 
 #endif // wxUSE_DRAG_AND_DROP
 };
 
 #endif // wxUSE_DRAG_AND_DROP