added common notebookbase source file

[wxWidgets.git] / src / gtk1 / listbox.cpp

diff --git a/src/gtk1/listbox.cpp b/src/gtk1/listbox.cpp
index de705e5ce37ca6ddd5ae1d27fdc846d09ace4023..aade5967cfd9ed15af89f85a711578ed47872954 100644 (file)
--- a/src/gtk1/listbox.cpp
+++ b/src/gtk1/listbox.cpp
@@ -51,10 +51,8 @@ extern bool g_isIdle;
 
 #if wxUSE_CHECKLISTBOX
 
-#define CHECKBOX_STRING "[-] "
-
 // checklistboxes have "[±] " prepended to their lables, this macro removes it
-// (NB: 4 below is the length of CHECKBOX_STRING above)
+// (NB: 4 below is the length of wxCHECKLBOX_STRING above)
 //
 // the argument to it is a "const char *" pointer
 #define GET_REAL_LABEL(label) ((m_hasCheckBoxes)?(label)+4 : (label))
@@ -376,7 +374,7 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
 
     gtk_widget_show( GTK_WIDGET(m_list) );
 
-    SetSizeOrDefault( size );
+    SetBestSize( size );
 
     if ( style & wxLB_SORT )
     {
@@ -520,7 +518,7 @@ void wxListBox::GtkAddItem( const wxString &item, int pos )
 #if wxUSE_CHECKLISTBOX
     if (m_hasCheckBoxes)
     {
-        label.Prepend(CHECKBOX_STRING);
+        label.Prepend(wxCHECKLBOX_STRING);
     }
 #endif // wxUSE_CHECKLISTBOX
 
@@ -649,7 +647,7 @@ void wxListBox::Clear()
 {
     wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
 
-    gtk_list_clear_items( m_list, 0, Number() );
+    gtk_list_clear_items( m_list, 0, GetCount() );
 
     if ( HasClientObjectData() )
     {
@@ -684,7 +682,7 @@ void wxListBox::Delete( int n )
     wxNode *node = m_clientList.Nth( n );
     if ( node )
     {
-        if ( m_clientDataItemsType == ClientData_Object )
+        if ( m_clientDataItemsType == wxClientData_Object )
         {
             wxClientData *cd = (wxClientData*)node->Data();
             delete cd;
@@ -714,7 +712,7 @@ void wxListBox::SetString( int n, const wxString &string )
         wxString str;
 #if wxUSE_CHECKLISTBOX
         if (m_hasCheckBoxes)
-            str += CHECKBOX_STRING;
+            str += wxCHECKLBOX_STRING;
 #endif // wxUSE_CHECKLISTBOX
         str += string;