Ryan's cumulative wxActiveX and media control patch (1427775)

[wxWidgets.git] / src / palmos / metafile.cpp

diff --git a/src/palmos/metafile.cpp b/src/palmos/metafile.cpp
index 475c50d7ad6046106cf26087bdde4f1899dff36d..5c6880d9b96c4ee5c498e5bcc9fcfef2681e804a 100644 (file)
--- a/src/palmos/metafile.cpp
+++ b/src/palmos/metafile.cpp
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        palmos/metafile.cpp
+// Name:        src/palmos/metafile.cpp

 // Purpose:     wxMetafileDC etc.
 // Purpose:     wxMetafileDC etc.

-// 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
 /////////////////////////////////////////////////////////////////////////////


@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "metafile.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -28,10 +24,6 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#ifndef WX_PRECOMP
-    #include "wx/setup.h"
-#endif
-

 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/app.h"
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/app.h"


@@ -143,24 +135,6 @@ void wxMetafileDC::SetMapMode(int mode)
 // ----------------------------------------------------------------------------
 // wxMakeMetafilePlaceable
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxMakeMetafilePlaceable
 // ----------------------------------------------------------------------------

-#ifdef __WIN32__
-struct RECT32
-{
-  short left;
-  short top;
-  short right;
-  short bottom;
-};
-
-struct mfPLACEABLEHEADER {
-    DWORD    key;
-    short    hmf;
-    RECT32    bbox;
-    WORD    inch;
-    DWORD    reserved;
-    WORD    checksum;
-};
-#else

 struct mfPLACEABLEHEADER {
     DWORD    key;
     HANDLE    hmf;
 struct mfPLACEABLEHEADER {
     DWORD    key;
     HANDLE    hmf;


@@ -169,7 +143,6 @@ struct mfPLACEABLEHEADER {
     DWORD    reserved;
     WORD    checksum;
 };
     DWORD    reserved;
     WORD    checksum;
 };

-#endif

 
 /*
  * Pass filename of existing non-placeable metafile, and bounding box.
 
 /*
  * Pass filename of existing non-placeable metafile, and bounding box.


@@ -213,4 +186,3 @@ bool wxMetafileDataObject::SetData(size_t WXUNUSED(len), const void *buf)
 #endif // wxUSE_DRAG_AND_DROP
 
 #endif // wxUSE_METAFILE
 #endif // wxUSE_DRAG_AND_DROP
 
 #endif // wxUSE_METAFILE

-