fixed bug in wxHtmlWindow: HistoryBack/Forward now correctly preserves last entry...

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

diff --git a/src/motif/metafile.cpp b/src/motif/metafile.cpp
index e084a9a45fd5279f4c10cfa89c35b58d09f5efcb..e84337aa05c6c9d0d1db8a06ccfd3f01e76c43b6 100644 (file)
--- a/src/motif/metafile.cpp
+++ b/src/motif/metafile.cpp
@@ -16,15 +16,13 @@
 #include "wx/object.h"
 #include "wx/string.h"
 #include "wx/dc.h"
 #include "wx/object.h"
 #include "wx/string.h"
 #include "wx/dc.h"

-#include "wx/stubs/metafile.h"
+#include "wx/motif/metafile.h"

 #include "wx/clipbrd.h"
 
 extern bool wxClipboardIsOpen;
 
 #include "wx/clipbrd.h"
 
 extern bool wxClipboardIsOpen;
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxMetaFile, wxObject)
 IMPLEMENT_ABSTRACT_CLASS(wxMetaFileDC, wxDC)
 IMPLEMENT_DYNAMIC_CLASS(wxMetaFile, wxObject)
 IMPLEMENT_ABSTRACT_CLASS(wxMetaFileDC, wxDC)

-#endif

 
 wxMetaFile::wxMetaFile(const wxString& file)
 {
 
 wxMetaFile::wxMetaFile(const wxString& file)
 {


@@ -52,7 +50,7 @@ bool wxMetaFile::SetClipboard(int width, int height)
 bool wxMetaFile::Play(wxDC *dc)
 {
     // TODO
 bool wxMetaFile::Play(wxDC *dc)
 {
     // TODO

-    return false;
+    return FALSE;

 }
 
 /*
 }
 
 /*


@@ -128,7 +126,7 @@ struct mfPLACEABLEHEADER {
 /*
  * 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.

  *
  */
  
  *
  */
  


@@ -198,7 +196,7 @@ bool wxMakeMetaFilePlaceable(const wxString& filename, int x1, int y1, int x2, i
 
   modeRecord->rdSize = 4;
   modeRecord->rdFunction = META_SETMAPMODE;
 
   modeRecord->rdSize = 4;
   modeRecord->rdFunction = META_SETMAPMODE;

-  modeRecord->rdParm[0] = MM_ANISOTROPIC;
+  modeRecord->rdParm[0] = wxMM_ANISOTROPIC;

 
   originRecord->rdSize = 5;
   originRecord->rdFunction = META_SETWINDOWORG;
 
   originRecord->rdSize = 5;
   originRecord->rdFunction = META_SETWINDOWORG;