define wxUSE_BOOKCTRL when wxUSE_NOTE/LIST/CHOICEBOOK are 0; also define it as as...

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

diff --git a/include/wx/palmos/metafile.h b/include/wx/palmos/metafile.h
index f6fd52706524edc1a5766a7a6af53507e44fac19..14c623979f869712ca2e3eac2ae737cf354c803d 100644 (file)
--- a/include/wx/palmos/metafile.h
+++ b/include/wx/palmos/metafile.h
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/palmos/metafile.h
 // Purpose:     wxMetaFile, wxMetaFileDC and wxMetaFileDataObject classes
-// Author:      William Osborne
+// Author:      William Osborne - minimal working wxPalmOS port
 // Modified by:
 // Created:     10/13/04
-// RCS-ID:      $Id: 
+// RCS-ID:      $Id$
 // Copyright:   (c) William Osborne
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -12,14 +12,6 @@
 #ifndef _WX_METAFIILE_H_
 #define _WX_METAFIILE_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "metafile.h"
-#endif
-
-#include "wx/setup.h"
-
-#if wxUSE_METAFILE
-
 #include "wx/dc.h"
 #include "wx/gdiobj.h"
 
@@ -38,7 +30,7 @@ class WXDLLEXPORT wxMetafileRefData: public wxGDIRefData
     friend class WXDLLEXPORT wxMetafile;
 public:
     wxMetafileRefData();
-    ~wxMetafileRefData();
+    virtual ~wxMetafileRefData();
 
 public:
     WXHANDLE m_metafile;
@@ -52,7 +44,6 @@ class WXDLLEXPORT wxMetafile: public wxGDIObject
 {
 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
@@ -77,8 +68,6 @@ public:
     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
@@ -168,7 +157,6 @@ protected:
 
 #endif // wxUSE_DRAG_AND_DROP
 
-#endif // wxUSE_METAFILE
 #endif
     // _WX_METAFIILE_H_