X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4dcaf11a7b5189be78e52e1412febd7689a959f8..58b1642453c5858a4dd29425b065e9215cb8ec79:/src/gtk1/bmpbuttn.cpp?ds=sidebyside

diff --git a/src/gtk1/bmpbuttn.cpp b/src/gtk1/bmpbuttn.cpp
index 71975f8af9..dc359f07c7 100644
--- a/src/gtk1/bmpbuttn.cpp
+++ b/src/gtk1/bmpbuttn.cpp
@@ -15,8 +15,8 @@
 
 #if wxUSE_BMPBUTTON
 
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
 
 //-----------------------------------------------------------------------------
 // classes
@@ -43,7 +43,8 @@ extern bool   g_blockEventsOnDrag;
 
 static void gtk_bmpbutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button )
 {
-    if (g_isIdle) wxapp_install_idle_handler();
+    if (g_isIdle) 
+        wxapp_install_idle_handler();
 
     if (!button->m_hasVMT) return;
     if (g_blockEventsOnDrag) return;
@@ -105,7 +106,7 @@ static void gtk_bmpbutton_release_callback( GtkWidget *WXUNUSED(widget), wxBitma
 // wxBitmapButton
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton,wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton,wxButton)
 
 wxBitmapButton::wxBitmapButton()
 {
@@ -121,7 +122,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 +191,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 +209,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 +244,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 +254,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 +264,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 +274,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 +315,5 @@ void wxBitmapButton::EndSelect()
     m_isSelected = FALSE;
     SetBitmap();
 }
+#endif
 
-#endif
\ No newline at end of file