]> git.saurik.com Git - wxWidgets.git/blobdiff - src/gtk1/choice.cpp
Fix horizontal mouse wheel scrolling in wxGTK.
[wxWidgets.git] / src / gtk1 / choice.cpp
index fad9868841285b136aa4f4fa1ae34b8bd7af8bfe..a822e02ca63a0720f55cc9584c6b8b8de563483d 100644 (file)
@@ -2,7 +2,6 @@
 // Name:        src/gtk1/choice.cpp
 // Purpose:
 // Author:      Robert Roebling
-// Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -66,7 +65,7 @@ static void gtk_choice_clicked_callback( GtkWidget *WXUNUSED(widget), wxChoice *
 
     choice->m_selection_hack = selection;
 
-    wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, choice->GetId() );
+    wxCommandEvent event(wxEVT_CHOICE, choice->GetId() );
     int n = choice->GetSelection();
 
     event.SetInt( n );
@@ -86,8 +85,6 @@ static void gtk_choice_clicked_callback( GtkWidget *WXUNUSED(widget), wxChoice *
 // wxChoice
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControlWithItems)
-
 wxChoice::wxChoice()
 {
     m_strings = NULL;
@@ -228,7 +225,7 @@ void wxChoice::DoDeleteOneItem(unsigned int n)
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid choice") );
 
-    wxCHECK_RET( IsValid(n), _T("invalid index in wxChoice::Delete") );
+    wxCHECK_RET( IsValid(n), wxT("invalid index in wxChoice::Delete") );
 
     // if the item to delete is before the selection, and the selection is valid
     if (((int)n < m_selection_hack) && (m_selection_hack != wxNOT_FOUND))