Because someone was inconsistent about using LPSTR and char*, I missed

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

diff --git a/include/wx/msw/bmpbuttn.h b/include/wx/msw/bmpbuttn.h
index 118888a4e91b9836356b1573e555b919eaa2d71a..846a2813f774488c6ac525d515696dbb0e314bbd 100644 (file)
--- a/include/wx/msw/bmpbuttn.h
+++ b/include/wx/msw/bmpbuttn.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:    wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __BMPBUTTNH__
-#define __BMPBUTTNH__
+#ifndef _WX_BMPBUTTN_H_
+#define _WX_BMPBUTTN_H_

 
 #ifdef __GNUG__
 #pragma interface "bmpbuttn.h"
 
 #ifdef __GNUG__
 #pragma interface "bmpbuttn.h"


@@ -18,7 +18,7 @@
 
 #include "wx/button.h"
 
 
 #include "wx/button.h"
 

-WXDLLEXPORT_DATA(extern const char*) wxButtonNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxButtonNameStr;

 
 #define wxDEFAULT_BUTTON_MARGIN 4
 
 
 #define wxDEFAULT_BUTTON_MARGIN 4
 


@@ -82,4 +82,4 @@ class WXDLLEXPORT wxBitmapButton: public wxButton
 };
 
 #endif
 };
 
 #endif

-    // __BMPBUTTNH__
+    // _WX_BMPBUTTN_H_