X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/caaa4cfd6779b689d6723e06df23cc23d1799fd3..e702ff0f08a54622a6b0f1e2ec39537b082c3a8e:/src/gtk/checklst.cpp

diff --git a/src/gtk/checklst.cpp b/src/gtk/checklst.cpp
index 252e216983..e47e7bd805 100644
--- a/src/gtk/checklst.cpp
+++ b/src/gtk/checklst.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -13,6 +13,9 @@
 
 #include "wx/checklst.h"
 
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+
 //-----------------------------------------------------------------------------
 // wxCheckListBox
 //-----------------------------------------------------------------------------
@@ -24,14 +27,15 @@ wxCheckListBox::wxCheckListBox() :
 {
     m_hasCheckBoxes = TRUE;
 }
+
 wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id,
-                 const wxPoint& pos = wxDefaultPosition,
-                 const wxSize& size = wxDefaultSize,
-                 int nStrings = 0, 
-                 const wxString choices[] = NULL,
-                 long style = 0,
-                 const wxValidator& validator = wxDefaultValidator,
-                 const wxString& name = wxListBoxNameStr)
+                 const wxPoint& pos,
+                 const wxSize& size,
+                 int nStrings, 
+                 const wxString *choices,
+                 long style,
+                 const wxValidator& validator,
+                 const wxString& name )
 {
     m_hasCheckBoxes = TRUE;
     wxListBox::Create( parent, id, pos, size, nStrings, choices, style, validator, name );
@@ -40,18 +44,18 @@ wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id,
 bool wxCheckListBox::IsChecked( int index ) const
 {
     wxCHECK_MSG( m_list != NULL, FALSE, "invalid checklistbox" );
-  
+
     GList *child = g_list_nth( m_list->children, index );
     if (child)
     {
         GtkBin *bin = GTK_BIN( child->data );
         GtkLabel *label = GTK_LABEL( bin->child );
-	
-	wxString str = label->label;
-    
+
+        wxString str = label->label;
+
         return (str[1] == 'X');
     }
-    
+
     wxFAIL_MSG("wrong checklistbox index");
     return FALSE;
 }
@@ -59,27 +63,32 @@ bool wxCheckListBox::IsChecked( int index ) const
 void wxCheckListBox::Check( int index, bool check )
 {
     wxCHECK_RET( m_list != NULL, "invalid checklistbox" );
-  
+
     GList *child = g_list_nth( m_list->children, index );
     if (child)
     {
         GtkBin *bin = GTK_BIN( child->data );
         GtkLabel *label = GTK_LABEL( bin->child );
-	
-	wxString str = label->label;
-    
+
+        wxString str = label->label;
+
         if (check == (str[1] == 'X')) return;
-	
-	if (check)
-	    str.SetChar( 1, 'X' );
-	else
-	    str.SetChar( 1, '-' );
-	    
-	gtk_label_set( label, str );
-	    
-	return;
+
+        if (check)
+            str.SetChar( 1, 'X' );
+        else
+            str.SetChar( 1, '-' );
+
+        gtk_label_set( label, str );
+
+        return;
     }
-    
+
     wxFAIL_MSG("wrong checklistbox index");
 }
 
+int wxCheckListBox::GetItemHeight() const
+{
+    // FIXME
+    return 22;
+}