Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

TRUE/FALSE source cleaning.

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

28
src/gtk/checklst.cpp
View File

@@ -1,8 +1,8 @@
/////////////////////////////////////////////////////////////////////////////
// Name: checklst.cpp
// Name: src/gtk/checklst.cpp
// Purpose:
// Author: Robert Roebling
// Modified by: Ryan Norton (Native GTK2.0+ checklist)
// Modified by: Ryan Norton (Native GTK2.0+ checklist)
// Id: $Id$
// Copyright: (c) 1998 Robert Roebling
// Licence: wxWindows licence
@@ -11,8 +11,6 @@
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#include "wx/defs.h"
#if wxUSE_CHECKLISTBOX
#include "wx/checklst.h"
@@ -34,13 +32,13 @@ static void gtk_checklist_toggled(GtkCellRendererToggle *renderer,
wxCHECK_RET( listbox->m_treeview != NULL, wxT("invalid listbox") );
GtkTreePath* path = gtk_tree_path_new_from_string(stringpath);
wxCommandEvent new_event( wxEVT_COMMAND_CHECKLISTBOX_TOGGLED,
wxCommandEvent new_event( wxEVT_COMMAND_CHECKLISTBOX_TOGGLED,
listbox->GetId() );
new_event.SetEventObject( listbox );
new_event.SetInt( gtk_tree_path_get_indices(path)[0] );
gtk_tree_path_free(path);
listbox->Check( new_event.GetInt(), !listbox->IsChecked(new_event.GetInt()));
listbox->GetEventHandler()->ProcessEvent( new_event );
listbox->GetEventHandler()->ProcessEvent( new_event );
}
}
#endif
@@ -53,7 +51,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox,wxListBox)
wxCheckListBox::wxCheckListBox() : wxListBox()
{
m_hasCheckBoxes = TRUE;
m_hasCheckBoxes = true;
}
wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id,
@@ -65,7 +63,7 @@ wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id,
const wxValidator& validator,
const wxString& name )
{
m_hasCheckBoxes = TRUE;
m_hasCheckBoxes = true;
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 wxString& name )
{
m_hasCheckBoxes = TRUE;
m_hasCheckBoxes = true;
wxListBox::Create( parent, id, pos, size, choices,
style, validator, name );
}
@@ -86,9 +84,9 @@ wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id,
void wxCheckListBox::DoCreateCheckList()
{
//Create the checklist in our treeview and set up events for it
GtkCellRenderer* renderer =
GtkCellRenderer* renderer =
gtk_cell_renderer_toggle_new();
GtkTreeViewColumn* column =
GtkTreeViewColumn* column =
gtk_tree_view_column_new_with_attributes( "", renderer,
"active", 0,
NULL );
@@ -120,7 +118,7 @@ bool wxCheckListBox::IsChecked( int index ) const
gtk_tree_model_get_value(GTK_TREE_MODEL(m_liststore),
&iter,
0, //column
&value);
&value);
return g_value_get_boolean(&value) == TRUE ? true : false;
}
@@ -141,7 +139,7 @@ void wxCheckListBox::Check( int index, bool check )
gtk_list_store_set(m_liststore,
&iter,
0, //column
check ? TRUE : FALSE, -1);
check ? TRUE : FALSE, -1);
}
int wxCheckListBox::GetItemHeight() const
@@ -160,7 +158,7 @@ int wxCheckListBox::GetItemHeight() 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);
if (entry)
@@ -171,7 +169,7 @@ bool wxCheckListBox::IsChecked( int index ) const
}
wxFAIL_MSG(wxT("wrong checklistbox index"));
return FALSE;
return false;
}
void wxCheckListBox::Check( int index, bool check )