Better fix

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

diff --git a/include/wx/palmos/enhmeta.h b/include/wx/palmos/enhmeta.h
index 3613bcb9ea93b8c0de4c7aabe204b1db84c1f427..1501435442e26fd611d6b8b9b737a090f5809159 100644 (file)
--- a/include/wx/palmos/enhmeta.h
+++ b/include/wx/palmos/enhmeta.h
@@ -1,10 +1,10 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        wx/palmos/enhmeta.h
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        wx/palmos/enhmeta.h

-// Purpose:     wxEnhMetaFile class for Win32
-// Author:      William Osborne
+// Purpose:     wxEnhMetaFile class for PalmOS
+// Author:      William Osborne - minimal working wxPalmOS port

 // Modified by:
 // Created:     10/13/04
 // Modified by:
 // Created:     10/13/04

-// RCS-ID:      $Id: 
+// RCS-ID:      $Id$

 // Copyright:   (c) William Osborne
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) William Osborne
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////


@@ -12,11 +12,8 @@
 #ifndef _WX_PALMOS_ENHMETA_H_
 #define _WX_PALMOS_ENHMETA_H_
 
 #ifndef _WX_PALMOS_ENHMETA_H_
 #define _WX_PALMOS_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,7 +23,7 @@
 // wxEnhMetaFile: encapsulation of Win32 HENHMETAFILE
 // ----------------------------------------------------------------------------
 
 // wxEnhMetaFile: encapsulation of Win32 HENHMETAFILE
 // ----------------------------------------------------------------------------
 

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

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


@@ -43,7 +40,7 @@ public:
     bool Play(wxDC *dc, wxRect *rectBound = (wxRect *)NULL);
 
     // accessors
     bool Play(wxDC *dc, wxRect *rectBound = (wxRect *)NULL);
 
     // 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; }