wxEVT_COMMAND_CHOICE_SELECTED => wxEVT_COMMAND_COMBOBOX_SELECTED

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1512 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp
index 82037c716dac14a071826eaf88b5d1a7e9abed65..7fd217fda342388270ff71edad84f80c775622e2 100644 (file)
--- a/src/gtk/combobox.cpp
+++ b/src/gtk/combobox.cpp
@@ -42,7 +42,7 @@ static void gtk_combo_clicked_callback( GtkWidget *WXUNUSED(widget), wxComboBox
 
     combo->m_alreadySent = TRUE;
 
 
     combo->m_alreadySent = TRUE;
 

-    wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, combo->GetId());
+    wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_SELECTED, combo->GetId());

     event.SetInt( combo->GetSelection() );
     wxString tmp( combo->GetStringSelection() );
     event.SetString( WXSTRINGCAST(tmp) );
     event.SetInt( combo->GetSelection() );
     wxString tmp( combo->GetStringSelection() );
     event.SetString( WXSTRINGCAST(tmp) );


@@ -54,7 +54,7 @@ static void gtk_combo_clicked_callback( GtkWidget *WXUNUSED(widget), wxComboBox
 //  "changed"
 //-----------------------------------------------------------------------------
 
 //  "changed"
 //-----------------------------------------------------------------------------
 

-static void 
+static void

 gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
 {
     wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, combo->m_windowId );
 gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
 {
     wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, combo->m_windowId );

diff --git a/src/gtk1/combobox.cpp b/src/gtk1/combobox.cpp
index 82037c716dac14a071826eaf88b5d1a7e9abed65..7fd217fda342388270ff71edad84f80c775622e2 100644 (file)
--- a/src/gtk1/combobox.cpp
+++ b/src/gtk1/combobox.cpp
@@ -42,7 +42,7 @@ static void gtk_combo_clicked_callback( GtkWidget *WXUNUSED(widget), wxComboBox
 
     combo->m_alreadySent = TRUE;
 
 
     combo->m_alreadySent = TRUE;
 

-    wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, combo->GetId());
+    wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_SELECTED, combo->GetId());

     event.SetInt( combo->GetSelection() );
     wxString tmp( combo->GetStringSelection() );
     event.SetString( WXSTRINGCAST(tmp) );
     event.SetInt( combo->GetSelection() );
     wxString tmp( combo->GetStringSelection() );
     event.SetString( WXSTRINGCAST(tmp) );


@@ -54,7 +54,7 @@ static void gtk_combo_clicked_callback( GtkWidget *WXUNUSED(widget), wxComboBox
 //  "changed"
 //-----------------------------------------------------------------------------
 
 //  "changed"
 //-----------------------------------------------------------------------------
 

-static void 
+static void

 gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
 {
     wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, combo->m_windowId );
 gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
 {
     wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, combo->m_windowId );