1. coloured buttons seem to work

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

diff --git a/include/wx/msw/curico.h b/include/wx/msw/curico.h
index b85a39b1948f1c4ed87a73f318abc12c68ae1ac1..a4f4394350840966dd927d6fb941dcf1b313e4df 100644 (file)
--- a/include/wx/msw/curico.h
+++ b/include/wx/msw/curico.h
@@ -9,14 +9,20 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-HICON    ReadIconFile(    char *szFileName, HINSTANCE hInst,
+#ifndef _WX_CURICO_H_
+#define _WX_CURICO_H_
+
+HICON    ReadIconFile(    wxChar *szFileName, HINSTANCE hInst,

                           int *W = 0, int *H = 0);
                           int *W = 0, int *H = 0);

-HCURSOR  ReadCursorFile(  char *szFileName, HINSTANCE hInst,
+HCURSOR  ReadCursorFile(  wxChar *szFileName, HINSTANCE hInst,

                           int *W = 0, int *H = 0, int *XHot = 0, int *YHot = 0);
                           int *W = 0, int *H = 0, int *XHot = 0, int *YHot = 0);

-HCURSOR  IconToCursor(    char *szFileName, HINSTANCE hInst, int XHot, int YHot,
+HCURSOR  IconToCursor(    wxChar *szFileName, HINSTANCE hInst, int XHot, int YHot,

                           int *W = 0, int *H = 0);
                           int *W = 0, int *H = 0);

-HICON    CursorToIcon(    char *szFileName, HINSTANCE hInst,
+HICON    CursorToIcon(    wxChar *szFileName, HINSTANCE hInst,

                           int *W = 0, int *H = 0);
 
 HCURSOR MakeCursorFromBitmap(HINSTANCE hInst, HBITMAP hBitmap, POINT *pPoint);
 HICON MakeIconFromBitmap(HINSTANCE hInst, HBITMAP hBitmap);
                           int *W = 0, int *H = 0);
 
 HCURSOR MakeCursorFromBitmap(HINSTANCE hInst, HBITMAP hBitmap, POINT *pPoint);
 HICON MakeIconFromBitmap(HINSTANCE hInst, HBITMAP hBitmap);

+
+#endif
+