copyright and name updates

[wxWidgets.git] / src / univ / bmpbuttn.cpp

diff --git a/src/univ/bmpbuttn.cpp b/src/univ/bmpbuttn.cpp
index 9c6227c33d3224ff566bcb02d499066f20a11433..112dac3646b7e3e459f69cc79e0d966cce34a571 100644 (file)
--- a/src/univ/bmpbuttn.cpp
+++ b/src/univ/bmpbuttn.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "univbmpbuttn.h"
 #endif
 
@@ -64,13 +64,13 @@ bool wxBitmapButton::Create(wxWindow *parent,
     // we add wxBU_EXACTFIT because the bitmap buttons are not the standard
     // ones and so shouldn't be forced to be of the standard size which is
     // typically too big for them
-    if ( !wxButton::Create(parent, id, bitmap, _T(""),
+    if ( !wxButton::Create(parent, id, bitmap, wxEmptyString,
                            pos, size, style | wxBU_EXACTFIT, validator, name) )
-        return FALSE;
+        return false;
 
     m_bmpNormal = bitmap;
 
-    return TRUE;
+    return true;
 }
 
 void wxBitmapButton::OnSetBitmap()
@@ -103,21 +103,21 @@ bool wxBitmapButton::ChangeBitmap(const wxBitmap& bmp)
     {
         m_bitmap = bitmap;
 
-        return TRUE;
+        return true;
     }
 
-    return FALSE;
+    return false;
 }
 
 bool wxBitmapButton::Enable(bool enable)
 {
     if ( !wxButton::Enable(enable) )
-        return FALSE;
+        return false;
 
     if ( !enable && ChangeBitmap(m_bmpDisabled) )
         Refresh();
 
-    return TRUE;
+    return true;
 }
 
 bool wxBitmapButton::SetCurrent(bool doit)