X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ac32ba44a150c9de37a9b56ef7cb10521d0e9347..9bb50fd0b04c824fc7ba14c0dc4ba4a2a9a1e6ad:/src/motif/choice.cpp

diff --git a/src/motif/choice.cpp b/src/motif/choice.cpp
index 37f3a967cf..7b88db0e3e 100644
--- a/src/motif/choice.cpp
+++ b/src/motif/choice.cpp
@@ -6,13 +6,16 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "choice.h"
 #endif
 
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
 #ifdef __VMS
 #define XtDisplay XTDISPLAY
 #define XtParent XTPARENT
@@ -20,8 +23,11 @@
 
 #include "wx/defs.h"
 
+#if wxUSE_CHOICE
+
 #include "wx/choice.h"
 #include "wx/utils.h"
+#include "wx/arrstr.h"
 
 #ifdef __VMS__
 #pragma message disable nosimpint
@@ -52,8 +58,6 @@ wxChoice::wxChoice()
 
 void wxChoice::Init()
 {
-    InitBase();
-
     m_noStrings = 0;
     m_buttonWidget = (WXWidget) 0;
     m_menuWidget = (WXWidget) 0;
@@ -69,7 +73,7 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
                       const wxString& name)
 {
     if ( !CreateControl(parent, id, pos, size, style, validator, name) )
-        return FALSE;
+        return false;
 
     Widget parentWidget = (Widget) parent->GetClientWidget();
 
@@ -89,7 +93,8 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
     * Create the popup menu
     */
     m_menuWidget = (WXWidget) XmCreatePulldownMenu ((Widget) m_formWidget,
-                                                    "choiceMenu", NULL, 0);
+                                                    wxMOTIF_STR("choiceMenu"),
+                                                    NULL, 0);
 
     if (n > 0)
     {
@@ -109,7 +114,7 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
     XtSetArg (args[argcnt], XmNmarginHeight, 0); ++argcnt;
     XtSetArg (args[argcnt], XmNpacking, XmPACK_TIGHT); ++argcnt;
     m_buttonWidget = (WXWidget) XmCreateOptionMenu ((Widget) m_formWidget,
-                                                    "choiceButton",
+                                                    wxMOTIF_STR("choiceButton"),
                                                     args, argcnt);
 
     m_mainWidget = m_buttonWidget;
@@ -136,13 +141,26 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
 
     XtVaSetValues((Widget) m_formWidget, XmNresizePolicy, XmRESIZE_NONE, NULL);
 
-    ChangeFont(FALSE);
+    ChangeFont(false);
     ChangeBackgroundColour();
 
     AttachWidget (parent, m_buttonWidget, m_formWidget,
                   pos.x, pos.y, bestSize.x, bestSize.y);
 
-    return TRUE;
+    return true;
+}
+
+bool wxChoice::Create(wxWindow *parent, wxWindowID id,
+                      const wxPoint& pos,
+                      const wxSize& size,
+                      const wxArrayString& choices,
+                      long style,
+                      const wxValidator& validator,
+                      const wxString& name)
+{
+    wxCArrayString chs(choices);
+    return Create(parent, id, pos, size, chs.GetCount(), chs.GetStrings(),
+                  style, validator, name);
 }
 
 wxChoice::~wxChoice()
@@ -172,7 +190,7 @@ wxChoice::~wxChoice()
 int wxChoice::DoAppend(const wxString& item)
 {
     Widget w = XtVaCreateManagedWidget (wxStripMenuCodes(item),
-#if USE_GADGETS
+#if wxUSE_GADGETS
         xmPushButtonGadgetClass, (Widget) m_menuWidget,
 #else
         xmPushButtonWidgetClass, (Widget) m_menuWidget,
@@ -211,7 +229,7 @@ int wxChoice::DoAppend(const wxString& item)
 
 int wxChoice::DoInsert(const wxString& item, int pos)
 {
-    wxCHECK_MSG(FALSE, -1, wxT("insert not implemented"));
+    wxCHECK_MSG(false, -1, wxT("insert not implemented"));
 
 //    wxCHECK_MSG((pos>=0) && (pos<=GetCount()), -1, wxT("invalid index"));
 //    if (pos == GetCount()) return DoAppend(item);
@@ -285,7 +303,7 @@ int wxChoice::GetSelection() const
 
 void wxChoice::SetSelection(int n)
 {
-    m_inSetValue = TRUE;
+    m_inSetValue = true;
 
     wxStringList::compatibility_iterator node = m_stringList.Item(n);
     if (node)
@@ -312,7 +330,7 @@ void wxChoice::SetSelection(int n)
             XmNmenuHistory, (Widget) m_widgetArray[n], NULL);
 #endif
     }
-    m_inSetValue = FALSE;
+    m_inSetValue = false;
 }
 
 int wxChoice::FindString(const wxString& s) const
@@ -327,7 +345,7 @@ int wxChoice::FindString(const wxString& s) const
         i++;
     }
 
-    return -1;
+    return wxNOT_FOUND;
 }
 
 wxString wxChoice::GetString(int n) const
@@ -424,8 +442,8 @@ void wxChoiceCallback (Widget w, XtPointer clientData, XtPointer WXUNUSED(ptr))
         {
             wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, item->GetId());
             event.SetEventObject(item);
-            event.m_commandInt = n;
-            event.m_commandString = item->GetStrings().Item(n)->GetData();
+            event.SetInt(n);
+            event.SetString( item->GetStrings().Item(n)->GetData() );
             if ( item->HasClientObjectData() )
                 event.SetClientObject( item->GetClientObject(n) );
             else if ( item->HasClientUntypedData() )
@@ -442,25 +460,28 @@ void wxChoice::ChangeFont(bool keepOriginalSize)
     // back again. TODO: a better way in Motif?
     if (m_font.Ok())
     {
+        Display* dpy = XtDisplay((Widget) m_mainWidget);
         int width, height, width1, height1;
         GetSize(& width, & height);
 
-        WXFontType fontType =
-            m_font.GetFontType(XtDisplay((Widget) m_mainWidget));
         WXString fontTag = wxFont::GetFontTag();
 
-        XtVaSetValues ((Widget) m_formWidget, fontTag, fontType, NULL);
-        XtVaSetValues ((Widget) m_buttonWidget, fontTag, fontType, NULL);
+        XtVaSetValues ((Widget) m_formWidget,
+                       fontTag, m_font.GetFontTypeC(dpy),
+                       NULL);
+        XtVaSetValues ((Widget) m_buttonWidget,
+                       fontTag, m_font.GetFontTypeC(dpy),
+                       NULL);
 
         for( size_t i = 0; i < m_noStrings; ++i )
             XtVaSetValues( (Widget)m_widgetArray[i],
-                           fontTag, fontType,
+                           fontTag, m_font.GetFontTypeC(dpy),
                            NULL );
-        
+
         GetSize(& width1, & height1);
         if (keepOriginalSize && (width != width1 || height != height1))
         {
-            SetSize(-1, -1, width, height);
+            SetSize(wxDefaultCoord, wxDefaultCoord, width, height);
         }
     }
 }
@@ -492,7 +513,7 @@ int wxChoice::GetCount() const
 
 void wxChoice::DoSetItemClientData(int n, void* clientData)
 {
-    m_clientDataDict.Set(n, (wxClientData*)clientData, FALSE);
+    m_clientDataDict.Set(n, (wxClientData*)clientData, false);
 }
 
 void* wxChoice::DoGetItemClientData(int n) const
@@ -503,7 +524,7 @@ void* wxChoice::DoGetItemClientData(int n) const
 void wxChoice::DoSetItemClientObject(int n, wxClientData* clientData)
 {
     // don't delete, wxItemContainer does that for us
-    m_clientDataDict.Set(n, clientData, FALSE);
+    m_clientDataDict.Set(n, clientData, false);
 }
 
 wxClientData* wxChoice::DoGetItemClientObject(int n) const
@@ -542,3 +563,5 @@ wxSize wxChoice::DoGetBestSize() const
     return wxSize( ( items.x ? items.x + WIDTH_OVERHEAD : 120 ),
                      items.y + HEIGHT_OVERHEAD );
 }
+
+#endif // wxUSE_CHOICE