check that the version of __sync_sub_and_fetch that returns a value is supported...

[wxWidgets.git] / src / gtk / checklst.cpp

diff --git a/src/gtk/checklst.cpp b/src/gtk/checklst.cpp
index 3317f05549265e46383f4f5667da9fa15b59f051..4a43959036137881ef44fa202f4871f4a8a2f1fe 100644 (file)
--- a/src/gtk/checklst.cpp
+++ b/src/gtk/checklst.cpp
@@ -1,8 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        checklst.cpp
+// Name:        src/gtk/checklst.cpp

 // Purpose:
 // Author:      Robert Roebling
 // 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
 // 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"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#include "wx/defs.h"
-

 #if wxUSE_CHECKLISTBOX
 
 #include "wx/checklst.h"
 #if wxUSE_CHECKLISTBOX
 
 #include "wx/checklst.h"


@@ -25,25 +23,23 @@
 //-----------------------------------------------------------------------------
 // "toggled"
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // "toggled"
 //-----------------------------------------------------------------------------

-#if wxUSE_NATIVEGTKCHECKLIST

 extern "C" {
 extern "C" {

-static void gtk_checklist_toggled(GtkCellRendererToggle *renderer,
+static void gtk_checklist_toggled(GtkCellRendererToggle * WXUNUSED(renderer),

                                   gchar                 *stringpath,
                                   wxCheckListBox        *listbox)
 {
     wxCHECK_RET( listbox->m_treeview != NULL, wxT("invalid listbox") );
 
     GtkTreePath* path = gtk_tree_path_new_from_string(stringpath);
                                   gchar                 *stringpath,
                                   wxCheckListBox        *listbox)
 {
     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->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->HandleWindowEvent( new_event );

 }
 }
 }
 }

-#endif

 
 //-----------------------------------------------------------------------------
 // wxCheckListBox
 
 //-----------------------------------------------------------------------------
 // wxCheckListBox


@@ -53,7 +49,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 +61,7 @@ wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id,
                                const wxValidator& validator,
                                const wxString& name )
 {
                                const wxValidator& validator,
                                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,18 +73,17 @@ wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id,
                                const wxValidator& validator,
                                const wxString& name )
 {
                                const wxValidator& validator,
                                const wxString& name )
 {

-    m_hasCheckBoxes = TRUE;
+    m_hasCheckBoxes = true;

     wxListBox::Create( parent, id, pos, size, choices,
                        style, validator, name );
 }
 
     wxListBox::Create( parent, id, pos, size, choices,
                        style, validator, name );
 }
 

-#if wxUSE_NATIVEGTKCHECKLIST

 void wxCheckListBox::DoCreateCheckList()
 {
     //Create the checklist in our treeview and set up events for it
 void wxCheckListBox::DoCreateCheckList()
 {
     //Create the checklist in our treeview and set up events for it

-    GtkCellRenderer* renderer = 
+    GtkCellRenderer* renderer =

         gtk_cell_renderer_toggle_new();
         gtk_cell_renderer_toggle_new();

-    GtkTreeViewColumn* column = 
+    GtkTreeViewColumn* column =

         gtk_tree_view_column_new_with_attributes( "", renderer,
                                                   "active", 0,
                                                   NULL );
         gtk_tree_view_column_new_with_attributes( "", renderer,
                                                   "active", 0,
                                                   NULL );


@@ -103,16 +98,16 @@ void wxCheckListBox::DoCreateCheckList()
     gtk_tree_view_append_column(m_treeview, column);
 }
 
     gtk_tree_view_append_column(m_treeview, column);
 }
 

-bool wxCheckListBox::IsChecked( int index ) const
+bool wxCheckListBox::IsChecked(unsigned int index) const

 {
 {

-    wxCHECK_MSG( m_treeview != NULL, FALSE, wxT("invalid checklistbox") );
+    wxCHECK_MSG( m_treeview != NULL, false, wxT("invalid checklistbox") );

 
     GtkTreeIter iter;
     gboolean res = gtk_tree_model_iter_nth_child(
                         GTK_TREE_MODEL(m_liststore),
                         &iter, NULL, //NULL = parent = get first
                         index
 
     GtkTreeIter iter;
     gboolean res = gtk_tree_model_iter_nth_child(
                         GTK_TREE_MODEL(m_liststore),
                         &iter, NULL, //NULL = parent = get first
                         index

-                                                );
+                   );

     if(!res)
         return false;
 
     if(!res)
         return false;
 


@@ -120,12 +115,12 @@ bool wxCheckListBox::IsChecked( int index ) const
     gtk_tree_model_get_value(GTK_TREE_MODEL(m_liststore),
                              &iter,
                              0, //column
     gtk_tree_model_get_value(GTK_TREE_MODEL(m_liststore),
                              &iter,
                              0, //column

-                             &value);    
+                             &value);

 
     return g_value_get_boolean(&value) == TRUE ? true : false;
 }
 
 
     return g_value_get_boolean(&value) == TRUE ? true : false;
 }
 

-void wxCheckListBox::Check( int index, bool check )
+void wxCheckListBox::Check(unsigned int index, bool check)

 {
     wxCHECK_RET( m_treeview != NULL, wxT("invalid checklistbox") );
 
 {
     wxCHECK_RET( m_treeview != NULL, wxT("invalid checklistbox") );
 


@@ -134,14 +129,14 @@ void wxCheckListBox::Check( int index, bool check )
                         GTK_TREE_MODEL(m_liststore),
                         &iter, NULL, //NULL = parent = get first
                         index
                         GTK_TREE_MODEL(m_liststore),
                         &iter, NULL, //NULL = parent = get first
                         index

-                                                );
+                   );

     if(!res)
         return;
 
     gtk_list_store_set(m_liststore,
                        &iter,
                        0, //column
     if(!res)
         return;
 
     gtk_list_store_set(m_liststore,
                        &iter,
                        0, //column

-                       check ? TRUE : FALSE, -1);    
+                       check ? TRUE : FALSE, -1);

 }
 
 int wxCheckListBox::GetItemHeight() const
 }
 
 int wxCheckListBox::GetItemHeight() const


@@ -156,52 +151,4 @@ int wxCheckListBox::GetItemHeight() const
     return height;
 }
 
     return height;
 }
 

-#else //NON-NATIVE
-
-bool wxCheckListBox::IsChecked( int index ) const
-{
-    wxCHECK_MSG( m_treeview != NULL, FALSE, wxT("invalid checklistbox") );
-
-    GtkTreeEntry* entry = GtkGetEntry(index);
-    if (entry)
-    {
-        wxString str( wxGTK_CONV_BACK( gtk_tree_entry_get_label(entry) ) );
-
-        return str.GetChar(1) == wxCHECKLBOX_CHECKED;
-    }
-
-    wxFAIL_MSG(wxT("wrong checklistbox index"));
-    return FALSE;
-}
-
-void wxCheckListBox::Check( int index, bool check )
-{
-    wxCHECK_RET( m_treeview != NULL, wxT("invalid checklistbox") );
-
-    GtkTreeEntry* entry = GtkGetEntry(index);
-    if (entry)
-    {
-        wxString str( wxGTK_CONV_BACK( gtk_tree_entry_get_label(entry) ) );
-
-        if (check == (str.GetChar(1) == wxCHECKLBOX_CHECKED))
-            return;
-
-        str.SetChar( 1, check ? wxCHECKLBOX_CHECKED : wxCHECKLBOX_UNCHECKED );
-
-        gtk_tree_entry_set_label( entry, wxGTK_CONV( str ) );
-
-        return;
-    }
-
-    wxFAIL_MSG(wxT("wrong checklistbox index"));
-}
-
-int wxCheckListBox::GetItemHeight() const
-{
-    // FIXME
-    return 22;
-}
-
-#endif //wxUSE_NATIVEGTKCHECKLIST
-

 #endif //wxUSE_CHECKLISTBOX
 #endif //wxUSE_CHECKLISTBOX