don't draw borders for bitmap buttons with wxBORDER_NONE style

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

diff --git a/include/wx/palmos/metafile.h b/include/wx/palmos/metafile.h
index 543fae73312a643ec4105ef3795dca51c469580c..483398e284ae63b011e4a14b54bd7846942bcb34 100644 (file)
--- a/include/wx/palmos/metafile.h
+++ b/include/wx/palmos/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"
 


@@ -27,28 +23,30 @@
 // Metafile and metafile device context classes
 // ----------------------------------------------------------------------------
 
 // Metafile and metafile device context classes
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxMetafile;
+class WXDLLIMPEXP_FWD_CORE wxMetafile;

 
 

-class WXDLLEXPORT wxMetafileRefData: public wxGDIRefData
+class WXDLLIMPEXP_CORE wxMetafileRefData: public wxGDIRefData

 {
 {

-    friend class WXDLLEXPORT wxMetafile;

 public:
     wxMetafileRefData();
 public:
     wxMetafileRefData();

-    ~wxMetafileRefData();
+    virtual ~wxMetafileRefData();
+
+    virtual bool IsOk() const { return m_metafile != 0; }

 
 public:
     WXHANDLE m_metafile;
     int m_windowsMappingMode;
     int m_width, m_height;
 
 public:
     WXHANDLE m_metafile;
     int m_windowsMappingMode;
     int m_width, m_height;

+
+    friend class WXDLLIMPEXP_FWD_CORE wxMetafile;

 };
 
 #define M_METAFILEDATA ((wxMetafileRefData *)m_refData)
 
 };
 
 #define M_METAFILEDATA ((wxMetafileRefData *)m_refData)
 

-class WXDLLEXPORT wxMetafile: public wxGDIObject
+class WXDLLIMPEXP_CORE 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


@@ -56,7 +54,6 @@ public:
     virtual bool SetClipboard(int width = 0, int height = 0);
 
     virtual bool Play(wxDC *dc);
     virtual bool SetClipboard(int width = 0, int height = 0);
 
     virtual bool Play(wxDC *dc);

-    bool Ok() const { return (M_METAFILEDATA && (M_METAFILEDATA->m_metafile != 0)); };

 
     // set/get the size of metafile for clipboard operations
     wxSize GetSize() const { return wxSize(GetWidth(), GetHeight()); }
 
     // set/get the size of metafile for clipboard operations
     wxSize GetSize() const { return wxSize(GetWidth(), GetHeight()); }


@@ -72,19 +69,11 @@ public:
     int GetWindowsMappingMode() const { return M_METAFILEDATA->m_windowsMappingMode; }
     void SetWindowsMappingMode(int mm);
 
     int GetWindowsMappingMode() const { return M_METAFILEDATA->m_windowsMappingMode; }
     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
-        { return m_refData != metafile.m_refData; }
-

 private:
     DECLARE_DYNAMIC_CLASS(wxMetafile)
 };
 
 private:
     DECLARE_DYNAMIC_CLASS(wxMetafile)
 };
 

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

 {
 public:
     // Don't supply origin and extent
 {
 public:
     // Don't supply origin and extent


@@ -99,10 +88,10 @@ public:
 
     // Should be called at end of drawing
     virtual wxMetafile *Close();
 
     // Should be called at end of drawing
     virtual wxMetafile *Close();

-    virtual void SetMapMode(int mode);
+    virtual void SetMapMode(wxMappingMode mode);

     virtual void GetTextExtent(const wxString& string, long *x, long *y,
             long *descent = NULL, long *externalLeading = NULL,
     virtual void GetTextExtent(const wxString& string, long *x, long *y,
             long *descent = NULL, long *externalLeading = NULL,

-            wxFont *theFont = NULL, bool use16bit = FALSE) const;
+            const wxFont *theFont = NULL, bool use16bit = FALSE) const;

 
     // Implementation
     wxMetafile *GetMetaFile() const { return m_metaFile; }
 
     // Implementation
     wxMetafile *GetMetaFile() const { return m_metaFile; }


@@ -126,10 +115,10 @@ private:
  */
 
 // No origin or extent
  */
 
 // No origin or extent

-bool WXDLLEXPORT wxMakeMetafilePlaceable(const wxString& filename, float scale = 1.0);
+bool WXDLLIMPEXP_CORE wxMakeMetafilePlaceable(const wxString& filename, float scale = 1.0);

 
 // Optional origin and extent
 
 // Optional origin and extent

-bool WXDLLEXPORT wxMakeMetaFilePlaceable(const wxString& filename, int x1, int y1, int x2, int y2, float scale = 1.0, bool useOriginAndExtent = TRUE);
+bool WXDLLIMPEXP_CORE wxMakeMetaFilePlaceable(const wxString& filename, int x1, int y1, int x2, int y2, float scale = 1.0, bool useOriginAndExtent = TRUE);

 
 // ----------------------------------------------------------------------------
 // wxMetafileDataObject is a specialization of wxDataObject for metafile data
 
 // ----------------------------------------------------------------------------
 // wxMetafileDataObject is a specialization of wxDataObject for metafile data


@@ -137,7 +126,7 @@ bool WXDLLEXPORT wxMakeMetaFilePlaceable(const wxString& filename, int x1, int y
 
 #if wxUSE_DRAG_AND_DROP
 
 
 #if wxUSE_DRAG_AND_DROP
 

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

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