missing comma for Motif compilation added

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

diff --git a/src/gtk1/listbox.cpp b/src/gtk1/listbox.cpp
index 8c24f8b8110ec5b81ae0cec62aa92592d263660f..10c10970455c8a75b431fe00dbfa47bc92812512 100644 (file)
--- a/src/gtk1/listbox.cpp
+++ b/src/gtk1/listbox.cpp
@@ -17,6 +17,7 @@
 #include "wx/utils.h"
 #include "wx/intl.h"
 #include "wx/checklst.h"
 #include "wx/utils.h"
 #include "wx/intl.h"
 #include "wx/checklst.h"

+#include "wx/settings.h"

 
 #if wxUSE_TOOLTIPS
 #include "wx/tooltip.h"
 
 #if wxUSE_TOOLTIPS
 #include "wx/tooltip.h"


@@ -29,6 +30,13 @@
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"
 
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"
 

+//-----------------------------------------------------------------------------
+// idle system
+//-----------------------------------------------------------------------------
+
+extern void wxapp_install_idle_handler();
+extern bool g_isIdle;
+

 //-------------------------------------------------------------------------
 // conditional compilation
 //-------------------------------------------------------------------------
 //-------------------------------------------------------------------------
 // conditional compilation
 //-------------------------------------------------------------------------


@@ -63,10 +71,12 @@ extern bool   g_blockEventsOnScroll;
 static gint
 gtk_listbox_button_press_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxListBox *listbox )
 {
 static gint
 gtk_listbox_button_press_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxListBox *listbox )
 {

+    if (g_isIdle) wxapp_install_idle_handler();
+

     if (g_blockEventsOnDrag) return FALSE;
     if (g_blockEventsOnScroll) return FALSE;
 
     if (g_blockEventsOnDrag) return FALSE;
     if (g_blockEventsOnScroll) return FALSE;
 

-    if (!listbox->HasVMT()) return FALSE;
+    if (!listbox->m_hasVMT) return FALSE;

 
     int sel = listbox->GetIndex( widget );
 
 
     int sel = listbox->GetIndex( widget );
 


@@ -116,9 +126,11 @@ gtk_listbox_button_press_callback( GtkWidget *widget, GdkEventButton *gdk_event,
 static gint
 gtk_listbox_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxListBox *listbox )
 {
 static gint
 gtk_listbox_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxListBox *listbox )
 {

+    if (g_isIdle) wxapp_install_idle_handler();
+

     if (g_blockEventsOnDrag) return FALSE;
 
     if (g_blockEventsOnDrag) return FALSE;
 

-    if (!listbox->HasVMT()) return FALSE;
+    if (!listbox->m_hasVMT) return FALSE;

 
     if (gdk_event->keyval != ' ') return FALSE;
 
 
     if (gdk_event->keyval != ' ') return FALSE;
 


@@ -142,7 +154,9 @@ gtk_listbox_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxLis
 
 static void gtk_listitem_select_callback( GtkWidget *WXUNUSED(widget), wxListBox *listbox )
 {
 
 static void gtk_listitem_select_callback( GtkWidget *WXUNUSED(widget), wxListBox *listbox )
 {

-    if (!listbox->HasVMT()) return;
+    if (g_isIdle) wxapp_install_idle_handler();
+
+    if (!listbox->m_hasVMT) return;

     if (g_blockEventsOnDrag) return;
 
     wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, listbox->GetId() );
     if (g_blockEventsOnDrag) return;
 
     wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, listbox->GetId() );


@@ -239,7 +253,7 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
             str.Prepend(CHECKBOX_STRING);
         }
 
             str.Prepend(CHECKBOX_STRING);
         }
 

-        list_item = gtk_list_item_new_with_label( str );
+        list_item = gtk_list_item_new_with_label( str.mbc_str() );

 
         gtk_container_add( GTK_CONTAINER(m_list), list_item );
 
 
         gtk_container_add( GTK_CONTAINER(m_list), list_item );
 


@@ -268,15 +282,11 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
         gtk_widget_show( list_item );
     }
 
         gtk_widget_show( list_item );
     }
 

-    m_parent->AddChild( this );
-
-    (m_parent->m_insertCallback)( m_parent, this );
+    m_parent->DoAddChild( this );

 
     PostCreation();
 
 
     PostCreation();
 

-    gtk_widget_realize( GTK_WIDGET(m_list) );
-
-    SetBackgroundColour( parent->GetBackgroundColour() );
+    SetBackgroundColour( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_WINDOW ) );

     SetForegroundColour( parent->GetForegroundColour() );
     SetFont( parent->GetFont() );
 
     SetForegroundColour( parent->GetForegroundColour() );
     SetFont( parent->GetFont() );
 


@@ -292,11 +302,11 @@ wxListBox::~wxListBox()
 
 void wxListBox::InsertItems(int nItems, const wxString items[], int pos)
 {
 
 void wxListBox::InsertItems(int nItems, const wxString items[], int pos)
 {

-    wxCHECK_RET( m_list != NULL, "invalid listbox" );
+    wxCHECK_RET( m_list != NULL, _T("invalid listbox") );

 
     GList *children = m_list->children;
     int length = g_list_length(children);
 
     GList *children = m_list->children;
     int length = g_list_length(children);

-    wxCHECK_RET( pos <= length, "invalid index in wxListBox::InsertItems" );
+    wxCHECK_RET( pos <= length, _T("invalid index in wxListBox::InsertItems") );

 
     // VZ: it seems that GTK 1.0.6 doesn't has a function to insert an item
     //     into a listbox at the given position, this is why we first delete
 
     // VZ: it seems that GTK 1.0.6 doesn't has a function to insert an item
     //     into a listbox at the given position, this is why we first delete


@@ -390,7 +400,7 @@ void wxListBox::InsertItems(int nItems, const wxString items[], int pos)
 
 void wxListBox::AppendCommon( const wxString &item )
 {
 
 void wxListBox::AppendCommon( const wxString &item )
 {

-    wxCHECK_RET( m_list != NULL, "invalid listbox" );
+    wxCHECK_RET( m_list != NULL, _T("invalid listbox") );

 
     GtkWidget *list_item;
 
 
     GtkWidget *list_item;
 


@@ -400,19 +410,17 @@ void wxListBox::AppendCommon( const wxString &item )
         label.Prepend(CHECKBOX_STRING);
     }
 
         label.Prepend(CHECKBOX_STRING);
     }
 

-    list_item = gtk_list_item_new_with_label( label );
+    list_item = gtk_list_item_new_with_label( label.mbc_str() );

 
     gtk_container_add( GTK_CONTAINER(m_list), list_item );
 
     gtk_signal_connect( GTK_OBJECT(list_item), "select",
       GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this );
 
 
     gtk_container_add( GTK_CONTAINER(m_list), list_item );
 
     gtk_signal_connect( GTK_OBJECT(list_item), "select",
       GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this );
 

-    if (GetWindowStyleFlag() & wxLB_MULTIPLE)
+    if (HasFlag(wxLB_MULTIPLE))

         gtk_signal_connect( GTK_OBJECT(list_item), "deselect",
           GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this );
 
         gtk_signal_connect( GTK_OBJECT(list_item), "deselect",
           GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this );
 

-    if (m_widgetStyle) ApplyWidgetStyle();
-

     gtk_signal_connect( GTK_OBJECT(list_item),
                         "button_press_event",
                         (GtkSignalFunc)gtk_listbox_button_press_callback,
     gtk_signal_connect( GTK_OBJECT(list_item),
                         "button_press_event",
                         (GtkSignalFunc)gtk_listbox_button_press_callback,


@@ -430,15 +438,23 @@ void wxListBox::AppendCommon( const wxString &item )
 
     ConnectWidget( list_item );
 
 
     ConnectWidget( list_item );
 

+    if (GTK_WIDGET_REALIZED(m_widget))
+    {
+        gtk_widget_realize( list_item );
+        gtk_widget_realize( GTK_BIN(list_item)->child );
+       
+        if (m_widgetStyle) ApplyWidgetStyle();
+

 #if wxUSE_DRAG_AND_DROP
 #ifndef NEW_GTK_DND_CODE
 #if wxUSE_DRAG_AND_DROP
 #ifndef NEW_GTK_DND_CODE

-    if (m_dropTarget) m_dropTarget->RegisterWidget( list_item );
+        if (m_dropTarget) m_dropTarget->RegisterWidget( list_item );

 #endif
 #endif
 
 #if wxUSE_TOOLTIPS
 #endif
 #endif
 
 #if wxUSE_TOOLTIPS

-    if (m_toolTip) m_toolTip->Apply( this );
+        if (m_tooltip) m_tooltip->Apply( this );

 #endif
 #endif

+    }

 }
 
 void wxListBox::Append( const wxString &item )
 }
 
 void wxListBox::Append( const wxString &item )


@@ -467,7 +483,7 @@ void wxListBox::Append( const wxString &item, wxClientData *clientData )
 
 void wxListBox::SetClientData( int n, void* clientData )
 {
 
 void wxListBox::SetClientData( int n, void* clientData )
 {

-    wxCHECK_RET( m_widget != NULL, "invalid combobox" );
+    wxCHECK_RET( m_widget != NULL, _T("invalid combobox") );

 
     wxNode *node = m_clientDataList.Nth( n );
     if (!node) return;
 
     wxNode *node = m_clientDataList.Nth( n );
     if (!node) return;


@@ -477,7 +493,7 @@ void wxListBox::SetClientData( int n, void* clientData )
 
 void* wxListBox::GetClientData( int n )
 {
 
 void* wxListBox::GetClientData( int n )
 {

-    wxCHECK_MSG( m_widget != NULL, NULL, "invalid combobox" );
+    wxCHECK_MSG( m_widget != NULL, NULL, _T("invalid combobox") );

 
     wxNode *node = m_clientDataList.Nth( n );
     if (!node) return NULL;
 
     wxNode *node = m_clientDataList.Nth( n );
     if (!node) return NULL;


@@ -487,7 +503,7 @@ void* wxListBox::GetClientData( int n )
 
 void wxListBox::SetClientObject( int n, wxClientData* clientData )
 {
 
 void wxListBox::SetClientObject( int n, wxClientData* clientData )
 {

-    wxCHECK_RET( m_widget != NULL, "invalid combobox" );
+    wxCHECK_RET( m_widget != NULL, _T("invalid combobox") );

 
     wxNode *node = m_clientObjectList.Nth( n );
     if (!node) return;
 
     wxNode *node = m_clientObjectList.Nth( n );
     if (!node) return;


@@ -500,7 +516,7 @@ void wxListBox::SetClientObject( int n, wxClientData* clientData )
 
 wxClientData* wxListBox::GetClientObject( int n )
 {
 
 wxClientData* wxListBox::GetClientObject( int n )
 {

-    wxCHECK_MSG( m_widget != NULL, (wxClientData*)NULL, "invalid combobox" );
+    wxCHECK_MSG( m_widget != NULL, (wxClientData*)NULL, _T("invalid combobox") );

 
     wxNode *node = m_clientObjectList.Nth( n );
     if (!node) return (wxClientData*) NULL;
 
     wxNode *node = m_clientObjectList.Nth( n );
     if (!node) return (wxClientData*) NULL;


@@ -510,7 +526,7 @@ wxClientData* wxListBox::GetClientObject( int n )
 
 void wxListBox::Clear()
 {
 
 void wxListBox::Clear()
 {

-    wxCHECK_RET( m_list != NULL, "invalid listbox" );
+    wxCHECK_RET( m_list != NULL, _T("invalid listbox") );

 
     gtk_list_clear_items( m_list, 0, Number() );
 
 
     gtk_list_clear_items( m_list, 0, Number() );
 


@@ -528,11 +544,11 @@ void wxListBox::Clear()
 
 void wxListBox::Delete( int n )
 {
 
 void wxListBox::Delete( int n )
 {

-    wxCHECK_RET( m_list != NULL, "invalid listbox" );
+    wxCHECK_RET( m_list != NULL, _T("invalid listbox") );

 
     GList *child = g_list_nth( m_list->children, n );
 
 
     GList *child = g_list_nth( m_list->children, n );
 

-    wxCHECK_RET( child, "wrong listbox index" );
+    wxCHECK_RET( child, _T("wrong listbox index") );

 
     GList *list = g_list_append( (GList*) NULL, child->data );
     gtk_list_remove_items( m_list, list );
 
     GList *list = g_list_append( (GList*) NULL, child->data );
     gtk_list_remove_items( m_list, list );


@@ -555,14 +571,14 @@ void wxListBox::Delete( int n )
 
 void wxListBox::Deselect( int n )
 {
 
 void wxListBox::Deselect( int n )
 {

-    wxCHECK_RET( m_list != NULL, "invalid listbox" );
+    wxCHECK_RET( m_list != NULL, _T("invalid listbox") );

 
     gtk_list_unselect_item( m_list, n );
 }
 
 int wxListBox::FindString( const wxString &item ) const
 {
 
     gtk_list_unselect_item( m_list, n );
 }
 
 int wxListBox::FindString( const wxString &item ) const
 {

-    wxCHECK_MSG( m_list != NULL, -1, "invalid listbox" );
+    wxCHECK_MSG( m_list != NULL, -1, _T("invalid listbox") );

 
     GList *child = m_list->children;
     int count = 0;
 
     GList *child = m_list->children;
     int count = 0;


@@ -587,7 +603,7 @@ int wxListBox::FindString( const wxString &item ) const
 
 int wxListBox::GetSelection() const
 {
 
 int wxListBox::GetSelection() const
 {

-    wxCHECK_MSG( m_list != NULL, -1, "invalid listbox" );
+    wxCHECK_MSG( m_list != NULL, -1, _T("invalid listbox") );

 
     GList *child = m_list->children;
     int count = 0;
 
     GList *child = m_list->children;
     int count = 0;


@@ -602,7 +618,7 @@ int wxListBox::GetSelection() const
 
 int wxListBox::GetSelections( wxArrayInt& aSelections ) const
 {
 
 int wxListBox::GetSelections( wxArrayInt& aSelections ) const
 {

-    wxCHECK_MSG( m_list != NULL, -1, "invalid listbox" );
+    wxCHECK_MSG( m_list != NULL, -1, _T("invalid listbox") );

 
     // get the number of selected items first
     GList *child = m_list->children;
 
     // get the number of selected items first
     GList *child = m_list->children;


@@ -632,7 +648,7 @@ int wxListBox::GetSelections( wxArrayInt& aSelections ) const
 
 wxString wxListBox::GetString( int n ) const
 {
 
 wxString wxListBox::GetString( int n ) const
 {

-    wxCHECK_MSG( m_list != NULL, "", "invalid listbox" );
+    wxCHECK_MSG( m_list != NULL, _T(""), _T("invalid listbox") );

 
     GList *child = g_list_nth( m_list->children, n );
     if (child)
 
     GList *child = g_list_nth( m_list->children, n );
     if (child)


@@ -645,14 +661,14 @@ wxString wxListBox::GetString( int n ) const
         return str;
     }
     
         return str;
     }
     

-    wxFAIL_MSG("wrong listbox index");
+    wxFAIL_MSG(_T("wrong listbox index"));

 
 

-    return "";
+    return _T("");

 }
 
 wxString wxListBox::GetStringSelection() const
 {
 }
 
 wxString wxListBox::GetStringSelection() const
 {

-    wxCHECK_MSG( m_list != NULL, "", "invalid listbox" );
+    wxCHECK_MSG( m_list != NULL, _T(""), _T("invalid listbox") );

 
     GList *selection = m_list->selection;
     if (selection)
 
     GList *selection = m_list->selection;
     if (selection)


@@ -665,13 +681,13 @@ wxString wxListBox::GetStringSelection() const
         return str;
     }
 
         return str;
     }
 

-    wxFAIL_MSG("no listbox selection available");
-    return "";
+    wxFAIL_MSG(_T("no listbox selection available"));
+    return _T("");

 }
 
 int wxListBox::Number()
 {
 }
 
 int wxListBox::Number()
 {

-    wxCHECK_MSG( m_list != NULL, -1, "invalid listbox" );
+    wxCHECK_MSG( m_list != NULL, -1, _T("invalid listbox") );

 
     GList *child = m_list->children;
     int count = 0;
 
     GList *child = m_list->children;
     int count = 0;


@@ -681,7 +697,7 @@ int wxListBox::Number()
 
 bool wxListBox::Selected( int n )
 {
 
 bool wxListBox::Selected( int n )
 {

-    wxCHECK_MSG( m_list != NULL, FALSE, "invalid listbox" );
+    wxCHECK_MSG( m_list != NULL, FALSE, _T("invalid listbox") );

 
     GList *target = g_list_nth( m_list->children, n );
     if (target)
 
     GList *target = g_list_nth( m_list->children, n );
     if (target)


@@ -693,28 +709,28 @@ bool wxListBox::Selected( int n )
             child = child->next;
         }
     }
             child = child->next;
         }
     }

-    wxFAIL_MSG("wrong listbox index");
+    wxFAIL_MSG(_T("wrong listbox index"));

     return FALSE;
 }
 
 void wxListBox::Set( int WXUNUSED(n), const wxString *WXUNUSED(choices) )
 {
     return FALSE;
 }
 
 void wxListBox::Set( int WXUNUSED(n), const wxString *WXUNUSED(choices) )
 {

-    wxFAIL_MSG("wxListBox::Set not implemented");
+    wxFAIL_MSG(_T("wxListBox::Set not implemented"));

 }
 
 void wxListBox::SetFirstItem( int WXUNUSED(n) )
 {
 }
 
 void wxListBox::SetFirstItem( int WXUNUSED(n) )
 {

-    wxFAIL_MSG("wxListBox::SetFirstItem not implemented");
+    wxFAIL_MSG(_T("wxListBox::SetFirstItem not implemented"));

 }
 
 void wxListBox::SetFirstItem( const wxString &WXUNUSED(item) )
 {
 }
 
 void wxListBox::SetFirstItem( const wxString &WXUNUSED(item) )
 {

-    wxFAIL_MSG("wxListBox::SetFirstItem not implemented");
+    wxFAIL_MSG(_T("wxListBox::SetFirstItem not implemented"));

 }
 
 void wxListBox::SetSelection( int n, bool select )
 {
 }
 
 void wxListBox::SetSelection( int n, bool select )
 {

-    wxCHECK_RET( m_list != NULL, "invalid listbox" );
+    wxCHECK_RET( m_list != NULL, _T("invalid listbox") );

 
     if (select)
         gtk_list_select_item( m_list, n );
 
     if (select)
         gtk_list_select_item( m_list, n );


@@ -724,7 +740,7 @@ void wxListBox::SetSelection( int n, bool select )
 
 void wxListBox::SetString( int n, const wxString &string )
 {
 
 void wxListBox::SetString( int n, const wxString &string )
 {

-    wxCHECK_RET( m_list != NULL, "invalid listbox" );
+    wxCHECK_RET( m_list != NULL, _T("invalid listbox") );

 
     GList *child = g_list_nth( m_list->children, n );
     if (child)
 
     GList *child = g_list_nth( m_list->children, n );
     if (child)


@@ -737,17 +753,17 @@ void wxListBox::SetString( int n, const wxString &string )
             str += CHECKBOX_STRING;
         str += string;
 
             str += CHECKBOX_STRING;
         str += string;
 

-        gtk_label_set( label, str );
+        gtk_label_set( label, str.mbc_str() );

     }
     else
     {
     }
     else
     {

-        wxFAIL_MSG("wrong listbox index");
+        wxFAIL_MSG(_T("wrong listbox index"));

     }
 }
 
 void wxListBox::SetStringSelection( const wxString &string, bool select )
 {
     }
 }
 
 void wxListBox::SetStringSelection( const wxString &string, bool select )
 {

-    wxCHECK_RET( m_list != NULL, "invalid listbox" );
+    wxCHECK_RET( m_list != NULL, _T("invalid listbox") );

 
     SetSelection( FindString(string), select );
 }
 
     SetSelection( FindString(string), select );
 }


@@ -769,12 +785,12 @@ int wxListBox::GetIndex( GtkWidget *item ) const
 }
 
 #if wxUSE_TOOLTIPS
 }
 
 #if wxUSE_TOOLTIPS

-void wxListBox::ApplyToolTip( GtkTooltips *tips, const char *tip )
+void wxListBox::ApplyToolTip( GtkTooltips *tips, const wxChar *tip )

 {
     GList *child = m_list->children;
     while (child)
     {
 {
     GList *child = m_list->children;
     while (child)
     {

-        gtk_tooltips_set_tip( tips, GTK_WIDGET( child->data ), tip, (gchar*) NULL );
+        gtk_tooltips_set_tip( tips, GTK_WIDGET( child->data ), wxConv_local.cWX2MB(tip), (gchar*) NULL );

         child = child->next;
     }
 }
         child = child->next;
     }
 }


@@ -783,7 +799,7 @@ void wxListBox::ApplyToolTip( GtkTooltips *tips, const char *tip )
 #if wxUSE_DRAG_AND_DROP
 void wxListBox::SetDropTarget( wxDropTarget *dropTarget )
 {
 #if wxUSE_DRAG_AND_DROP
 void wxListBox::SetDropTarget( wxDropTarget *dropTarget )
 {

-    wxCHECK_RET( m_list != NULL, "invalid listbox" );
+    wxCHECK_RET( m_list != NULL, _T("invalid listbox") );

 
 #ifndef NEW_GTK_DND_CODE
     if (m_dropTarget)
 
 #ifndef NEW_GTK_DND_CODE
     if (m_dropTarget)


@@ -840,9 +856,12 @@ void wxListBox::ApplyWidgetStyle()
     if (m_backgroundColour.Ok())
     {
         GdkWindow *window = GTK_WIDGET(m_list)->window;
     if (m_backgroundColour.Ok())
     {
         GdkWindow *window = GTK_WIDGET(m_list)->window;

-        m_backgroundColour.CalcPixel( gdk_window_get_colormap( window ) );
-        gdk_window_set_background( window, m_backgroundColour.GetColor() );
-        gdk_window_clear( window );
+        if ( window )
+        {
+            m_backgroundColour.CalcPixel( gdk_window_get_colormap( window ) );
+            gdk_window_set_background( window, m_backgroundColour.GetColor() );
+            gdk_window_clear( window );
+        }

     }
 
     GList *child = m_list->children;
     }
 
     GList *child = m_list->children;


@@ -857,4 +876,3 @@ void wxListBox::ApplyWidgetStyle()
         child = child->next;
     }
 }
         child = child->next;
     }
 }

-