Some #include and #if wxUSE_XX things

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

diff --git a/include/wx/msw/bmpbuttn.h b/include/wx/msw/bmpbuttn.h
index 86161a9c84ca419b34024061695d83c9b200ce41..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
 


@@ -27,18 +27,18 @@ class WXDLLEXPORT wxBitmapButton: public wxButton
   DECLARE_DYNAMIC_CLASS(wxBitmapButton)
  public:
   inline wxBitmapButton(void) { m_marginX = wxDEFAULT_BUTTON_MARGIN; m_marginY = wxDEFAULT_BUTTON_MARGIN; }
   DECLARE_DYNAMIC_CLASS(wxBitmapButton)
  public:
   inline wxBitmapButton(void) { m_marginX = wxDEFAULT_BUTTON_MARGIN; m_marginY = wxDEFAULT_BUTTON_MARGIN; }

-  inline wxBitmapButton(wxWindow *parent, const wxWindowID id, const wxBitmap& bitmap,
+  inline wxBitmapButton(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,

            const wxPoint& pos = wxDefaultPosition,
            const wxPoint& pos = wxDefaultPosition,

-           const wxSize& size = wxDefaultSize, const long style = wxBU_AUTODRAW,
+           const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW,

            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxButtonNameStr)
   {
       Create(parent, id, bitmap, pos, size, style, validator, name);
   }
 
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxButtonNameStr)
   {
       Create(parent, id, bitmap, pos, size, style, validator, name);
   }
 

-  bool Create(wxWindow *parent, const wxWindowID id, const wxBitmap& bitmap,
+  bool Create(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,

            const wxPoint& pos = wxDefaultPosition,
            const wxPoint& pos = wxDefaultPosition,

-           const wxSize& size = wxDefaultSize, const long style = wxBU_AUTODRAW,
+           const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW,

            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxButtonNameStr);
 
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxButtonNameStr);
 


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

-    // __BMPBUTTNH__
+    // _WX_BMPBUTTN_H_