clean up wxBitmapButton::Create(); override MSWGetStyle() (#4804)

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

diff --git a/include/wx/palmos/enhmeta.h b/include/wx/palmos/enhmeta.h
index e502b076c215d46ca6380db1706eb455b45893a6..e986395628f7273e954b0fdd05693ea3324b8ca1 100644 (file)
--- a/include/wx/palmos/enhmeta.h
+++ b/include/wx/palmos/enhmeta.h
@@ -1,10 +1,10 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        wx/palmos/enhmeta.h
 // Purpose:     wxEnhMetaFile class for PalmOS
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        wx/palmos/enhmeta.h
 // Purpose:     wxEnhMetaFile class for PalmOS

-// Author:      William Osborne
+// 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 WXDLLIMPEXP_CORE 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; }


@@ -76,7 +73,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),


@@ -102,7 +99,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


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

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

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