compile warnings, M_BITMAPDATA privatized

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

diff --git a/src/gtk1/textctrl.cpp b/src/gtk1/textctrl.cpp
index dcc5791ef7e3e2f7c09ed4e08bc0b71690a2b770..b8e19bb2e68dd6b71f0f2c3023abb059f65a18d1 100644 (file)
--- a/src/gtk1/textctrl.cpp
+++ b/src/gtk1/textctrl.cpp
@@ -26,7 +26,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <ctype.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <ctype.h>

-#include <math.h>               // for fabs
+#include "wx/math.h"

 
 #include "wx/gtk/private.h"
 #include <gdk/gdkkeysyms.h>
 
 #include "wx/gtk/private.h"
 #include <gdk/gdkkeysyms.h>


@@ -202,7 +202,6 @@ gtk_text_changed_callback( GtkWidget *widget, wxTextCtrl *win )
 
     wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, win->GetId() );
     event.SetEventObject( win );
 
     wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, win->GetId() );
     event.SetEventObject( win );

-    event.SetString( win->GetValue() );

     win->GetEventHandler()->ProcessEvent( event );
 }
 
     win->GetEventHandler()->ProcessEvent( event );
 }
 


@@ -293,13 +292,13 @@ END_EVENT_TABLE()
 void wxTextCtrl::Init()
 {
     m_ignoreNextUpdate =
 void wxTextCtrl::Init()
 {
     m_ignoreNextUpdate =

-    m_modified = FALSE;
-    SetUpdateFont(FALSE);
+    m_modified = false;
+    SetUpdateFont(false);

     m_text =
     m_vScrollbar = (GtkWidget *)NULL;
 #ifdef __WXGTK20__
     m_frozenness = 0;
     m_text =
     m_vScrollbar = (GtkWidget *)NULL;
 #ifdef __WXGTK20__
     m_frozenness = 0;

-#endif 
+#endif

 }
 
 wxTextCtrl::wxTextCtrl( wxWindow *parent,
 }
 
 wxTextCtrl::wxTextCtrl( wxWindow *parent,


@@ -325,18 +324,18 @@ bool wxTextCtrl::Create( wxWindow *parent,
                          const wxValidator& validator,
                          const wxString &name )
 {
                          const wxValidator& validator,
                          const wxString &name )
 {

-    m_needParent = TRUE;
-    m_acceptsFocus = TRUE;
+    m_needParent = true;
+    m_acceptsFocus = true;

 
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {
         wxFAIL_MSG( wxT("wxTextCtrl creation failed") );
 
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {
         wxFAIL_MSG( wxT("wxTextCtrl creation failed") );

-        return FALSE;
+        return false;

     }
 
 
     }
 
 

-    m_vScrollbarVisible = FALSE;
+    m_vScrollbarVisible = false;

 
     bool multi_line = (style & wxTE_MULTILINE) != 0;
 
 
     bool multi_line = (style & wxTE_MULTILINE) != 0;
 


@@ -364,14 +363,14 @@ bool wxTextCtrl::Create( wxWindow *parent,
 
         if (!HasFlag(wxNO_BORDER))
             gtk_scrolled_window_set_shadow_type( GTK_SCROLLED_WINDOW(m_widget), GTK_SHADOW_IN );
 
         if (!HasFlag(wxNO_BORDER))
             gtk_scrolled_window_set_shadow_type( GTK_SCROLLED_WINDOW(m_widget), GTK_SHADOW_IN );

-            
+

         GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS );
 #else
         // create our control ...
         m_text = gtk_text_new( (GtkAdjustment *) NULL, (GtkAdjustment *) NULL );
 
         // ... and put into the upper left hand corner of the table
         GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS );
 #else
         // create our control ...
         m_text = gtk_text_new( (GtkAdjustment *) NULL, (GtkAdjustment *) NULL );
 
         // ... and put into the upper left hand corner of the table

-        bool bHasHScrollbar = FALSE;
+        bool bHasHScrollbar = false;

         m_widget = gtk_table_new(bHasHScrollbar ? 2 : 1, 2, FALSE);
         GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS );
         gtk_table_attach( GTK_TABLE(m_widget), m_text, 0, 1, 0, 1,
         m_widget = gtk_table_new(bHasHScrollbar ? 2 : 1, 2, FALSE);
         GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS );
         gtk_table_attach( GTK_TABLE(m_widget), m_text, 0, 1, 0, 1,


@@ -396,6 +395,11 @@ bool wxTextCtrl::Create( wxWindow *parent,
         // a single-line text control: no need for scrollbars
         m_widget =
         m_text = gtk_entry_new();
         // a single-line text control: no need for scrollbars
         m_widget =
         m_text = gtk_entry_new();

+
+#ifdef __WXGTK20__
+        if (style & wxNO_BORDER)
+            g_object_set( GTK_ENTRY(m_text), "has-frame", FALSE, NULL );
+#endif

     }
 
     m_parent->DoAddChild( this );
     }
 
     m_parent->DoAddChild( this );


@@ -427,7 +431,7 @@ bool wxTextCtrl::Create( wxWindow *parent,
     }
 #endif // GTK+ 1.x
 
     }
 #endif // GTK+ 1.x
 

-    if (!value.IsEmpty())
+    if (!value.empty())

     {
 #ifdef __WXGTK20__
         SetValue( value );
     {
 #ifdef __WXGTK20__
         SetValue( value );


@@ -487,18 +491,21 @@ bool wxTextCtrl::Create( wxWindow *parent,
             gtk_text_view_set_justification( GTK_TEXT_VIEW(m_text), GTK_JUSTIFY_CENTER );
         // Left justify (alignment) is the default and we don't need to apply GTK_JUSTIFY_LEFT
     }
             gtk_text_view_set_justification( GTK_TEXT_VIEW(m_text), GTK_JUSTIFY_CENTER );
         // Left justify (alignment) is the default and we don't need to apply GTK_JUSTIFY_LEFT
     }

-    // gtk_entry_set_alignment was introduced in gtk+-2.3.5
-#if GTK_CHECK_VERSION(2, 3, 5)

     else
     {
     else
     {

-        if (style & wxTE_RIGHT)
-            gtk_entry_set_alignment( GTK_ENTRY(m_text), 1.0 );
-        else if (style & wxTE_CENTRE)
-            gtk_entry_set_alignment( GTK_ENTRY(m_text), 0.5 );
+#ifdef __WXGTK24__
+        // gtk_entry_set_alignment was introduced in gtk+-2.3.5
+        if (!gtk_check_version(2,4,0))
+        {
+            if (style & wxTE_RIGHT)
+                gtk_entry_set_alignment( GTK_ENTRY(m_text), 1.0 );
+            else if (style & wxTE_CENTRE)
+                gtk_entry_set_alignment( GTK_ENTRY(m_text), 0.5 );
+        }
+#endif

     }
     }

-#endif // gtk+-2.3.5

 #endif // __WXGTK20__
 #endif // __WXGTK20__

-    
+

     // We want to be notified about text changes.
 #ifdef __WXGTK20__
     if (multi_line)
     // We want to be notified about text changes.
 #ifdef __WXGTK20__
     if (multi_line)


@@ -508,7 +515,7 @@ bool wxTextCtrl::Create( wxWindow *parent,
     }
     else
 #endif
     }
     else
 #endif

-    
+

     {
         gtk_signal_connect( GTK_OBJECT(m_text), "changed",
             GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
     {
         gtk_signal_connect( GTK_OBJECT(m_text), "changed",
             GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);


@@ -519,7 +526,7 @@ bool wxTextCtrl::Create( wxWindow *parent,
     wxTextAttr attrDef(GetForegroundColour(), GetBackgroundColour(), GetFont());
     SetDefaultStyle( attrDef );
 
     wxTextAttr attrDef(GetForegroundColour(), GetBackgroundColour(), GetFont());
     SetDefaultStyle( attrDef );
 

-    return TRUE;
+    return true;

 }
 
 
 }
 
 


@@ -535,7 +542,7 @@ void wxTextCtrl::CalculateScrollbar()
         if (m_vScrollbarVisible)
         {
             gtk_widget_hide( m_vScrollbar );
         if (m_vScrollbarVisible)
         {
             gtk_widget_hide( m_vScrollbar );

-            m_vScrollbarVisible = FALSE;
+            m_vScrollbarVisible = false;

         }
     }
     else
         }
     }
     else


@@ -543,7 +550,7 @@ void wxTextCtrl::CalculateScrollbar()
         if (!m_vScrollbarVisible)
         {
             gtk_widget_show( m_vScrollbar );
         if (!m_vScrollbarVisible)
         {
             gtk_widget_show( m_vScrollbar );

-            m_vScrollbarVisible = TRUE;
+            m_vScrollbarVisible = true;

         }
     }
 #endif
         }
     }
 #endif


@@ -600,8 +607,7 @@ void wxTextCtrl::SetValue( const wxString &value )
 #else
         wxCharBuffer buffer( wxConvUTF8.cWC2MB( wxConvLocal.cWX2WC( value ) ) );
 #endif
 #else
         wxCharBuffer buffer( wxConvUTF8.cWC2MB( wxConvLocal.cWX2WC( value ) ) );
 #endif

-        GtkTextBuffer *text_buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(m_text) );
-        if (gtk_text_buffer_get_char_count(text_buffer) != 0)
+        if (gtk_text_buffer_get_char_count(m_buffer) != 0)

             IgnoreNextTextUpdate();
 
         gtk_text_buffer_set_text( m_buffer, buffer, strlen(buffer) );
             IgnoreNextTextUpdate();
 
         gtk_text_buffer_set_text( m_buffer, buffer, strlen(buffer) );


@@ -623,7 +629,7 @@ void wxTextCtrl::SetValue( const wxString &value )
     //   customize this behaviour.
     SetInsertionPoint(0);
 
     //   customize this behaviour.
     SetInsertionPoint(0);
 

-    m_modified = FALSE;
+    m_modified = false;

 }
 
 void wxTextCtrl::WriteText( const wxString &text )
 }
 
 void wxTextCtrl::WriteText( const wxString &text )


@@ -677,7 +683,7 @@ void wxTextCtrl::WriteText( const wxString &text )
         // in UpdateFontIfNeeded() any longer
         if ( !text.empty() )
         {
         // in UpdateFontIfNeeded() any longer
         if ( !text.empty() )
         {

-            SetUpdateFont(FALSE);
+            SetUpdateFont(false);

         }
 
         // Bring editable's cursor back uptodate.
         }
 
         // Bring editable's cursor back uptodate.


@@ -779,7 +785,7 @@ bool wxTextCtrl::PositionToXY(long pos, long *x, long *y ) const
 
         // cast to prevent warning. But pos really should've been unsigned.
         if( (unsigned long)pos > text.Len()  )
 
         // cast to prevent warning. But pos really should've been unsigned.
         if( (unsigned long)pos > text.Len()  )

-            return FALSE;
+            return false;

 
         *x=0;   // First Col
         *y=0;   // First Line
 
         *x=0;   // First Col
         *y=0;   // First Line


@@ -806,11 +812,11 @@ bool wxTextCtrl::PositionToXY(long pos, long *x, long *y ) const
         else
         {
             // index out of bounds
         else
         {
             // index out of bounds

-            return FALSE;
+            return false;

         }
     }
 
         }
     }
 

-    return TRUE;
+    return true;

 }
 
 long wxTextCtrl::XYToPosition(long x, long y ) const
 }
 
 long wxTextCtrl::XYToPosition(long x, long y ) const


@@ -951,7 +957,7 @@ bool wxTextCtrl::Enable( bool enable )
     if (!wxWindowBase::Enable(enable))
     {
         // nothing to do
     if (!wxWindowBase::Enable(enable))
     {
         // nothing to do

-        return FALSE;
+        return false;

     }
 
     if (m_windowStyle & wxTE_MULTILINE)
     }
 
     if (m_windowStyle & wxTE_MULTILINE)


@@ -968,7 +974,7 @@ bool wxTextCtrl::Enable( bool enable )
         gtk_widget_set_sensitive( m_text, enable );
     }
 
         gtk_widget_set_sensitive( m_text, enable );
     }
 

-    return TRUE;
+    return true;

 }
 
 // wxGTK-specific: called recursively by Enable,
 }
 
 // wxGTK-specific: called recursively by Enable,


@@ -993,12 +999,12 @@ void wxTextCtrl::OnParentEnable( bool enable )
 
 void wxTextCtrl::MarkDirty()
 {
 
 void wxTextCtrl::MarkDirty()
 {

-    m_modified = TRUE;
+    m_modified = true;

 }
 
 void wxTextCtrl::DiscardEdits()
 {
 }
 
 void wxTextCtrl::DiscardEdits()
 {

-    m_modified = FALSE;
+    m_modified = false;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -1007,19 +1013,19 @@ void wxTextCtrl::DiscardEdits()
 
 void wxTextCtrl::IgnoreNextTextUpdate()
 {
 
 void wxTextCtrl::IgnoreNextTextUpdate()
 {

-    m_ignoreNextUpdate = TRUE;
+    m_ignoreNextUpdate = true;

 }
 
 bool wxTextCtrl::IgnoreTextUpdate()
 {
     if ( m_ignoreNextUpdate )
     {
 }
 
 bool wxTextCtrl::IgnoreTextUpdate()
 {
     if ( m_ignoreNextUpdate )
     {

-        m_ignoreNextUpdate = FALSE;
+        m_ignoreNextUpdate = false;

 
 

-        return TRUE;
+        return true;

     }
 
     }
 

-    return FALSE;
+    return false;

 }
 
 void wxTextCtrl::SetMaxLength(unsigned long len)
 }
 
 void wxTextCtrl::SetMaxLength(unsigned long len)


@@ -1172,7 +1178,7 @@ long wxTextCtrl::GetInsertionPoint() const
     }
 }
 
     }
 }
 

-long wxTextCtrl::GetLastPosition() const
+wxTextPos wxTextCtrl::GetLastPosition() const

 {
     wxCHECK_MSG( m_text != NULL, 0, wxT("invalid text ctrl") );
 
 {
     wxCHECK_MSG( m_text != NULL, 0, wxT("invalid text ctrl") );
 


@@ -1221,7 +1227,7 @@ void wxTextCtrl::Replace( long from, long to, const wxString &value )
 
     Remove( from, to );
 
 
     Remove( from, to );
 

-    if (!value.IsEmpty())
+    if (!value.empty())

     {
 #ifdef __WXGTK20__
         SetInsertionPoint( from );
     {
 #ifdef __WXGTK20__
         SetInsertionPoint( from );


@@ -1291,14 +1297,14 @@ bool wxTextCtrl::CanUndo() const
 {
     // TODO
     //wxFAIL_MSG( wxT("wxTextCtrl::CanUndo not implemented") );
 {
     // TODO
     //wxFAIL_MSG( wxT("wxTextCtrl::CanUndo not implemented") );

-    return FALSE;
+    return false;

 }
 
 bool wxTextCtrl::CanRedo() const
 {
     // TODO
     //wxFAIL_MSG( wxT("wxTextCtrl::CanRedo not implemented") );
 }
 
 bool wxTextCtrl::CanRedo() const
 {
     // TODO
     //wxFAIL_MSG( wxT("wxTextCtrl::CanRedo not implemented") );

-    return FALSE;
+    return false;

 }
 
 // If the return values from and to are the same, there is no
 }
 
 // If the return values from and to are the same, there is no


@@ -1309,7 +1315,7 @@ void wxTextCtrl::GetSelection(long* fromOut, long* toOut) const
 
     gint from = -1;
     gint to = -1;
 
     gint from = -1;
     gint to = -1;

-    bool haveSelection = FALSE;
+    bool haveSelection = false;

 
 #ifdef __WXGTK20__
      if (m_windowStyle & wxTE_MULTILINE)
 
 #ifdef __WXGTK20__
      if (m_windowStyle & wxTE_MULTILINE)


@@ -1317,7 +1323,7 @@ void wxTextCtrl::GetSelection(long* fromOut, long* toOut) const
          GtkTextIter ifrom, ito;
          if ( gtk_text_buffer_get_selection_bounds(m_buffer, &ifrom, &ito) )
          {
          GtkTextIter ifrom, ito;
          if ( gtk_text_buffer_get_selection_bounds(m_buffer, &ifrom, &ito) )
          {

-             haveSelection = TRUE;
+             haveSelection = true;

              from = gtk_text_iter_get_offset(&ifrom);
              to = gtk_text_iter_get_offset(&ito);
          }
              from = gtk_text_iter_get_offset(&ifrom);
              to = gtk_text_iter_get_offset(&ito);
          }


@@ -1327,13 +1333,13 @@ void wxTextCtrl::GetSelection(long* fromOut, long* toOut) const
          if ( gtk_editable_get_selection_bounds( GTK_EDITABLE(m_text),
                                                  &from, &to) )
          {
          if ( gtk_editable_get_selection_bounds( GTK_EDITABLE(m_text),
                                                  &from, &to) )
          {

-             haveSelection = TRUE;
+             haveSelection = true;

          }
      }
 #else //  not GTK2
      if ( (GTK_EDITABLE(m_text)->has_selection) )
      {
          }
      }
 #else //  not GTK2
      if ( (GTK_EDITABLE(m_text)->has_selection) )
      {

-         haveSelection = TRUE;
+         haveSelection = true;

          from = (long) GTK_EDITABLE(m_text)->selection_start_pos;
          to = (long) GTK_EDITABLE(m_text)->selection_end_pos;
      }
          from = (long) GTK_EDITABLE(m_text)->selection_start_pos;
          to = (long) GTK_EDITABLE(m_text)->selection_end_pos;
      }


@@ -1359,7 +1365,7 @@ void wxTextCtrl::GetSelection(long* fromOut, long* toOut) const
 
 bool wxTextCtrl::IsEditable() const
 {
 
 bool wxTextCtrl::IsEditable() const
 {

-    wxCHECK_MSG( m_text != NULL, FALSE, wxT("invalid text ctrl") );
+    wxCHECK_MSG( m_text != NULL, false, wxT("invalid text ctrl") );

 
 #ifdef __WXGTK20__
     if (m_windowStyle & wxTE_MULTILINE)
 
 #ifdef __WXGTK20__
     if (m_windowStyle & wxTE_MULTILINE)


@@ -1445,24 +1451,24 @@ bool wxTextCtrl::IsOwnGtkWindow( GdkWindow *window )
 // the font will change for subsequent text insertiongs
 bool wxTextCtrl::SetFont( const wxFont &font )
 {
 // the font will change for subsequent text insertiongs
 bool wxTextCtrl::SetFont( const wxFont &font )
 {

-    wxCHECK_MSG( m_text != NULL, FALSE, wxT("invalid text ctrl") );
+    wxCHECK_MSG( m_text != NULL, false, wxT("invalid text ctrl") );

 
     if ( !wxTextCtrlBase::SetFont(font) )
     {
         // font didn't change, nothing to do
 
     if ( !wxTextCtrlBase::SetFont(font) )
     {
         // font didn't change, nothing to do

-        return FALSE;
+        return false;

     }
 
     if ( m_windowStyle & wxTE_MULTILINE )
     {
     }
 
     if ( m_windowStyle & wxTE_MULTILINE )
     {

-        SetUpdateFont(TRUE);
+        SetUpdateFont(true);

 
         m_defaultStyle.SetFont(font);
 
         ChangeFontGlobally();
     }
 
 
         m_defaultStyle.SetFont(font);
 
         ChangeFontGlobally();
     }
 

-    return TRUE;
+    return true;

 }
 
 void wxTextCtrl::ChangeFontGlobally()
 }
 
 void wxTextCtrl::ChangeFontGlobally()


@@ -1481,9 +1487,9 @@ void wxTextCtrl::ChangeFontGlobally()
 #endif
 
     wxString value = GetValue();
 #endif
 
     wxString value = GetValue();

-    if ( !value.IsEmpty() )
+    if ( !value.empty() )

     {
     {

-        SetUpdateFont(FALSE);
+        SetUpdateFont(false);

 
         Clear();
         AppendText(value);
 
         Clear();
         AppendText(value);


@@ -1503,35 +1509,35 @@ void wxTextCtrl::UpdateFontIfNeeded()
 bool wxTextCtrl::SetForegroundColour(const wxColour& colour)
 {
     if ( !wxControl::SetForegroundColour(colour) )
 bool wxTextCtrl::SetForegroundColour(const wxColour& colour)
 {
     if ( !wxControl::SetForegroundColour(colour) )

-        return FALSE;
+        return false;

 
     // update default fg colour too
     m_defaultStyle.SetTextColour(colour);
 
 
     // update default fg colour too
     m_defaultStyle.SetTextColour(colour);
 

-    return TRUE;
+    return true;

 }
 
 bool wxTextCtrl::SetBackgroundColour( const wxColour &colour )
 {
 }
 
 bool wxTextCtrl::SetBackgroundColour( const wxColour &colour )
 {

-    wxCHECK_MSG( m_text != NULL, FALSE, wxT("invalid text ctrl") );
+    wxCHECK_MSG( m_text != NULL, false, wxT("invalid text ctrl") );

 
     if ( !wxControl::SetBackgroundColour( colour ) )
 
     if ( !wxControl::SetBackgroundColour( colour ) )

-        return FALSE;
+        return false;

 
 #ifndef __WXGTK20__
     if (!m_widget->window)
 
 #ifndef __WXGTK20__
     if (!m_widget->window)

-        return FALSE;
+        return false;

 #endif
 
     if (!m_backgroundColour.Ok())
 #endif
 
     if (!m_backgroundColour.Ok())

-        return FALSE;
+        return false;

 
     if (m_windowStyle & wxTE_MULTILINE)
     {
 #ifndef __WXGTK20__
         GdkWindow *window = GTK_TEXT(m_text)->text_area;
         if (!window)
 
     if (m_windowStyle & wxTE_MULTILINE)
     {
 #ifndef __WXGTK20__
         GdkWindow *window = GTK_TEXT(m_text)->text_area;
         if (!window)

-            return FALSE;
+            return false;

         m_backgroundColour.CalcPixel( gdk_window_get_colormap( window ) );
         gdk_window_set_background( window, m_backgroundColour.GetColor() );
         gdk_window_clear( window );
         m_backgroundColour.CalcPixel( gdk_window_get_colormap( window ) );
         gdk_window_set_background( window, m_backgroundColour.GetColor() );
         gdk_window_clear( window );


@@ -1541,7 +1547,7 @@ bool wxTextCtrl::SetBackgroundColour( const wxColour &colour )
     // change active background color too
     m_defaultStyle.SetBackgroundColour( colour );
 
     // change active background color too
     m_defaultStyle.SetBackgroundColour( colour );
 

-    return TRUE;
+    return true;

 }
 
 bool wxTextCtrl::SetStyle( long start, long end, const wxTextAttr& style )
 }
 
 bool wxTextCtrl::SetStyle( long start, long end, const wxTextAttr& style )


@@ -1551,12 +1557,12 @@ bool wxTextCtrl::SetStyle( long start, long end, const wxTextAttr& style )
         if ( style.IsDefault() )
         {
             // nothing to do
         if ( style.IsDefault() )
         {
             // nothing to do

-            return TRUE;
+            return true;

         }
 #ifdef __WXGTK20__
         gint l = gtk_text_buffer_get_char_count( m_buffer );
 
         }
 #ifdef __WXGTK20__
         gint l = gtk_text_buffer_get_char_count( m_buffer );
 

-        wxCHECK_MSG( start >= 0 && end <= l, FALSE,
+        wxCHECK_MSG( start >= 0 && end <= l, false,

                      _T("invalid range in wxTextCtrl::SetStyle") );
 
         GtkTextIter starti, endi;
                      _T("invalid range in wxTextCtrl::SetStyle") );
 
         GtkTextIter starti, endi;


@@ -1570,14 +1576,14 @@ bool wxTextCtrl::SetStyle( long start, long end, const wxTextAttr& style )
 
         wxGtkTextApplyTagsFromAttr( m_buffer, attr, &starti, &endi );
 
 
         wxGtkTextApplyTagsFromAttr( m_buffer, attr, &starti, &endi );
 

-         return TRUE;
+        return true;

 #else
         // VERY dirty way to do that - removes the required text and re-adds it
         // with styling (FIXME)
 
         gint l = gtk_text_get_length( GTK_TEXT(m_text) );
 
 #else
         // VERY dirty way to do that - removes the required text and re-adds it
         // with styling (FIXME)
 
         gint l = gtk_text_get_length( GTK_TEXT(m_text) );
 

-        wxCHECK_MSG( start >= 0 && end <= l, FALSE,
+        wxCHECK_MSG( start >= 0 && end <= l, false,

                      _T("invalid range in wxTextCtrl::SetStyle") );
 
         gint old_pos = gtk_editable_get_position( GTK_EDITABLE(m_text) );
                      _T("invalid range in wxTextCtrl::SetStyle") );
 
         gint old_pos = gtk_editable_get_position( GTK_EDITABLE(m_text) );


@@ -1609,12 +1615,12 @@ bool wxTextCtrl::SetStyle( long start, long end, const wxTextAttr& style )
         gtk_editable_set_position( GTK_EDITABLE(m_text), old_pos ); */
         SetInsertionPoint( old_pos );
 #endif
         gtk_editable_set_position( GTK_EDITABLE(m_text), old_pos ); */
         SetInsertionPoint( old_pos );
 #endif

-        return TRUE;
+        return true;

     }
     else // singe line
     {
         // cannot do this for GTK+'s Entry widget
     }
     else // singe line
     {
         // cannot do this for GTK+'s Entry widget

-        return FALSE;
+        return false;

     }
 }
 
     }
 }
 


@@ -1802,7 +1808,7 @@ bool wxTextCtrl::DoScroll(GtkAdjustment *adj, int diff)
     if ( fabs(adj->value - value) < 0.2 )
     {
         // well, this is what Robert does in wxScrollBar, so it must be good...
     if ( fabs(adj->value - value) < 0.2 )
     {
         // well, this is what Robert does in wxScrollBar, so it must be good...

-        return FALSE;
+        return false;

     }
 
     adj->value = value;
     }
 
     adj->value = value;


@@ -1813,14 +1819,14 @@ bool wxTextCtrl::DoScroll(GtkAdjustment *adj, int diff)
     gtk_signal_emit_by_name(GTK_OBJECT(adj), "value_changed");
 #endif
 
     gtk_signal_emit_by_name(GTK_OBJECT(adj), "value_changed");
 #endif
 

-    return TRUE;
+    return true;

 }
 
 bool wxTextCtrl::ScrollLines(int lines)
 {
     GtkAdjustment *adj = GetVAdj();
     if ( !adj )
 }
 
 bool wxTextCtrl::ScrollLines(int lines)
 {
     GtkAdjustment *adj = GetVAdj();
     if ( !adj )

-        return FALSE;
+        return false;

 
 #ifdef __WXGTK20__
     int diff = (int)ceil(lines*adj->step_increment);
 
 #ifdef __WXGTK20__
     int diff = (int)ceil(lines*adj->step_increment);


@@ -1836,7 +1842,7 @@ bool wxTextCtrl::ScrollPages(int pages)
 {
     GtkAdjustment *adj = GetVAdj();
     if ( !adj )
 {
     GtkAdjustment *adj = GetVAdj();
     if ( !adj )

-        return FALSE;
+        return false;

 
     return DoScroll(adj, (int)ceil(pages*adj->page_increment));
 }
 
     return DoScroll(adj, (int)ceil(pages*adj->page_increment));
 }