TRUE/FALSE source cleaning.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38053 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-03-13 10:04:15 +00:00
parent b7e37e558d
commit caf6e6dee8
5 changed files with 107 additions and 115 deletions

View File

@@ -32,7 +32,7 @@ public:
const wxString& name = wxListBoxNameStr ) const wxString& name = wxListBoxNameStr )
{ {
#if wxUSE_CHECKLISTBOX #if wxUSE_CHECKLISTBOX
m_hasCheckBoxes = FALSE; m_hasCheckBoxes = false;
#endif // wxUSE_CHECKLISTBOX #endif // wxUSE_CHECKLISTBOX
Create(parent, id, pos, size, n, choices, style, validator, name); Create(parent, id, pos, size, n, choices, style, validator, name);
} }
@@ -45,7 +45,7 @@ public:
const wxString& name = wxListBoxNameStr ) const wxString& name = wxListBoxNameStr )
{ {
#if wxUSE_CHECKLISTBOX #if wxUSE_CHECKLISTBOX
m_hasCheckBoxes = FALSE; m_hasCheckBoxes = false;
#endif // wxUSE_CHECKLISTBOX #endif // wxUSE_CHECKLISTBOX
Create(parent, id, pos, size, choices, style, validator, name); Create(parent, id, pos, size, choices, style, validator, name);
} }

View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: checklst.cpp // Name: src/gtk/checklst.cpp
// Purpose: // Purpose:
// Author: Robert Roebling // Author: Robert Roebling
// Modified by: Ryan Norton (Native GTK2.0+ checklist) // Modified by: Ryan Norton (Native GTK2.0+ checklist)
@@ -11,8 +11,6 @@
// For compilers that support precompilation, includes "wx.h". // For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h" #include "wx/wxprec.h"
#include "wx/defs.h"
#if wxUSE_CHECKLISTBOX #if wxUSE_CHECKLISTBOX
#include "wx/checklst.h" #include "wx/checklst.h"
@@ -53,7 +51,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox,wxListBox)
wxCheckListBox::wxCheckListBox() : wxListBox() wxCheckListBox::wxCheckListBox() : wxListBox()
{ {
m_hasCheckBoxes = TRUE; m_hasCheckBoxes = true;
} }
wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id, wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id,
@@ -65,7 +63,7 @@ wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id,
const wxValidator& validator, const wxValidator& validator,
const wxString& name ) const wxString& name )
{ {
m_hasCheckBoxes = TRUE; m_hasCheckBoxes = true;
wxListBox::Create( parent, id, pos, size, nStrings, choices, style, validator, name ); wxListBox::Create( parent, id, pos, size, nStrings, choices, style, validator, name );
} }
@@ -77,7 +75,7 @@ wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id,
const wxValidator& validator, const wxValidator& validator,
const wxString& name ) const wxString& name )
{ {
m_hasCheckBoxes = TRUE; m_hasCheckBoxes = true;
wxListBox::Create( parent, id, pos, size, choices, wxListBox::Create( parent, id, pos, size, choices,
style, validator, name ); style, validator, name );
} }
@@ -160,7 +158,7 @@ int wxCheckListBox::GetItemHeight() const
bool wxCheckListBox::IsChecked( int index ) const bool wxCheckListBox::IsChecked( int index ) const
{ {
wxCHECK_MSG( m_treeview != NULL, FALSE, wxT("invalid checklistbox") ); wxCHECK_MSG( m_treeview != NULL, false, wxT("invalid checklistbox") );
GtkTreeEntry* entry = GtkGetEntry(index); GtkTreeEntry* entry = GtkGetEntry(index);
if (entry) if (entry)
@@ -171,7 +169,7 @@ bool wxCheckListBox::IsChecked( int index ) const
} }
wxFAIL_MSG(wxT("wrong checklistbox index")); wxFAIL_MSG(wxT("wrong checklistbox index"));
return FALSE; return false;
} }
void wxCheckListBox::Check( int index, bool check ) void wxCheckListBox::Check( int index, bool check )

View File

@@ -11,8 +11,6 @@
// For compilers that support precompilation, includes "wx.h". // For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h" #include "wx/wxprec.h"
#include "wx/defs.h"
#if wxUSE_LISTBOX #if wxUSE_LISTBOX
#include "wx/listbox.h" #include "wx/listbox.h"
@@ -140,7 +138,7 @@ gtk_listbox_row_activated_callback(GtkTreeView *treeview,
((listbox->GetWindowStyleFlag() & wxLB_EXTENDED) != 0)) ) ((listbox->GetWindowStyleFlag() & wxLB_EXTENDED) != 0)) )
{ {
//toggle the selection + send event //toggle the selection + send event
listbox->GtkSetSelection(sel, !listbox->IsSelected( sel ), FALSE); listbox->GtkSetSelection(sel, !listbox->IsSelected( sel ), false);
} }
} }
} }
@@ -207,7 +205,7 @@ gtk_listbox_key_press_callback( GtkWidget *widget,
if (g_blockEventsOnDrag) return FALSE; if (g_blockEventsOnDrag) return FALSE;
bool ret = FALSE; bool ret = false;
if ((gdk_event->keyval == GDK_Tab) || (gdk_event->keyval == GDK_ISO_Left_Tab)) if ((gdk_event->keyval == GDK_Tab) || (gdk_event->keyval == GDK_ISO_Left_Tab))
{ {
@@ -223,7 +221,7 @@ gtk_listbox_key_press_callback( GtkWidget *widget,
if ((gdk_event->keyval == GDK_Return) && (!ret)) if ((gdk_event->keyval == GDK_Return) && (!ret))
{ {
// eat return in all modes (RN:WHY?) // eat return in all modes (RN:WHY?)
ret = TRUE; ret = true;
} }
// Check or uncheck item with SPACE // Check or uncheck item with SPACE
@@ -288,7 +286,7 @@ static gboolean gtk_listitem_select_cb( GtkTreeSelection* selection,
{ {
//Now, as mentioned above, we manually select the row that is/was going //Now, as mentioned above, we manually select the row that is/was going
//to be selected anyway by GTK //to be selected anyway by GTK
listbox->m_blockEvent = TRUE; //if we don't block events we will lock the listbox->m_blockEvent = true; //if we don't block events we will lock the
//app due to recursion!! //app due to recursion!!
GtkTreeSelection* selection = GtkTreeSelection* selection =
@@ -297,7 +295,7 @@ static gboolean gtk_listitem_select_cb( GtkTreeSelection* selection,
gtk_tree_model_get_iter(GTK_TREE_MODEL(listbox->m_liststore), &iter, path); gtk_tree_model_get_iter(GTK_TREE_MODEL(listbox->m_liststore), &iter, path);
gtk_tree_selection_select_iter(selection, &iter); gtk_tree_selection_select_iter(selection, &iter);
listbox->m_blockEvent = FALSE; listbox->m_blockEvent = false;
//Finally, send the wx event //Finally, send the wx event
wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, listbox->GetId() ); wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, listbox->GetId() );
@@ -423,7 +421,7 @@ void wxListBox::Init()
{ {
m_treeview = (GtkTreeView*) NULL; m_treeview = (GtkTreeView*) NULL;
#if wxUSE_CHECKLISTBOX #if wxUSE_CHECKLISTBOX
m_hasCheckBoxes = FALSE; m_hasCheckBoxes = false;
#endif // wxUSE_CHECKLISTBOX #endif // wxUSE_CHECKLISTBOX
m_spacePressed = false; m_spacePressed = false;
} }
@@ -446,15 +444,15 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
long style, const wxValidator& validator, long style, const wxValidator& validator,
const wxString &name ) const wxString &name )
{ {
m_needParent = TRUE; m_needParent = true;
m_acceptsFocus = TRUE; m_acceptsFocus = true;
m_blockEvent = FALSE; m_blockEvent = false;
if (!PreCreation( parent, pos, size ) || if (!PreCreation( parent, pos, size ) ||
!CreateBase( parent, id, pos, size, style, validator, name )) !CreateBase( parent, id, pos, size, style, validator, name ))
{ {
wxFAIL_MSG( wxT("wxListBox creation failed") ); wxFAIL_MSG( wxT("wxListBox creation failed") );
return FALSE; return false;
} }
m_widget = gtk_scrolled_window_new( (GtkAdjustment*) NULL, (GtkAdjustment*) NULL ); m_widget = gtk_scrolled_window_new( (GtkAdjustment*) NULL, (GtkAdjustment*) NULL );
@@ -578,12 +576,12 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
PostCreation(size); PostCreation(size);
SetBestSize(size); // need this too because this is a wxControlWithItems SetBestSize(size); // need this too because this is a wxControlWithItems
return TRUE; return true;
} }
wxListBox::~wxListBox() wxListBox::~wxListBox()
{ {
m_hasVMT = FALSE; m_hasVMT = false;
Clear(); Clear();
} }
@@ -817,7 +815,7 @@ void wxListBox::SetString( int n, const wxString &string )
aItems.Add(label); aItems.Add(label);
GtkInsertItems(aItems, &userdata, n); GtkInsertItems(aItems, &userdata, n);
if (bWasSelected) if (bWasSelected)
wxListBox::GtkSetSelection(n, TRUE, TRUE); wxListBox::GtkSetSelection(n, true, true);
} }
wxString wxListBox::GetString( int n ) const wxString wxListBox::GetString( int n ) const
@@ -919,7 +917,7 @@ int wxListBox::GetSelections( wxArrayInt& aSelections ) const
bool wxListBox::IsSelected( int n ) const bool wxListBox::IsSelected( int n ) const
{ {
wxCHECK_MSG( m_treeview != NULL, FALSE, wxT("invalid listbox") ); wxCHECK_MSG( m_treeview != NULL, false, wxT("invalid listbox") );
GtkTreeSelection* selection = gtk_tree_view_get_selection(m_treeview); GtkTreeSelection* selection = gtk_tree_view_get_selection(m_treeview);
@@ -929,14 +927,14 @@ bool wxListBox::IsSelected( int n ) const
&iter, NULL, //NULL = parent = get first &iter, NULL, //NULL = parent = get first
n ); n );
wxCHECK_MSG( res, FALSE, wxT("Invalid index") ); wxCHECK_MSG( res, false, wxT("Invalid index") );
return gtk_tree_selection_iter_is_selected(selection, &iter); return gtk_tree_selection_iter_is_selected(selection, &iter);
} }
void wxListBox::DoSetSelection( int n, bool select ) void wxListBox::DoSetSelection( int n, bool select )
{ {
return GtkSetSelection(n, select, TRUE); //docs say no events here return GtkSetSelection(n, select, true); //docs say no events here
} }
void wxListBox::GtkSetSelection(int n, const bool select, const bool blockEvent) void wxListBox::GtkSetSelection(int n, const bool select, const bool blockEvent)
@@ -960,7 +958,7 @@ void wxListBox::GtkSetSelection(int n, const bool select, const bool blockEvent)
else else
gtk_tree_selection_unselect_iter(selection, &iter); gtk_tree_selection_unselect_iter(selection, &iter);
m_blockEvent = FALSE; m_blockEvent = false;
} }
void wxListBox::DoSetFirstItem( int n ) void wxListBox::DoSetFirstItem( int n )

View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: checklst.cpp // Name: src/gtk1/checklst.cpp
// Purpose: // Purpose:
// Author: Robert Roebling // Author: Robert Roebling
// Id: $Id$ // Id: $Id$
@@ -10,8 +10,6 @@
// For compilers that support precompilation, includes "wx.h". // For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h" #include "wx/wxprec.h"
#include "wx/defs.h"
#if wxUSE_CHECKLISTBOX #if wxUSE_CHECKLISTBOX
#include "wx/checklst.h" #include "wx/checklst.h"
@@ -28,7 +26,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox,wxListBox)
wxCheckListBox::wxCheckListBox() : wxListBox() wxCheckListBox::wxCheckListBox() : wxListBox()
{ {
m_hasCheckBoxes = TRUE; m_hasCheckBoxes = true;
} }
wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id, wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id,
@@ -40,7 +38,7 @@ wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id,
const wxValidator& validator, const wxValidator& validator,
const wxString& name ) const wxString& name )
{ {
m_hasCheckBoxes = TRUE; m_hasCheckBoxes = true;
wxListBox::Create( parent, id, pos, size, nStrings, choices, style, validator, name ); wxListBox::Create( parent, id, pos, size, nStrings, choices, style, validator, name );
} }
@@ -52,14 +50,14 @@ wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id,
const wxValidator& validator, const wxValidator& validator,
const wxString& name ) const wxString& name )
{ {
m_hasCheckBoxes = TRUE; m_hasCheckBoxes = true;
wxListBox::Create( parent, id, pos, size, choices, wxListBox::Create( parent, id, pos, size, choices,
style, validator, name ); style, validator, name );
} }
bool wxCheckListBox::IsChecked( int index ) const bool wxCheckListBox::IsChecked( int index ) const
{ {
wxCHECK_MSG( m_list != NULL, FALSE, wxT("invalid checklistbox") ); wxCHECK_MSG( m_list != NULL, false, wxT("invalid checklistbox") );
GList *child = g_list_nth( m_list->children, index ); GList *child = g_list_nth( m_list->children, index );
if (child) if (child)
@@ -73,7 +71,7 @@ bool wxCheckListBox::IsChecked( int index ) const
} }
wxFAIL_MSG(wxT("wrong checklistbox index")); wxFAIL_MSG(wxT("wrong checklistbox index"));
return FALSE; return false;
} }
void wxCheckListBox::Check( int index, bool check ) void wxCheckListBox::Check( int index, bool check )

View File

@@ -10,8 +10,6 @@
// For compilers that support precompilation, includes "wx.h". // For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h" #include "wx/wxprec.h"
#include "wx/defs.h"
#if wxUSE_LISTBOX #if wxUSE_LISTBOX
#include "wx/listbox.h" #include "wx/listbox.h"
@@ -49,7 +47,7 @@ extern wxWindowGTK *g_delayedFocus;
extern wxWindowGTK *g_focusWindow; extern wxWindowGTK *g_focusWindow;
extern wxWindowGTK *g_focusWindowLast; extern wxWindowGTK *g_focusWindowLast;
static bool g_hasDoubleClicked = FALSE; static bool g_hasDoubleClicked = false;
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// idle callback for SetFirstItem // idle callback for SetFirstItem
@@ -105,7 +103,7 @@ static gint gtk_listitem_focus_in_callback( GtkWidget *widget,
if ( !win->m_hasFocus ) if ( !win->m_hasFocus )
{ {
// not yet, notify it // not yet, notify it
win->m_hasFocus = TRUE; win->m_hasFocus = true;
wxChildFocusEvent eventChildFocus(win); wxChildFocusEvent eventChildFocus(win);
(void)win->GetEventHandler()->ProcessEvent(eventChildFocus); (void)win->GetEventHandler()->ProcessEvent(eventChildFocus);
@@ -136,7 +134,7 @@ static gint gtk_listitem_focus_out_callback( GtkWidget *widget, GdkEventFocus *g
// have focus already // have focus already
if ( win->m_hasFocus ) if ( win->m_hasFocus )
{ {
win->m_hasFocus = FALSE; win->m_hasFocus = false;
wxFocusEvent event( wxEVT_KILL_FOCUS, win->GetId() ); wxFocusEvent event( wxEVT_KILL_FOCUS, win->GetId() );
event.SetEventObject( win ); event.SetEventObject( win );
@@ -241,14 +239,14 @@ gtk_listbox_button_press_callback( GtkWidget *widget,
(((listbox->GetWindowStyleFlag() & wxLB_MULTIPLE) != 0) || (((listbox->GetWindowStyleFlag() & wxLB_MULTIPLE) != 0) ||
((listbox->GetWindowStyleFlag() & wxLB_EXTENDED) != 0)) ) ((listbox->GetWindowStyleFlag() & wxLB_EXTENDED) != 0)) )
{ {
listbox->m_blockEvent = TRUE; listbox->m_blockEvent = true;
int i; int i;
for (i = 0; i < (int)listbox->GetCount(); i++) for (i = 0; i < (int)listbox->GetCount(); i++)
if (i != sel) if (i != sel)
gtk_list_unselect_item( GTK_LIST(listbox->m_list), i ); gtk_list_unselect_item( GTK_LIST(listbox->m_list), i );
listbox->m_blockEvent = FALSE; listbox->m_blockEvent = false;
return false; return false;
} }
@@ -274,7 +272,7 @@ gtk_listbox_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxLis
if (g_blockEventsOnDrag) if (g_blockEventsOnDrag)
return FALSE; return FALSE;
bool ret = FALSE; bool ret = false;
if ((gdk_event->keyval == GDK_Tab) || (gdk_event->keyval == GDK_ISO_Left_Tab)) if ((gdk_event->keyval == GDK_Tab) || (gdk_event->keyval == GDK_ISO_Left_Tab))
{ {
@@ -290,7 +288,7 @@ gtk_listbox_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxLis
if ((gdk_event->keyval == GDK_Return) && (!ret)) if ((gdk_event->keyval == GDK_Return) && (!ret))
{ {
// eat return in all modes // eat return in all modes
ret = TRUE; ret = true;
} }
#if wxUSE_CHECKLISTBOX #if wxUSE_CHECKLISTBOX
@@ -318,7 +316,7 @@ gtk_listbox_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxLis
if (sel != -1) if (sel != -1)
{ {
ret = TRUE; ret = true;
if (listbox->IsSelected( sel )) if (listbox->IsSelected( sel ))
gtk_list_unselect_item( listbox->m_list, sel ); gtk_list_unselect_item( listbox->m_list, sel );
@@ -458,7 +456,7 @@ wxListBox::wxListBox()
{ {
m_list = (GtkList *) NULL; m_list = (GtkList *) NULL;
#if wxUSE_CHECKLISTBOX #if wxUSE_CHECKLISTBOX
m_hasCheckBoxes = FALSE; m_hasCheckBoxes = false;
#endif // wxUSE_CHECKLISTBOX #endif // wxUSE_CHECKLISTBOX
} }
@@ -480,16 +478,16 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
long style, const wxValidator& validator, long style, const wxValidator& validator,
const wxString &name ) const wxString &name )
{ {
m_needParent = TRUE; m_needParent = true;
m_acceptsFocus = TRUE; m_acceptsFocus = true;
m_prevSelection = 0; // or -1 ?? m_prevSelection = 0; // or -1 ??
m_blockEvent = FALSE; m_blockEvent = false;
if (!PreCreation( parent, pos, size ) || if (!PreCreation( parent, pos, size ) ||
!CreateBase( parent, id, pos, size, style, validator, name )) !CreateBase( parent, id, pos, size, style, validator, name ))
{ {
wxFAIL_MSG( wxT("wxListBox creation failed") ); wxFAIL_MSG( wxT("wxListBox creation failed") );
return FALSE; return false;
} }
m_widget = gtk_scrolled_window_new( (GtkAdjustment*) NULL, (GtkAdjustment*) NULL ); m_widget = gtk_scrolled_window_new( (GtkAdjustment*) NULL, (GtkAdjustment*) NULL );
@@ -558,12 +556,12 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
PostCreation(size); PostCreation(size);
SetBestSize(size); // need this too because this is a wxControlWithItems SetBestSize(size); // need this too because this is a wxControlWithItems
return TRUE; return true;
} }
wxListBox::~wxListBox() wxListBox::~wxListBox()
{ {
m_hasVMT = FALSE; m_hasVMT = false;
Clear(); Clear();
@@ -787,7 +785,7 @@ void wxListBox::Clear()
{ {
// destroy the data (due to Robert's idea of using wxList<wxObject> // destroy the data (due to Robert's idea of using wxList<wxObject>
// and not wxList<wxClientData> we can't just say // and not wxList<wxClientData> we can't just say
// m_clientList.DeleteContents(TRUE) - this would crash! // m_clientList.DeleteContents(true) - this would crash!
wxList::compatibility_iterator node = m_clientList.GetFirst(); wxList::compatibility_iterator node = m_clientList.GetFirst();
while ( node ) while ( node )
{ {
@@ -1019,11 +1017,11 @@ int wxListBox::GetSelections( wxArrayInt& aSelections ) const
bool wxListBox::IsSelected( int n ) const bool wxListBox::IsSelected( int n ) const
{ {
wxCHECK_MSG( m_list != NULL, FALSE, wxT("invalid listbox") ); wxCHECK_MSG( m_list != NULL, false, wxT("invalid listbox") );
GList *target = g_list_nth( m_list->children, n ); GList *target = g_list_nth( m_list->children, n );
wxCHECK_MSG( target, FALSE, wxT("invalid listbox index") ); wxCHECK_MSG( target, false, wxT("invalid listbox index") );
return (GTK_WIDGET(target->data)->state == GTK_STATE_SELECTED) ; return (GTK_WIDGET(target->data)->state == GTK_STATE_SELECTED) ;
} }
@@ -1032,7 +1030,7 @@ void wxListBox::DoSetSelection( int n, bool select )
{ {
wxCHECK_RET( m_list != NULL, wxT("invalid listbox") ); wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
m_blockEvent = TRUE; m_blockEvent = true;
if (select) if (select)
{ {
@@ -1044,7 +1042,7 @@ void wxListBox::DoSetSelection( int n, bool select )
else else
gtk_list_unselect_item( m_list, n ); gtk_list_unselect_item( m_list, n );
m_blockEvent = FALSE; m_blockEvent = false;
} }
void wxListBox::DoSetFirstItem( int n ) void wxListBox::DoSetFirstItem( int n )
@@ -1124,22 +1122,22 @@ GtkWidget *wxListBox::GetConnectWidget()
bool wxListBox::IsOwnGtkWindow( GdkWindow *window ) bool wxListBox::IsOwnGtkWindow( GdkWindow *window )
{ {
return TRUE; return true;
#if 0 #if 0
if (m_widget->window == window) return TRUE; if (m_widget->window == window) return true;
if (GTK_WIDGET(m_list)->window == window) return TRUE; if (GTK_WIDGET(m_list)->window == window) return true;
GList *child = m_list->children; GList *child = m_list->children;
while (child) while (child)
{ {
GtkWidget *bin = GTK_WIDGET( child->data ); GtkWidget *bin = GTK_WIDGET( child->data );
if (bin->window == window) return TRUE; if (bin->window == window) return true;
child = child->next; child = child->next;
} }
return FALSE; return false;
#endif #endif
} }