Warning fixes after char->wxChar in wxVariant.

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

diff --git a/include/wx/univ/bmpbuttn.h b/include/wx/univ/bmpbuttn.h
index 6845fe9c16498e99be27738d8aab735c744b47bf..5d4d725aac3a00d3b92a5b2da61de504476c17db 100644 (file)
--- a/include/wx/univ/bmpbuttn.h
+++ b/include/wx/univ/bmpbuttn.h
@@ -6,16 +6,12 @@
 // Created:     25.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) Vadim Zeitlin
 // Created:     25.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) Vadim Zeitlin

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIV_BMPBUTTN_H_
 #define _WX_UNIV_BMPBUTTN_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIV_BMPBUTTN_H_
 #define _WX_UNIV_BMPBUTTN_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "univbmpbuttn.h"
-#endif
-

 class WXDLLEXPORT wxBitmapButton : public wxBitmapButtonBase
 {
 public:
 class WXDLLEXPORT wxBitmapButton : public wxBitmapButtonBase
 {
 public:


@@ -49,9 +45,9 @@ public:
         wxBitmapButtonBase::SetMargins(x, y);
     }
 
         wxBitmapButtonBase::SetMargins(x, y);
     }
 

-    virtual bool Enable(bool enable = TRUE);
+    virtual bool Enable(bool enable = true);

 
 

-    virtual bool SetCurrent(bool doit = TRUE);
+    virtual bool SetCurrent(bool doit = true);

 
     virtual void Press();
     virtual void Release();
 
     virtual void Press();
     virtual void Release();


@@ -64,7 +60,7 @@ protected:
     virtual void OnSetBitmap();
 
     // set bitmap to the given one if it's ok or to m_bmpNormal and return
     virtual void OnSetBitmap();
 
     // set bitmap to the given one if it's ok or to m_bmpNormal and return

-    // TRUE if the bitmap really changed
+    // true if the bitmap really changed

     bool ChangeBitmap(const wxBitmap& bmp);
 
 private:
     bool ChangeBitmap(const wxBitmap& bmp);
 
 private: