fixes

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

diff --git a/src/gtk1/combobox.cpp b/src/gtk1/combobox.cpp
index 196b32a371fda4dc4efba7d3a63a61214fdc6ec9..38e40a9642c7df6903a181062e676560e9983c20 100644 (file)
--- a/src/gtk1/combobox.cpp
+++ b/src/gtk1/combobox.cpp
@@ -2,9 +2,8 @@
 // Name:        combobox.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Name:        combobox.cpp
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling

 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -46,29 +45,16 @@ static void gtk_combo_clicked_callback( GtkWidget *WXUNUSED(widget), wxComboBox
   combo->GetEventHandler()->ProcessEvent(event);
 }
 
   combo->GetEventHandler()->ProcessEvent(event);
 }
 

-//-----------------------------------------------------------------------------
-// size 
-
-/*
-static gint gtk_combo_size_callback( GtkCombo *widget, GtkAllocation* alloc, wxComboBox *win )
-{ 
-  if (!win->HasVMT()) return FALSE;
-  if (g_blockEventsOnDrag) return FALSE;
-  if (!widget->button) return FALSE;
-  
-  widget->button->allocation.x = 
-    alloc->width - widget->button->allocation.width;
-  
-  return FALSE;
-}
-*/
-

 //-----------------------------------------------------------------------------
 // wxComboBox
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxComboBox,wxControl)
 
 //-----------------------------------------------------------------------------
 // wxComboBox
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxComboBox,wxControl)
 

+BEGIN_EVENT_TABLE(wxComboBox, wxControl)
+  EVT_SIZE(wxComboBox::OnSize)
+END_EVENT_TABLE()
+

 bool wxComboBox::Create(wxWindow *parent, wxWindowID id, const wxString& value,
   const wxPoint& pos, const wxSize& size,
   int n, const wxString choices[],
 bool wxComboBox::Create(wxWindow *parent, wxWindowID id, const wxString& value,
   const wxPoint& pos, const wxSize& size,
   int n, const wxString choices[],


@@ -92,12 +78,14 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id, const wxString& value,
   
   for (int i = 0; i < n; i++)
   {
   
   for (int i = 0; i < n; i++)
   {

-    GtkWidget *list_item;
-    list_item = gtk_list_item_new_with_label( choices[i] ); 
+    GtkWidget *list_item = gtk_list_item_new_with_label( choices[i] ); 

   
   

+    m_clientData.Append( (wxObject*)NULL );
+    

     gtk_container_add( GTK_CONTAINER(list), list_item );
     
     gtk_container_add( GTK_CONTAINER(list), list_item );
     

-    m_clientData.Append( (wxObject*)NULL );
+    gtk_widget_realize( list_item );
+    gtk_widget_realize( GTK_BIN(list_item)->child );

     
     gtk_widget_show( list_item );
     
     
     gtk_widget_show( list_item );
     


@@ -107,13 +95,17 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id, const wxString& value,
   
   PostCreation();
 
   
   PostCreation();
 

-/*
-  gtk_signal_connect( GTK_OBJECT(m_widget), "size_allocate", 
-    GTK_SIGNAL_FUNC(gtk_combo_size_callback), (gpointer)this );
-*/
-
+  ConnectWidget( GTK_COMBO(m_widget)->button );
+  

   if (!value.IsNull()) SetValue( value );
     
   if (!value.IsNull()) SetValue( value );
     

+  gtk_widget_realize( GTK_COMBO(m_widget)->list );
+  gtk_widget_realize( GTK_COMBO(m_widget)->entry );
+  gtk_widget_realize( GTK_COMBO(m_widget)->button );
+  
+  SetBackgroundColour( parent->GetBackgroundColour() );
+  SetForegroundColour( parent->GetForegroundColour() );
+

   Show( TRUE );
     
   return TRUE;
   Show( TRUE );
     
   return TRUE;


@@ -121,6 +113,8 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id, const wxString& value,
 
 void wxComboBox::Clear(void)
 {
 
 void wxComboBox::Clear(void)
 {

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

   GtkWidget *list = GTK_COMBO(m_widget)->list;
   gtk_list_clear_items( GTK_LIST(list), 0, Number() );
   
   GtkWidget *list = GTK_COMBO(m_widget)->list;
   gtk_list_clear_items( GTK_LIST(list), 0, Number() );
   


@@ -129,15 +123,20 @@ void wxComboBox::Clear(void)
 
 void wxComboBox::Append( const wxString &item )
 {
 
 void wxComboBox::Append( const wxString &item )
 {

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

   Append( item, (char*)NULL );
 }
 
 void wxComboBox::Append( const wxString &item, char *clientData )
 {
   Append( item, (char*)NULL );
 }
 
 void wxComboBox::Append( const wxString &item, char *clientData )
 {

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

   GtkWidget *list = GTK_COMBO(m_widget)->list;
   
   GtkWidget *list = GTK_COMBO(m_widget)->list;
   

-  GtkWidget *list_item;
-  list_item = gtk_list_item_new_with_label( item ); 
+  GtkWidget *list_item = gtk_list_item_new_with_label( item ); 
+  
+  if (m_widgetStyle) ApplyWidgetStyle();

   
   gtk_signal_connect( GTK_OBJECT(list_item), "select", 
     GTK_SIGNAL_FUNC(gtk_combo_clicked_callback), (gpointer)this );
   
   gtk_signal_connect( GTK_OBJECT(list_item), "select", 
     GTK_SIGNAL_FUNC(gtk_combo_clicked_callback), (gpointer)this );


@@ -151,6 +150,8 @@ void wxComboBox::Append( const wxString &item, char *clientData )
 
 void wxComboBox::Delete( int n )
 {
 
 void wxComboBox::Delete( int n )
 {

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

   GtkList *listbox = GTK_LIST( GTK_COMBO(m_widget)->list );
   
   GList *child = g_list_nth( listbox->children, n );
   GtkList *listbox = GTK_LIST( GTK_COMBO(m_widget)->list );
   
   GList *child = g_list_nth( listbox->children, n );


@@ -176,6 +177,8 @@ void wxComboBox::Delete( int n )
 
 int wxComboBox::FindString( const wxString &item )
 {
 
 int wxComboBox::FindString( const wxString &item )
 {

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

   GtkWidget *list = GTK_COMBO(m_widget)->list;
   
   GList *child = GTK_LIST(list)->children;
   GtkWidget *list = GTK_COMBO(m_widget)->list;
   
   GList *child = GTK_LIST(list)->children;


@@ -196,6 +199,8 @@ int wxComboBox::FindString( const wxString &item )
 
 char* wxComboBox::GetClientData( int n )
 {
 
 char* wxComboBox::GetClientData( int n )
 {

+  wxCHECK_MSG( m_widget != NULL, (char*)NULL, "invalid combobox" );
+  

   wxNode *node = m_clientData.Nth( n );
   if (node) return (char*)node->Data();
   
   wxNode *node = m_clientData.Nth( n );
   if (node) return (char*)node->Data();
   


@@ -206,6 +211,8 @@ char* wxComboBox::GetClientData( int n )
 
 void wxComboBox::SetClientData( int n, char * clientData )
 {
 
 void wxComboBox::SetClientData( int n, char * clientData )
 {

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

   wxNode *node = m_clientData.Nth( n );
   if (node) node->SetData( (wxObject*) clientData );
   
   wxNode *node = m_clientData.Nth( n );
   if (node) node->SetData( (wxObject*) clientData );
   


@@ -214,6 +221,8 @@ void wxComboBox::SetClientData( int n, char * clientData )
 
 int wxComboBox::GetSelection(void) const
 {
 
 int wxComboBox::GetSelection(void) const
 {

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

   GtkWidget *list = GTK_COMBO(m_widget)->list;
   
   GList *selection = GTK_LIST(list)->selection;
   GtkWidget *list = GTK_COMBO(m_widget)->list;
   
   GList *selection = GTK_LIST(list)->selection;


@@ -236,6 +245,8 @@ int wxComboBox::GetSelection(void) const
 
 wxString wxComboBox::GetString( int n ) const
 {
 
 wxString wxComboBox::GetString( int n ) const
 {

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

   GtkWidget *list = GTK_COMBO(m_widget)->list;
   
   GList *child = g_list_nth( GTK_LIST(list)->children, n );
   GtkWidget *list = GTK_COMBO(m_widget)->list;
   
   GList *child = g_list_nth( GTK_LIST(list)->children, n );


@@ -253,6 +264,8 @@ wxString wxComboBox::GetString( int n ) const
 
 wxString wxComboBox::GetStringSelection(void) const
 {
 
 wxString wxComboBox::GetStringSelection(void) const
 {

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

   GtkWidget *list = GTK_COMBO(m_widget)->list;
   
   GList *selection = GTK_LIST(list)->selection;
   GtkWidget *list = GTK_COMBO(m_widget)->list;
   
   GList *selection = GTK_LIST(list)->selection;


@@ -270,6 +283,8 @@ wxString wxComboBox::GetStringSelection(void) const
 
 int wxComboBox::Number(void) const
 {
 
 int wxComboBox::Number(void) const
 {

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

   GtkWidget *list = GTK_COMBO(m_widget)->list;
   
   GList *child = GTK_LIST(list)->children;
   GtkWidget *list = GTK_COMBO(m_widget)->list;
   
   GList *child = GTK_LIST(list)->children;


@@ -280,12 +295,16 @@ int wxComboBox::Number(void) const
 
 void wxComboBox::SetSelection( int n )
 {
 
 void wxComboBox::SetSelection( int n )
 {

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

   GtkWidget *list = GTK_COMBO(m_widget)->list;
   gtk_list_select_item( GTK_LIST(list), n );
 }
 
 void wxComboBox::SetStringSelection( const wxString &string )
 {
   GtkWidget *list = GTK_COMBO(m_widget)->list;
   gtk_list_select_item( GTK_LIST(list), n );
 }
 
 void wxComboBox::SetStringSelection( const wxString &string )
 {

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

   int res = FindString( string );
   if (res == -1) return;
   SetSelection( res );
   int res = FindString( string );
   if (res == -1) return;
   SetSelection( res );


@@ -300,6 +319,8 @@ wxString wxComboBox::GetValue(void) const
 
 void wxComboBox::SetValue( const wxString& value )
 {
 
 void wxComboBox::SetValue( const wxString& value )
 {

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

   GtkWidget *entry = GTK_COMBO(m_widget)->entry;
   wxString tmp = "";
   if (!value.IsNull()) tmp = value;
   GtkWidget *entry = GTK_COMBO(m_widget)->entry;
   wxString tmp = "";
   if (!value.IsNull()) tmp = value;


@@ -308,24 +329,44 @@ void wxComboBox::SetValue( const wxString& value )
 
 void wxComboBox::Copy(void)
 {
 
 void wxComboBox::Copy(void)
 {

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

   GtkWidget *entry = GTK_COMBO(m_widget)->entry;
   GtkWidget *entry = GTK_COMBO(m_widget)->entry;

+#if (GTK_MINOR_VERSION == 1)
+  gtk_editable_copy_clipboard( GTK_EDITABLE(entry) );
+#else

   gtk_editable_copy_clipboard( GTK_EDITABLE(entry), 0 );
   gtk_editable_copy_clipboard( GTK_EDITABLE(entry), 0 );

+#endif

 }
 
 void wxComboBox::Cut(void)
 {
 }
 
 void wxComboBox::Cut(void)
 {

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

   GtkWidget *entry = GTK_COMBO(m_widget)->entry;
   GtkWidget *entry = GTK_COMBO(m_widget)->entry;

+#if (GTK_MINOR_VERSION == 1)
+  gtk_editable_cut_clipboard( GTK_EDITABLE(entry) );
+#else

   gtk_editable_cut_clipboard( GTK_EDITABLE(entry), 0 );
   gtk_editable_cut_clipboard( GTK_EDITABLE(entry), 0 );

+#endif

 }
 
 void wxComboBox::Paste(void)
 {
 }
 
 void wxComboBox::Paste(void)
 {

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

   GtkWidget *entry = GTK_COMBO(m_widget)->entry;
   GtkWidget *entry = GTK_COMBO(m_widget)->entry;

+#if (GTK_MINOR_VERSION == 1)
+  gtk_editable_paste_clipboard( GTK_EDITABLE(entry) );
+#else

   gtk_editable_paste_clipboard( GTK_EDITABLE(entry), 0 );
   gtk_editable_paste_clipboard( GTK_EDITABLE(entry), 0 );

+#endif

 }
 
 void wxComboBox::SetInsertionPoint( long pos )
 {
 }
 
 void wxComboBox::SetInsertionPoint( long pos )
 {

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

   GtkWidget *entry = GTK_COMBO(m_widget)->entry;
   int tmp = (int) pos;
   gtk_entry_set_position( GTK_ENTRY(entry), tmp );
   GtkWidget *entry = GTK_COMBO(m_widget)->entry;
   int tmp = (int) pos;
   gtk_entry_set_position( GTK_ENTRY(entry), tmp );


@@ -333,6 +374,8 @@ void wxComboBox::SetInsertionPoint( long pos )
 
 void wxComboBox::SetInsertionPointEnd(void)
 {
 
 void wxComboBox::SetInsertionPointEnd(void)
 {

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

   GtkWidget *entry = GTK_COMBO(m_widget)->entry;
   int pos = GTK_ENTRY(entry)->text_length;
   SetInsertionPoint( pos-1 );
   GtkWidget *entry = GTK_COMBO(m_widget)->entry;
   int pos = GTK_ENTRY(entry)->text_length;
   SetInsertionPoint( pos-1 );


@@ -353,6 +396,8 @@ long wxComboBox::GetLastPosition(void) const
 
 void wxComboBox::Replace( long from, long to, const wxString& value )
 {
 
 void wxComboBox::Replace( long from, long to, const wxString& value )
 {

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

   GtkWidget *entry = GTK_COMBO(m_widget)->entry;
   gtk_editable_delete_text( GTK_EDITABLE(entry), (gint)from, (gint)to );
   if (value.IsNull()) return;
   GtkWidget *entry = GTK_COMBO(m_widget)->entry;
   gtk_editable_delete_text( GTK_EDITABLE(entry), (gint)from, (gint)to );
   if (value.IsNull()) return;


@@ -362,16 +407,62 @@ void wxComboBox::Replace( long from, long to, const wxString& value )
 
 void wxComboBox::Remove(long from, long to)
 {
 
 void wxComboBox::Remove(long from, long to)
 {

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

   GtkWidget *entry = GTK_COMBO(m_widget)->entry;
   gtk_editable_delete_text( GTK_EDITABLE(entry), (gint)from, (gint)to );
 }
 
 void wxComboBox::SetSelection( long WXUNUSED(from), long WXUNUSED(to) )
 {
   GtkWidget *entry = GTK_COMBO(m_widget)->entry;
   gtk_editable_delete_text( GTK_EDITABLE(entry), (gint)from, (gint)to );
 }
 
 void wxComboBox::SetSelection( long WXUNUSED(from), long WXUNUSED(to) )
 {

+  wxFAIL_MSG( "wxComboBox::SetSelection not implemented" );

 }
 
 void wxComboBox::SetEditable( bool WXUNUSED(editable) )
 {
 }
 
 void wxComboBox::SetEditable( bool WXUNUSED(editable) )
 {

+  wxFAIL_MSG( "wxComboBox::SetEditable not implemented" );
+}
+
+void wxComboBox::OnSize( wxSizeEvent &event )
+{
+  wxControl::OnSize( event );
+  
+  int w = 21;
+  
+  gtk_widget_set_usize( GTK_COMBO(m_widget)->entry, m_width-w-1, m_height );
+  
+  gtk_widget_set_uposition( GTK_COMBO(m_widget)->button, m_x+m_width-w, m_y );
+  gtk_widget_set_usize( GTK_COMBO(m_widget)->button, w, m_height );
+}
+
+void wxComboBox::ApplyWidgetStyle()
+{
+  SetWidgetStyle();
+  
+  gtk_widget_set_style( GTK_COMBO(m_widget)->button, m_widgetStyle );
+  gtk_widget_set_style( GTK_COMBO(m_widget)->entry, m_widgetStyle );
+  gtk_widget_set_style( GTK_COMBO(m_widget)->list, m_widgetStyle );
+  
+  GtkList *list = GTK_LIST( GTK_COMBO(m_widget)->list );
+  GList *child = list->children;
+  while (child)
+  {
+    gtk_widget_set_style( GTK_WIDGET(child->data), m_widgetStyle );
+  
+    GtkBin *bin = GTK_BIN(child->data);
+    gtk_widget_set_style( bin->child, m_widgetStyle );
+        
+    child = child->next;
+  }

 }
 
 }
 

-      
+GtkWidget* wxComboBox::GetConnectWidget(void)
+{
+  return GTK_COMBO(m_widget)->entry;
+}
+
+bool wxComboBox::IsOwnGtkWindow( GdkWindow *window )
+{
+  return ( (window == GTK_ENTRY( GTK_COMBO(m_widget)->entry )->text_area) ||
+           (window == GTK_COMBO(m_widget)->button->window ) );
+}