1. wxBitmap copy ctor and operator=() taking wxIcon added

[wxWidgets.git] / include / wx / msw / curicop.h

diff --git a/include/wx/msw/curicop.h b/include/wx/msw/curicop.h
index 1ec5056e902017b31634e9529c9774ca449d7377..2be9ce59a730e4eb2d1a1f516355ae7293da8fad 100644 (file)
--- a/include/wx/msw/curicop.h
+++ b/include/wx/msw/curicop.h
@@ -1,9 +1,23 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        curicop.h
+// Purpose:     Private routines for cursor/icon handling
+// Author:      Various
+// Modified by:
+// Created:     01/02/97
+// RCS-ID:      $Id$
+// Copyright:   (c) Julian Smart
+// Licence:    wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_CURICOP_H_
+#define _WX_CURICOP_H_
+
 // PRIVATE STUFF FOLLOWS UNTIL END
 
 // Header signatures for various resources
 #define BFT_ICON   0x4349   /* 'IC' */
 #define BFT_BITMAP 0x4d42   /* 'BM' */
-#define BFT_CURSOR 0x5450   /* 'PT' */
+#define BFT_CURSOR 0x5450   /* 'PT(' */
 
 // This WIDTHBYTES macro determines the number of BYTES per scan line.
 #define WIDTHBYTES( i)   ((i + 31) / 32 * 4)
@@ -33,7 +47,7 @@ struct tagCURFILERES {
 
 typedef struct tagCURFILERES CURFILERES;
 
-HANDLE  ReadCur( LPSTR szFileName, LPPOINT lpptHotSpot, int *W = 0, int *H = 0);
+HANDLE  ReadCur( LPTSTR szFileName, LPPOINT lpptHotSpot, int *W = 0, int *H = 0);
 HBITMAP ColorDDBToMonoDDB( HBITMAP hbm);
 HCURSOR MakeCursor( HANDLE hDIB, LPPOINT lpptHotSpot, HINSTANCE hInst);
 
@@ -58,6 +72,8 @@ struct tagICONFILERES {
 
 typedef struct tagICONFILERES ICONFILERES;
 
-HANDLE ReadIcon( char *szFileName, int *W = 0, int *H = 0);
+HANDLE ReadIcon( wxChar *szFileName, int *W = 0, int *H = 0);
 HICON  MakeIcon( HANDLE hDIB, HINSTANCE hInst);
 
+#endif
+