fixed incorrect GetTextExtent for wxTELETYPE font

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

diff --git a/src/msw/curico.cpp b/src/msw/curico.cpp
index 518563ba23bde8d6a00439cbe36f0c25025de0cc..c8df51825e49b4a3001d2cd9967ee8c8a8f9d965 100644 (file)
--- a/src/msw/curico.cpp
+++ b/src/msw/curico.cpp
@@ -24,10 +24,8 @@
 #include <winuser.h>
 #endif
 
 #include <winuser.h>
 #endif
 

-#ifndef __TWIN32__
-#if defined (__GNUWIN32__) && !defined(wxUSE_NORLANDER_HEADERS)
-#include "wx/msw/gnuwin32/extra.h"
-#endif
+#ifdef __GNUWIN32_OLD__
+    #include "wx/msw/gnuwin32/extra.h"

 #endif
 
 #include "wx/wxchar.h"
 #endif
 
 #include "wx/wxchar.h"


@@ -101,7 +99,7 @@ HANDLE ReadIcon( wxChar *szFileName, int *W, int *H)
                  nDirEntries = 0;
 
    // Open and read the .ICO file header and the first ICONFILERES
                  nDirEntries = 0;
 
    // Open and read the .ICO file header and the first ICONFILERES

-  hFile  = _lopen( wxFNCONV(szFileName), OF_READ);
+  hFile  = _lopen( wxConvertWX2MB(szFileName), OF_READ);

   cbHead = _lread( hFile, (LPSTR)&iconFileHead, sizeof(ICONFILEHEADER));
   cbRes  = _lread( hFile, (LPSTR)&iconFileRes, sizeof(ICONFILERES));
   ++nDirEntries;
   cbHead = _lread( hFile, (LPSTR)&iconFileHead, sizeof(ICONFILEHEADER));
   cbRes  = _lread( hFile, (LPSTR)&iconFileRes, sizeof(ICONFILERES));
   ++nDirEntries;


@@ -218,7 +216,7 @@ HICON MakeIcon( HANDLE hDIB, HINSTANCE hInst)
                             lpDIB->bmiHeader.biBitCount)));
 
   // Get a hDC so we can create a bitmap compatible with it
                             lpDIB->bmiHeader.biBitCount)));
 
   // Get a hDC so we can create a bitmap compatible with it

-  hDC = CreateDC( _T("DISPLAY"), NULL, NULL, NULL);
+  hDC = CreateDC( wxT("DISPLAY"), NULL, NULL, NULL);

 
   // 5) Create a device dependent bitmap with the XOR bits.
   hbmXor = CreateDIBitmap( hDC, (LPBITMAPINFOHEADER)&(lpDIB->bmiHeader),
 
   // 5) Create a device dependent bitmap with the XOR bits.
   hbmXor = CreateDIBitmap( hDC, (LPBITMAPINFOHEADER)&(lpDIB->bmiHeader),


@@ -348,7 +346,7 @@ HANDLE ReadCur( wxChar *szFileName, LPPOINT lpptHotSpot, int *W, int *H)
                   nDirEntries = 0;
 
   // Open and read the .ICO file header and the first ICONFILERES
                   nDirEntries = 0;
 
   // Open and read the .ICO file header and the first ICONFILERES

-  hFile  = _lopen( wxFNCONV(szFileName), OF_READ);
+  hFile  = _lopen( wxConvertWX2MB(szFileName), OF_READ);

   cbHead = _lread( hFile,  (LPSTR )&curFileHead, sizeof( CURFILEHEADER));
   cbRes  = _lread( hFile,  (LPSTR )&curFileRes,  sizeof( CURFILERES));
   ++nDirEntries;
   cbHead = _lread( hFile,  (LPSTR )&curFileHead, sizeof( CURFILEHEADER));
   cbRes  = _lread( hFile,  (LPSTR )&curFileRes,  sizeof( CURFILERES));
   ++nDirEntries;


@@ -579,7 +577,7 @@ HCURSOR MakeCursor( HANDLE hDIB, LPPOINT lpptHotSpot, HINSTANCE hInst)
                            lpDIB->bmiHeader.biBitCount)));
 
   // Get a hDC so we can create a bitmap compatible with it
                            lpDIB->bmiHeader.biBitCount)));
 
   // Get a hDC so we can create a bitmap compatible with it

-  hDC = CreateDC( _T("DISPLAY"), NULL, NULL, NULL);
+  hDC = CreateDC( wxT("DISPLAY"), NULL, NULL, NULL);

 
   // 5) Create a device dependent bitmap with the XOR bits.
   hbmXor = CreateBitmap( (int )lpDIB->bmiHeader.biWidth,
 
   // 5) Create a device dependent bitmap with the XOR bits.
   hbmXor = CreateBitmap( (int )lpDIB->bmiHeader.biWidth,