added Remove(HWND); removed unused wParam parameter from SendTooltipMessage

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

diff --git a/include/wx/msw/metafile.h b/include/wx/msw/metafile.h
index 5b40bc344118eaa2d932327d7ba96a3369ab99b6..95c316092ce9c6ef7ff35caad462d42abacb1137 100644 (file)
--- a/include/wx/msw/metafile.h
+++ b/include/wx/msw/metafile.h
@@ -12,10 +12,6 @@
 #ifndef _WX_METAFIILE_H_
 #define _WX_METAFIILE_H_
 
 #ifndef _WX_METAFIILE_H_
 #define _WX_METAFIILE_H_
 

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

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


@@ -48,7 +44,6 @@ class WXDLLEXPORT wxMetafile: public wxGDIObject
 {
 public:
     wxMetafile(const wxString& file = wxEmptyString);
 {
 public:
     wxMetafile(const wxString& file = wxEmptyString);

-    wxMetafile(const wxMetafile& metafile) { Ref(metafile); }

     virtual ~wxMetafile();
 
     // After this is called, the metafile cannot be used for anything
     virtual ~wxMetafile();
 
     // After this is called, the metafile cannot be used for anything


@@ -73,8 +68,6 @@ public:
     void SetWindowsMappingMode(int mm);
 
     // Operators
     void SetWindowsMappingMode(int mm);
 
     // Operators

-    wxMetafile& operator=(const wxMetafile& metafile)
-        { if (*this != metafile) Ref(metafile); return *this; }

     bool operator==(const wxMetafile& metafile) const
         { return m_refData == metafile.m_refData; }
     bool operator!=(const wxMetafile& metafile) const
     bool operator==(const wxMetafile& metafile) const
         { return m_refData == metafile.m_refData; }
     bool operator!=(const wxMetafile& metafile) const


@@ -111,6 +104,8 @@ public:
     void SetWindowsMappingMode(int mm) { m_windowsMappingMode = mm; }
 
 protected:
     void SetWindowsMappingMode(int mm) { m_windowsMappingMode = mm; }
 
 protected:

+    virtual void DoGetSize(int *width, int *height) const;
+

     int           m_windowsMappingMode;
     wxMetafile*   m_metaFile;
 
     int           m_windowsMappingMode;
     wxMetafile*   m_metaFile;