Rework the wxCusor ctor taking wx stock number to provide as many cursors as

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

diff --git a/src/msw/metafile.cpp b/src/msw/metafile.cpp
index 2889b04b854c4b22ecff58c7f8d100df9819c31b..2186f3ef18e5d9573aea35645638bdc04b12380f 100644 (file)
--- a/src/msw/metafile.cpp
+++ b/src/msw/metafile.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxMetafileDC etc.
 // Author:      Julian Smart
 // Modified by: VZ 07.01.00: implemented wxMetaFileDataObject
 // Purpose:     wxMetafileDC etc.
 // Author:      Julian Smart
 // Modified by: VZ 07.01.00: implemented wxMetaFileDataObject


@@ -24,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"


@@ -126,8 +122,6 @@ bool wxMetafile::Play(wxDC *dc)
     if (!m_refData)
         return false;
 
     if (!m_refData)
         return false;
 

-    dc->BeginDrawing();
-

     if (dc->GetHDC() && M_METAFILEDATA->m_metafile)
     {
         if ( !::PlayMetaFile(GetHdcOf(*dc), (HMETAFILE)
     if (dc->GetHDC() && M_METAFILEDATA->m_metafile)
     {
         if ( !::PlayMetaFile(GetHdcOf(*dc), (HMETAFILE)


@@ -137,8 +131,6 @@ bool wxMetafile::Play(wxDC *dc)
         }
     }
 
         }
     }
 

-    dc->EndDrawing();
-

     return true;
 }
 
     return true;
 }
 


@@ -197,9 +189,9 @@ wxMetafileDC::wxMetafileDC(const wxString& file, int xext, int yext, int xorg, i
     m_minY = 10000;
     m_maxX = -10000;
     m_maxY = -10000;
     m_minY = 10000;
     m_maxX = -10000;
     m_maxY = -10000;

-    if ( !file.IsEmpty() && wxFileExists(file))
+    if ( !file.empty() && wxFileExists(file) )

         wxRemoveFile(file);
         wxRemoveFile(file);

-    m_hDC = (WXHDC) CreateMetaFile(file);
+    m_hDC = (WXHDC) CreateMetaFile(file.empty() ? NULL : file.wx_str());

 
     m_ok = true;
 
 
     m_ok = true;
 


@@ -217,21 +209,22 @@ wxMetafileDC::~wxMetafileDC()
     m_hDC = 0;
 }
 
     m_hDC = 0;
 }
 

-void wxMetafileDC::GetTextExtent(const wxString& string, long *x, long *y,
-                                 long *descent, long *externalLeading, wxFont *theFont, bool WXUNUSED(use16bit)) const
+void wxMetafileDC::DoGetTextExtent(const wxString& string,
+                                   wxCoord *x, wxCoord *y,
+                                   wxCoord *descent, wxCoord *externalLeading,
+                                   const wxFont *theFont) const

 {
 {

-    wxFont *fontToUse = theFont;
+    const wxFont *fontToUse = theFont;

     if (!fontToUse)
     if (!fontToUse)

-        fontToUse = (wxFont*) &m_font;
+        fontToUse = &m_font;

 
 

-    HDC dc = GetDC(NULL);
+    ScreenHDC dc;
+    SelectInHDC selFont(dc, GetHfontOf(*fontToUse));

 
     SIZE sizeRect;
     TEXTMETRIC tm;
     ::GetTextExtentPoint32(dc, WXSTRINGCAST string, wxStrlen(WXSTRINGCAST string), &sizeRect);
 
     SIZE sizeRect;
     TEXTMETRIC tm;
     ::GetTextExtentPoint32(dc, WXSTRINGCAST string, wxStrlen(WXSTRINGCAST string), &sizeRect);

-    GetTextMetrics(dc, &tm);
-
-    ReleaseDC(NULL, dc);
+    ::GetTextMetrics(dc, &tm);

 
     if ( x )
         *x = sizeRect.cx;
 
     if ( x )
         *x = sizeRect.cx;


@@ -243,6 +236,16 @@ void wxMetafileDC::GetTextExtent(const wxString& string, long *x, long *y,
         *externalLeading = tm.tmExternalLeading;
 }
 
         *externalLeading = tm.tmExternalLeading;
 }
 

+void wxMetafileDC::DoGetSize(int *width, int *height) const
+{
+    wxCHECK_RET( m_refData, _T("invalid wxMetafileDC") );
+
+    if ( width )
+        *width = M_METAFILEDATA->m_width;
+    if ( height )
+        *height = M_METAFILEDATA->m_height;
+}
+

 wxMetafile *wxMetafileDC::Close()
 {
     SelectOldObjects(m_hDC);
 wxMetafile *wxMetafileDC::Close()
 {
     SelectOldObjects(m_hDC);


@@ -511,4 +514,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

-