X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/42b4e99e9a72c259e6a4d24b7e9cd5a3129a990f..a3e7d24d21f5371c88caffe4a85c8e4a5362db3f:/src/gtk1/bmpbuttn.cpp

diff --git a/src/gtk1/bmpbuttn.cpp b/src/gtk1/bmpbuttn.cpp
index b9226adabf..691e6912d7 100644
--- a/src/gtk1/bmpbuttn.cpp
+++ b/src/gtk1/bmpbuttn.cpp
@@ -121,7 +121,7 @@ bool wxBitmapButton::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bi
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {
-        wxFAIL_MSG( _T("wxBitmapButton creation failed") );
+        wxFAIL_MSG( wxT("wxBitmapButton creation failed") );
 	return FALSE;
     }
 
@@ -190,14 +190,14 @@ void wxBitmapButton::SetDefault()
 
 void wxBitmapButton::SetLabel( const wxString &label )
 {
-    wxCHECK_RET( m_widget != NULL, _T("invalid button") );
+    wxCHECK_RET( m_widget != NULL, wxT("invalid button") );
 
     wxControl::SetLabel( label );
 }
 
 wxString wxBitmapButton::GetLabel() const
 {
-    wxCHECK_MSG( m_widget != NULL, _T(""), _T("invalid button") );
+    wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid button") );
 
     return wxControl::GetLabel();
 }
@@ -208,7 +208,7 @@ void wxBitmapButton::ApplyWidgetStyle()
 
 void wxBitmapButton::SetBitmap()
 {
-    wxCHECK_RET( m_widget != NULL, _T("invalid button") );
+    wxCHECK_RET( m_widget != NULL, wxT("invalid button") );
 
     wxBitmap the_one;
   
@@ -243,7 +243,7 @@ void wxBitmapButton::SetBitmap()
 
 void wxBitmapButton::SetBitmapDisabled( const wxBitmap& bitmap ) 
 {
-  wxCHECK_RET( m_widget != NULL, _T("invalid button") );
+  wxCHECK_RET( m_widget != NULL, wxT("invalid button") );
 
   if ( ! m_disabled.Ok() ) return;
   m_disabled = bitmap;
@@ -253,7 +253,7 @@ void wxBitmapButton::SetBitmapDisabled( const wxBitmap& bitmap )
 
 void wxBitmapButton::SetBitmapFocus( const wxBitmap& bitmap ) 
 {
-    wxCHECK_RET( m_widget != NULL, _T("invalid button") );
+    wxCHECK_RET( m_widget != NULL, wxT("invalid button") );
 
     if ( ! m_focus.Ok() ) return;
     m_focus = bitmap;
@@ -263,7 +263,7 @@ void wxBitmapButton::SetBitmapFocus( const wxBitmap& bitmap )
 
 void wxBitmapButton::SetBitmapLabel( const wxBitmap& bitmap )
 {
-    wxCHECK_RET( m_widget != NULL, _T("invalid button") );
+    wxCHECK_RET( m_widget != NULL, wxT("invalid button") );
 
     if (!m_bitmap.Ok()) return;
     m_bitmap = bitmap;
@@ -273,7 +273,7 @@ void wxBitmapButton::SetBitmapLabel( const wxBitmap& bitmap )
 
 void wxBitmapButton::SetBitmapSelected( const wxBitmap& bitmap )
 {
-    wxCHECK_RET( m_widget != NULL, _T("invalid button") );
+    wxCHECK_RET( m_widget != NULL, wxT("invalid button") );
 
     if ( ! m_selected.Ok() ) return;
     m_selected = bitmap;
@@ -314,5 +314,5 @@ void wxBitmapButton::EndSelect()
     m_isSelected = FALSE;
     SetBitmap();
 }
+#endif
 
-#endif
\ No newline at end of file