added support for <bg> tag for toolbars in XRC

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

diff --git a/src/gtk/checklst.cpp b/src/gtk/checklst.cpp
index 0f754b7d52e088e44ef069ac7fa1b947311b73b3..e3eb5b9e7903dead959030490a2e3733bbc9fefd 100644 (file)
--- a/src/gtk/checklst.cpp
+++ b/src/gtk/checklst.cpp
@@ -7,10 +7,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "checklst.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -24,14 +20,6 @@
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 
-//-----------------------------------------------------------------------------
-// wxCheckListBoxBase
-//-----------------------------------------------------------------------------
-
-wxCheckListBoxBase::wxCheckListBoxBase()
-{
-}
-
 //-----------------------------------------------------------------------------
 // wxCheckListBox
 //-----------------------------------------------------------------------------
@@ -46,7 +34,7 @@ wxCheckListBox::wxCheckListBox() : wxListBox()
 wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id,
                                const wxPoint& pos,
                                const wxSize& size,
-                               int nStrings, 
+                               int nStrings,
                                const wxString *choices,
                                long style,
                                const wxValidator& validator,
@@ -56,6 +44,19 @@ wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id,
     wxListBox::Create( parent, id, pos, size, nStrings, choices, style, validator, name );
 }
 
+wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id,
+                               const wxPoint& pos,
+                               const wxSize& size,
+                               const wxArrayString& choices,
+                               long style,
+                               const wxValidator& validator,
+                               const wxString& name )
+{
+    m_hasCheckBoxes = TRUE;
+    wxListBox::Create( parent, id, pos, size, choices,
+                       style, validator, name );
+}
+
 bool wxCheckListBox::IsChecked( int index ) const
 {
     wxCHECK_MSG( m_list != NULL, FALSE, wxT("invalid checklistbox") );
@@ -92,7 +93,7 @@ void wxCheckListBox::Check( int index, bool check )
 
         str.SetChar( 1, check ? wxCHECKLBOX_CHECKED : wxCHECKLBOX_UNCHECKED );
 
-        gtk_label_set( label, wxGTK_CONV( str ) );
+        gtk_label_set_text( label, wxGTK_CONV( str ) );
 
         return;
     }