include X11/Xutil.h for wxMotif compilation

[wxWidgets.git] / src / mac / classic / metafile.cpp

diff --git a/src/mac/classic/metafile.cpp b/src/mac/classic/metafile.cpp
index d5cffd054ea5200b37fcca72b955bad6e55d661d..82b363f25da2bb8918b92ab088715b36684a8b88 100644 (file)
--- a/src/mac/classic/metafile.cpp
+++ b/src/mac/classic/metafile.cpp
@@ -1,37 +1,30 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        metafile.cpp
+// Name:        src/mac/classic/metafile.cpp
 // Purpose:     wxMetaFile, wxMetaFileDC etc. These classes are optional.
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "metafile.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/setup.h"
+    #pragma hdrstop
 #endif
 
 #if wxUSE_METAFILE
 
+#include "wx/metafile.h"
+
 #ifndef WX_PRECOMP
-#include "wx/utils.h"
-#include "wx/app.h"
+    #include "wx/utils.h"
+    #include "wx/app.h"
 #endif
 
-#include "wx/metafile.h"
 #include "wx/clipbrd.h"
 
 #include "wx/mac/private.h"
@@ -41,10 +34,8 @@
 
 extern bool wxClipboardIsOpen;
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxMetafile, wxObject)
 IMPLEMENT_ABSTRACT_CLASS(wxMetafileDC, wxDC)
-#endif
 
 /*
  * Metafiles
@@ -74,7 +65,7 @@ wxMetaFile::wxMetaFile(const wxString& file)
     M_METAFILEDATA->m_metafile = 0;
     wxASSERT_MSG( file.IsEmpty() , wxT("no file based metafile support yet") ) ;
 /*
-    if (!file.IsNull() && (file.Cmp("") == 0))
+    if (!file.empty())
         M_METAFILEDATA->m_metafile = (WXHANDLE) GetMetaFile(file);
 */
 }
@@ -88,8 +79,8 @@ bool wxMetaFile::SetClipboard(int width, int height)
 #if wxUSE_DRAG_AND_DROP
     //TODO finishi this port , we need the data obj first
     if (!m_refData)
-        return FALSE;
-    
+        return false;
+
     bool alreadyOpen=wxTheClipboard->IsOpened() ;
     if (!alreadyOpen)
     {
@@ -99,11 +90,11 @@ bool wxMetaFile::SetClipboard(int width, int height)
     wxDataObject *data =
         new wxMetafileDataObject( *this) ;
     bool success = wxTheClipboard->SetData(data);
-    if (!alreadyOpen) 
+    if (!alreadyOpen)
         wxTheClipboard->Close();
     return (bool) success;
 #endif
-    return TRUE ;
+    return true ;
 }
 
 void wxMetafile::SetHMETAFILE(WXHMETAFILE mf)
@@ -119,17 +110,17 @@ void wxMetafile::SetHMETAFILE(WXHMETAFILE mf)
 bool wxMetaFile::Play(wxDC *dc)
 {
     if (!m_refData)
-        return FALSE;
-    
+        return false;
+
     if (!dc->Ok() )
-        return FALSE;
-        
+        return false;
+
     {
         wxMacPortSetter helper( dc ) ;
         PicHandle pict = (PicHandle) GetHMETAFILE() ;
         DrawPicture( pict , &(**pict).picFrame ) ;
     }
-    return TRUE;
+    return true;
 }
 
 wxSize wxMetaFile::GetSize() const
@@ -155,23 +146,23 @@ wxSize wxMetaFile::GetSize() const
 // give origin/extent arguments to wxMakeMetaFilePlaceable.
 
 wxMetaFileDC::wxMetaFileDC(const wxString& filename ,
-                    int width , int height ,
-                    const wxString& WXUNUSED(description) )
+                           int width , int height ,
+                           const wxString& WXUNUSED(description) )
 {
     wxASSERT_MSG( width == 0 || height == 0 , _T("no arbitration of metafilesize supported") ) ;
-    wxASSERT_MSG( filename.IsEmpty() , _T("no file based metafile support yet")) ;
-    
+    wxASSERT_MSG( filename.empty() , _T("no file based metafile support yet")) ;
+
     m_metaFile = new wxMetaFile(filename) ;
     Rect r={0,0,height,width} ;
-    
+
     RectRgn( (RgnHandle) m_macBoundaryClipRgn , &r ) ;
     CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ;
 
     m_metaFile->SetHMETAFILE( OpenPicture( &r ) ) ;
-    ::GetPort( (GrafPtr*) &m_macPort ) ;    
-    m_ok = TRUE ;
-    
-    SetMapMode(wxMM_TEXT); 
+    ::GetPort( (GrafPtr*) &m_macPort ) ;
+    m_ok = true ;
+
+    SetMapMode(wxMM_TEXT);
 }
 
 wxMetaFileDC::~wxMetaFileDC()