missing commit

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

diff --git a/src/motif/choice.cpp b/src/motif/choice.cpp
index 10f3c3fcccf6c2ebb94c6b14b8df43139992d97f..39b0f030860affe7ab284632d64ed05241fc6624 100644 (file)
--- a/src/motif/choice.cpp
+++ b/src/motif/choice.cpp
@@ -38,8 +38,6 @@
 #define WIDTH_OVERHEAD_SUBTRACT 40
 #define HEIGHT_OVERHEAD 15
 
 #define WIDTH_OVERHEAD_SUBTRACT 40
 #define HEIGHT_OVERHEAD 15
 

-IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControlWithItems)
-

 void wxChoiceCallback (Widget w, XtPointer clientData,
                        XtPointer ptr);
 
 void wxChoiceCallback (Widget w, XtPointer clientData,
                        XtPointer ptr);
 


@@ -207,7 +205,7 @@ int wxChoice::DoInsertItems(const wxArrayStringsAdapter& items,
 
         wxDoChangeBackgroundColour((WXWidget) w, m_backgroundColour);
 
 
         wxDoChangeBackgroundColour((WXWidget) w, m_backgroundColour);
 

-        if( m_font.Ok() )
+        if( m_font.IsOk() )

             wxDoChangeFont( w, m_font );
 
         m_widgetArray.Insert(w, pos);
             wxDoChangeFont( w, m_font );
 
         m_widgetArray.Insert(w, pos);


@@ -413,7 +411,7 @@ void wxChoiceCallback (Widget w, XtPointer clientData, XtPointer WXUNUSED(ptr))
         int n = item->GetWidgets().Index(w);
         if (n != wxNOT_FOUND)
         {
         int n = item->GetWidgets().Index(w);
         if (n != wxNOT_FOUND)
         {

-            wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, item->GetId());
+            wxCommandEvent event(wxEVT_CHOICE, item->GetId());

             event.SetEventObject(item);
             event.SetInt(n);
             event.SetString( item->GetStrings().Item(n) );
             event.SetEventObject(item);
             event.SetInt(n);
             event.SetString( item->GetStrings().Item(n) );


@@ -431,7 +429,7 @@ void wxChoice::ChangeFont(bool keepOriginalSize)
     // Note that this causes the widget to be resized back
     // to its original size! We therefore have to set the size
     // back again. TODO: a better way in Motif?
     // Note that this causes the widget to be resized back
     // to its original size! We therefore have to set the size
     // back again. TODO: a better way in Motif?

-    if (m_mainWidget && m_font.Ok())
+    if (m_mainWidget && m_font.IsOk())

     {
         Display* dpy = XtDisplay((Widget) m_mainWidget);
         int width, height, width1, height1;
     {
         Display* dpy = XtDisplay((Widget) m_mainWidget);
         int width, height, width1, height1;