fix for bug #29 (blank lines in GetLineText)

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

diff --git a/src/gtk1/bmpbuttn.cpp b/src/gtk1/bmpbuttn.cpp
index 47f6662935a52684a84d353ca156c91d232889e0..32ac3f8575e43d1d0af43d91bf273fefc594479a 100644 (file)
--- 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;
@@ -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;
   
@@ -217,15 +218,15 @@ void wxBitmapButton::SetBitmap()
     else 
     {
         if (m_isSelected) 
-       {
-           the_one = m_selected;
-       }
+           {
+               the_one = m_selected;
+           }
         else 
-       {
+           {
             if (m_hasFocus) 
-               the_one = m_focus;
+                   the_one = m_focus;
             else 
-               the_one = m_bitmap;
+                   the_one = m_bitmap;
         }
     }
 
@@ -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