fix documentation for wxList and wxNode; doxygen see them as templates and the @class...

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

diff --git a/src/gtk1/choice.cpp b/src/gtk1/choice.cpp
index adf1d0410169c2172227bce35513a7ff2e4fd3cb..e6d11cc52d341835e4a99288a835b39c597c4c23 100644 (file)
--- a/src/gtk1/choice.cpp
+++ b/src/gtk1/choice.cpp
@@ -78,7 +78,7 @@ static void gtk_choice_clicked_callback( GtkWidget *WXUNUSED(widget), wxChoice *
     else if ( choice->HasClientUntypedData() )
         event.SetClientData( choice->GetClientData(n) );
 
     else if ( choice->HasClientUntypedData() )
         event.SetClientData( choice->GetClientData(n) );
 

-    choice->GetEventHandler()->ProcessEvent(event);
+    choice->HandleWindowEvent(event);

 }
 }
 
 }
 }
 


@@ -86,7 +86,7 @@ static void gtk_choice_clicked_callback( GtkWidget *WXUNUSED(widget), wxChoice *
 // wxChoice
 //-----------------------------------------------------------------------------
 
 // wxChoice
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxChoice,wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControlWithItems)

 
 wxChoice::wxChoice()
 {
 
 wxChoice::wxChoice()
 {


@@ -264,7 +264,7 @@ void wxChoice::DoDeleteOneItem(unsigned int n)
 
     void ** const data = &itemsData[0];
     if ( HasClientObjectData() )
 
     void ** const data = &itemsData[0];
     if ( HasClientObjectData() )

-        Append(items, wx_reinterpret_cast(wxClientData **, data));
+        Append(items, reinterpret_cast<wxClientData **>(data));

     else
         Append(items, data);
 }
     else
         Append(items, data);
 }