more warning fixes about empty if statement in helper classes in release build

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

diff --git a/include/wx/msw/metafile.h b/include/wx/msw/metafile.h
index d5f6f3f8db4e7099c61bac4381dec2984d2b3c65..bac18903815a7a7fb041423558962d68851e2088 100644 (file)
--- a/include/wx/msw/metafile.h
+++ b/include/wx/msw/metafile.h
@@ -1,39 +1,27 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        metafile.h
-// Purpose:     wxMetaFile, wxMetaFileDC classes
+// Name:        wx/msw/metafile.h
+// Purpose:     wxMetaFile, wxMetaFileDC and wxMetaFileDataObject classes

 // Author:      Julian Smart
 // Author:      Julian Smart

-// Modified by:
+// Modified by: VZ 07.01.00: implemented wxMetaFileDataObject

 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-

 #ifndef _WX_METAFIILE_H_
 #define _WX_METAFIILE_H_
 
 #ifndef _WX_METAFIILE_H_
 #define _WX_METAFIILE_H_
 

-#ifdef __GNUG__
-#pragma interface "metafile.h"
-#endif
-
-#include "wx/setup.h"
-
-#if wxUSE_METAFILE

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

-#include "wx/dataobj.h"
+    #include "wx/dataobj.h"

 #endif
 
 #endif
 

-/*
- * Metafile and metafile device context classes
- *
- */
-
-#define wxMetaFile wxMetafile
-#define wxMetaFileDC wxMetafileDC
+// ----------------------------------------------------------------------------
+// Metafile and metafile device context classes
+// ----------------------------------------------------------------------------

 
 class WXDLLEXPORT wxMetafile;
 
 
 class WXDLLEXPORT wxMetafile;
 


@@ -41,139 +29,136 @@ class WXDLLEXPORT wxMetafileRefData: public wxGDIRefData
 {
     friend class WXDLLEXPORT wxMetafile;
 public:
 {
     friend class WXDLLEXPORT wxMetafile;
 public:

-    wxMetafileRefData(void);
-    ~wxMetafileRefData(void);
+    wxMetafileRefData();
+    virtual ~wxMetafileRefData();

 
 public:
     WXHANDLE m_metafile;
     int m_windowsMappingMode;
 
 public:
     WXHANDLE m_metafile;
     int m_windowsMappingMode;

+    int m_width, m_height;

 };
 
 #define M_METAFILEDATA ((wxMetafileRefData *)m_refData)
 
 class WXDLLEXPORT wxMetafile: public wxGDIObject
 {
 };
 
 #define M_METAFILEDATA ((wxMetafileRefData *)m_refData)
 
 class WXDLLEXPORT wxMetafile: public wxGDIObject
 {

-  DECLARE_DYNAMIC_CLASS(wxMetafile)
- public:
-  // Copy constructor
-  inline wxMetafile(const wxMetafile& metafile)
-  { Ref(metafile); }
+public:
+    wxMetafile(const wxString& file = wxEmptyString);
+    virtual ~wxMetafile();

 
 

-  wxMetafile(const wxString& file = "");
-  ~wxMetafile(void);
+    // After this is called, the metafile cannot be used for anything
+    // since it is now owned by the clipboard.
+    virtual bool SetClipboard(int width = 0, int height = 0);

 
 

-  // After this is called, the metafile cannot be used for anything
-  // since it is now owned by the clipboard.
-  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)); };

 
 

-  virtual bool Play(wxDC *dc);
-  inline bool Ok(void) 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()); }
+    int GetWidth() const { return M_METAFILEDATA->m_width; }
+    int GetHeight() const { return M_METAFILEDATA->m_height; }

 
 

-  // Implementation
-  inline WXHANDLE GetHMETAFILE(void) { return M_METAFILEDATA->m_metafile; }
-  void SetHMETAFILE(WXHANDLE mf) ;
-  inline int GetWindowsMappingMode(void) { return M_METAFILEDATA->m_windowsMappingMode; }
-  void SetWindowsMappingMode(int mm);
+    void SetWidth(int width) { M_METAFILEDATA->m_width = width; }
+    void SetHeight(int height) { M_METAFILEDATA->m_height = height; }

 
 

-  // Operators
-  inline wxMetafile& operator = (const wxMetafile& metafile) { if (*this == metafile) return (*this); Ref(metafile); return *this; }
-  inline bool operator == (const wxMetafile& metafile) { return m_refData == metafile.m_refData; }
-  inline bool operator != (const wxMetafile& metafile) { return m_refData != metafile.m_refData; }
+    // Implementation
+    WXHANDLE GetHMETAFILE() const { return M_METAFILEDATA->m_metafile; }
+    void SetHMETAFILE(WXHANDLE mf) ;
+    int GetWindowsMappingMode() const { return M_METAFILEDATA->m_windowsMappingMode; }
+    void SetWindowsMappingMode(int mm);

 
 

-protected:
+    // Operators
+    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)

 };
 
 class WXDLLEXPORT wxMetafileDC: public wxDC
 {
 };
 
 class WXDLLEXPORT wxMetafileDC: public wxDC
 {

-  DECLARE_DYNAMIC_CLASS(wxMetafileDC)
-
- public:
-  // Don't supply origin and extent
-  // Supply them to wxMakeMetaFilePlaceable instead.
-  wxMetafileDC(const wxString& file = "");
+public:
+    // Don't supply origin and extent
+    // Supply them to wxMakeMetaFilePlaceable instead.
+    wxMetafileDC(const wxString& file = wxEmptyString);

 
 

-  // Supply origin and extent (recommended).
-  // Then don't need to supply them to wxMakeMetaFilePlaceable.
-  wxMetafileDC(const wxString& file, int xext, int yext, int xorg, int yorg);
+    // Supply origin and extent (recommended).
+    // Then don't need to supply them to wxMakeMetaFilePlaceable.
+    wxMetafileDC(const wxString& file, int xext, int yext, int xorg, int yorg);

 
 

-  ~wxMetafileDC(void);
+    virtual ~wxMetafileDC();

 
 

-  // Should be called at end of drawing
-  virtual wxMetafile *Close(void);
-  virtual void SetMapMode(int mode);
-  virtual void GetTextExtent(const wxString& string, long *x, long *y,
-                     long *descent = NULL, long *externalLeading = NULL,
-                     wxFont *theFont = NULL, bool use16bit = FALSE) const;
+    // Should be called at end of drawing
+    virtual wxMetafile *Close();
+    virtual void SetMapMode(int mode);
+    virtual void GetTextExtent(const wxString& string, long *x, long *y,
+            long *descent = NULL, long *externalLeading = NULL,
+            wxFont *theFont = NULL, bool use16bit = false) const;

 
 

-  // Implementation
-  inline wxMetafile *GetMetaFile(void) const { return m_metaFile; }
-  inline void SetMetaFile(wxMetafile *mf) { m_metaFile = mf; }
-  inline int GetWindowsMappingMode(void) const { return m_windowsMappingMode; }
-  inline void SetWindowsMappingMode(int mm) { m_windowsMappingMode = mm; }
+    // Implementation
+    wxMetafile *GetMetaFile() const { return m_metaFile; }
+    void SetMetaFile(wxMetafile *mf) { m_metaFile = mf; }
+    int GetWindowsMappingMode() const { return m_windowsMappingMode; }
+    void SetWindowsMappingMode(int mm) { m_windowsMappingMode = mm; }

 
 protected:
 
 protected:

-  int           m_windowsMappingMode;
-  wxMetafile*   m_metaFile;
+    virtual void DoGetSize(int *width, int *height) const;
+
+    int           m_windowsMappingMode;
+    wxMetafile*   m_metaFile;
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxMetafileDC)

 };
 
 /*
  * Pass filename of existing non-placeable metafile, and bounding box.
  * Adds a placeable metafile header, sets the mapping mode to anisotropic,
 };
 
 /*
  * Pass filename of existing non-placeable metafile, and bounding box.
  * Adds a placeable metafile header, sets the mapping mode to anisotropic,

- * and sets the window origin and extent to mimic the MM_TEXT mapping mode.
+ * and sets the window origin and extent to mimic the wxMM_TEXT mapping mode.

  *
  */
 
 // No origin or extent
  *
  */
 
 // No origin or extent

-#define wxMakeMetaFilePlaceable wxMakeMetafilePlaceable

 bool WXDLLEXPORT wxMakeMetafilePlaceable(const wxString& filename, float scale = 1.0);
 
 // Optional origin and extent
 bool WXDLLEXPORT wxMakeMetafilePlaceable(const wxString& filename, float scale = 1.0);
 
 // 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 WXDLLEXPORT 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
 // ----------------------------------------------------------------------------
 

-// TODO: implement OLE side of things. At present, it's just for clipboard
-// use.
-

 #if wxUSE_DRAG_AND_DROP
 #if wxUSE_DRAG_AND_DROP

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

 {
 public:
 {
 public:

-  // ctors
-  wxMetafileDataObject() { m_width = 0; m_height = 0; };
-  wxMetafileDataObject(const wxMetafile& metafile, int width = 0, int height = 0):
-    m_metafile(metafile), m_width(width), m_height(height) { }
-
-  void SetMetafile(const wxMetafile& metafile, int w = 0, int h = 0)
-    { m_metafile = metafile; m_width = w; m_height = h; }
-  wxMetafile GetMetafile() const { return m_metafile; }
-  int GetWidth() const { return m_width; }
-  int GetHeight() const { return m_height; }
-
-  virtual wxDataFormat GetFormat() const { return wxDF_METAFILE; }
-
-/* ??
-  // implement base class pure virtuals
-  virtual wxDataFormat GetPreferredFormat() const
-    { return (wxDataFormat) wxDataObject::Text; }
-  virtual bool IsSupportedFormat(wxDataFormat format) const
-    { return format == wxDataObject::Text || format == wxDataObject::Locale; }
-  virtual size_t GetDataSize() const
-    { return m_strText.Len() + 1; } // +1 for trailing '\0'of course
-  virtual void GetDataHere(void *pBuf) const
-    { memcpy(pBuf, m_strText.c_str(), GetDataSize()); }
-*/
+    // ctors
+    wxMetafileDataObject() : wxDataObjectSimple(wxDF_METAFILE)
+        { }
+    wxMetafileDataObject(const wxMetafile& metafile)
+        : wxDataObjectSimple(wxDF_METAFILE), m_metafile(metafile) { }
+
+    // virtual functions which you may override if you want to provide data on
+    // demand only - otherwise, the trivial default versions will be used
+    virtual void SetMetafile(const wxMetafile& metafile)
+        { m_metafile = metafile; }
+    virtual wxMetafile GetMetafile() const
+        { return m_metafile; }
+
+    // implement base class pure virtuals
+    virtual size_t GetDataSize() const;
+    virtual bool GetDataHere(void *buf) const;
+    virtual bool SetData(size_t len, const void *buf);

 
 

-private:
-  wxMetafile   m_metafile;
-  int          m_width;
-  int          m_height;
+protected:
+    wxMetafile m_metafile;

 };
 };

-#endif

 
 

-#endif // wxUSE_METAFILE
+#endif // wxUSE_DRAG_AND_DROP
+

 #endif
     // _WX_METAFIILE_H_
 
 #endif
     // _WX_METAFIILE_H_