Added "set new icon" menu item to taskbar sample; updated some makefiles

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

diff --git a/src/motif/metafile.cpp b/src/motif/metafile.cpp
index 7380a03402e554f4d69f940eec72da50ee43b3bf..e84337aa05c6c9d0d1db8a06ccfd3f01e76c43b6 100644 (file)
--- a/src/motif/metafile.cpp
+++ b/src/motif/metafile.cpp
@@ -21,10 +21,8 @@
 
 extern bool wxClipboardIsOpen;
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxMetaFile, wxObject)
 IMPLEMENT_ABSTRACT_CLASS(wxMetaFileDC, wxDC)
-#endif
 
 wxMetaFile::wxMetaFile(const wxString& file)
 {
@@ -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,
- * 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->rdParm[0] = MM_ANISOTROPIC;
+  modeRecord->rdParm[0] = wxMM_ANISOTROPIC;
 
   originRecord->rdSize = 5;
   originRecord->rdFunction = META_SETWINDOWORG;