code cleanup

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

diff --git a/src/motif/choice.cpp b/src/motif/choice.cpp
index fa5340e37849be815f4538bacb1bb3c1e5d2b08e..40bd97b4533dd8a9a63bc7dbf294ebaea947486d 100644 (file)
--- a/src/motif/choice.cpp
+++ b/src/motif/choice.cpp
@@ -1,17 +1,16 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        choice.cpp
+// Name:        src/motif/choice.cpp

 // Purpose:     wxChoice
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Purpose:     wxChoice
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "choice.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

 
 #ifdef __VMS
 #define XtDisplay XTDISPLAY
 
 #ifdef __VMS
 #define XtDisplay XTDISPLAY


@@ -20,8 +19,11 @@
 
 #include "wx/defs.h"
 
 
 #include "wx/defs.h"
 

+#if wxUSE_CHOICE
+

 #include "wx/choice.h"
 #include "wx/utils.h"
 #include "wx/choice.h"
 #include "wx/utils.h"

+#include "wx/arrstr.h"

 
 #ifdef __VMS__
 #pragma message disable nosimpint
 
 #ifdef __VMS__
 #pragma message disable nosimpint


@@ -36,6 +38,10 @@
 
 #include "wx/motif/private.h"
 
 
 #include "wx/motif/private.h"
 

+#define WIDTH_OVERHEAD 48
+#define WIDTH_OVERHEAD_SUBTRACT 40
+#define HEIGHT_OVERHEAD 15
+

 IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)
 
 void wxChoiceCallback (Widget w, XtPointer clientData,
 IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)
 
 void wxChoiceCallback (Widget w, XtPointer clientData,


@@ -48,8 +54,6 @@ wxChoice::wxChoice()
 
 void wxChoice::Init()
 {
 
 void wxChoice::Init()
 {

-    InitBase();
-

     m_noStrings = 0;
     m_buttonWidget = (WXWidget) 0;
     m_menuWidget = (WXWidget) 0;
     m_noStrings = 0;
     m_buttonWidget = (WXWidget) 0;
     m_menuWidget = (WXWidget) 0;


@@ -65,7 +69,7 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
                       const wxString& name)
 {
     if ( !CreateControl(parent, id, pos, size, style, validator, name) )
                       const wxString& name)
 {
     if ( !CreateControl(parent, id, pos, size, style, validator, name) )

-        return FALSE;
+        return false;

 
     Widget parentWidget = (Widget) parent->GetClientWidget();
 
 
     Widget parentWidget = (Widget) parent->GetClientWidget();
 


@@ -75,6 +79,8 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
         XmNmarginWidth, 0,
         XmNpacking, XmPACK_TIGHT,
         XmNorientation, XmHORIZONTAL,
         XmNmarginWidth, 0,
         XmNpacking, XmPACK_TIGHT,
         XmNorientation, XmHORIZONTAL,

+        XmNresizeWidth, False,
+        XmNresizeHeight, False,

         NULL);
 
     XtVaSetValues ((Widget) m_formWidget, XmNspacing, 0, NULL);
         NULL);
 
     XtVaSetValues ((Widget) m_formWidget, XmNspacing, 0, NULL);


@@ -83,7 +89,8 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
     * Create the popup menu
     */
     m_menuWidget = (WXWidget) XmCreatePulldownMenu ((Widget) m_formWidget,
     * Create the popup menu
     */
     m_menuWidget = (WXWidget) XmCreatePulldownMenu ((Widget) m_formWidget,

-                                                    "choiceMenu", NULL, 0);
+                                                    wxMOTIF_STR("choiceMenu"),
+                                                    NULL, 0);

 
     if (n > 0)
     {
 
     if (n > 0)
     {


@@ -103,7 +110,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,
     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;
                                                     args, argcnt);
 
     m_mainWidget = m_buttonWidget;


@@ -130,14 +137,26 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
 
     XtVaSetValues((Widget) m_formWidget, XmNresizePolicy, XmRESIZE_NONE, NULL);
 
 
     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);
 
 
     AttachWidget (parent, m_buttonWidget, m_formWidget,
                   pos.x, pos.y, bestSize.x, bestSize.y);
 

-    ChangeBackgroundColour();
+    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()
 }
 
 wxChoice::~wxChoice()


@@ -164,24 +183,36 @@ wxChoice::~wxChoice()
         m_clientDataDict.DestroyData();
 }
 
         m_clientDataDict.DestroyData();
 }
 

-int wxChoice::DoAppend(const wxString& item)
+static inline wxChar* MYcopystring(const wxChar* s)

 {
 {

+    wxChar* copy = new wxChar[wxStrlen(s) + 1];
+    return wxStrcpy(copy, s);
+}
+
+int wxChoice::DoInsert(const wxString& item, int pos)
+{
+#ifndef XmNpositionIndex
+    wxCHECK_MSG( pos == GetCount(), -1, wxT("insert not implemented"));
+#endif

     Widget w = XtVaCreateManagedWidget (wxStripMenuCodes(item),
     Widget w = XtVaCreateManagedWidget (wxStripMenuCodes(item),

-#if USE_GADGETS
+#if wxUSE_GADGETS

         xmPushButtonGadgetClass, (Widget) m_menuWidget,
 #else
         xmPushButtonWidgetClass, (Widget) m_menuWidget,
         xmPushButtonGadgetClass, (Widget) m_menuWidget,
 #else
         xmPushButtonWidgetClass, (Widget) m_menuWidget,

+#endif
+#ifdef XmNpositionIndex
+        XmNpositionIndex, pos,

 #endif
         NULL);
 
 #endif
         NULL);
 

-    DoChangeBackgroundColour((WXWidget) w, m_backgroundColour);
+    wxDoChangeBackgroundColour((WXWidget) w, m_backgroundColour);

 
     if( m_font.Ok() )
         wxDoChangeFont( w, m_font );
 
 
     if( m_font.Ok() )
         wxDoChangeFont( w, m_font );
 

-    m_widgetArray.Add(w);
+    m_widgetArray.Insert(w, pos);

 
 

-    char mnem = wxFindMnemonic ((char*) (const char*) item);
+    char mnem = wxFindMnemonic (item);

     if (mnem != 0)
         XtVaSetValues (w, XmNmnemonic, mnem, NULL);
 
     if (mnem != 0)
         XtVaSetValues (w, XmNmnemonic, mnem, NULL);
 


@@ -198,10 +229,16 @@ int wxChoice::DoAppend(const wxString& item)
             XmNlabelString, text(),
             NULL);
     }
             XmNlabelString, text(),
             NULL);
     }

-    m_stringList.Add(item);
+    // need to ditch wxStringList for wxArrayString
+    m_stringList.Insert(pos, MYcopystring(item));

     m_noStrings ++;
 
     m_noStrings ++;
 

-    return GetCount() - 1;
+    return pos;
+}
+
+int wxChoice::DoAppend(const wxString& item)
+{
+    return DoInsert(item, GetCount());

 }
 
 void wxChoice::Delete(int n)
 }
 
 void wxChoice::Delete(int n)


@@ -209,7 +246,7 @@ void wxChoice::Delete(int n)
     Widget w = (Widget)m_widgetArray[n];
     XtRemoveCallback(w, XmNactivateCallback, (XtCallbackProc)wxChoiceCallback,
                      (XtPointer)this);
     Widget w = (Widget)m_widgetArray[n];
     XtRemoveCallback(w, XmNactivateCallback, (XtCallbackProc)wxChoiceCallback,
                      (XtPointer)this);

-    m_stringList.DeleteNode(m_stringList.Item(n));
+    m_stringList.Erase(m_stringList.Item(n));

     m_widgetArray.RemoveAt(size_t(n));
     m_clientDataDict.Delete(n, HasClientObjectData());
 
     m_widgetArray.RemoveAt(size_t(n));
     m_clientDataDict.Delete(n, HasClientObjectData());
 


@@ -244,41 +281,37 @@ void wxChoice::Clear()
 int wxChoice::GetSelection() const
 {
     XmString text;
 int wxChoice::GetSelection() const
 {
     XmString text;

-    char *s;

     Widget label = XmOptionButtonGadget ((Widget) m_buttonWidget);
     XtVaGetValues (label,
         XmNlabelString, &text,
         NULL);
     Widget label = XmOptionButtonGadget ((Widget) m_buttonWidget);
     XtVaGetValues (label,
         XmNlabelString, &text,
         NULL);

+    wxXmString freeMe(text);
+    wxString s = wxXmStringToString( text );

 
 

-    if (XmStringGetLtoR (text, XmSTRING_DEFAULT_CHARSET, &s))
+    if (!s.empty())

     {
         int i = 0;
     {
         int i = 0;

-        for (wxStringListNode* node = m_stringList.GetFirst ();
+        for (wxStringList::compatibility_iterator node = m_stringList.GetFirst ();

              node; node = node->GetNext ())
         {
              node; node = node->GetNext ())
         {

-            if (strcmp(node->GetData(), s) == 0)
+            if (wxStrcmp(node->GetData(), s.c_str()) == 0)

             {
             {

-                XmStringFree(text) ;
-                XtFree (s);

                 return i;
             }
             else
                 i++;
         }            // for()
 
                 return i;
             }
             else
                 i++;
         }            // for()
 

-        XmStringFree(text) ;
-        XtFree (s);

         return -1;
     }
         return -1;
     }

-    XmStringFree(text) ;

     return -1;
 }
 
 void wxChoice::SetSelection(int n)
 {
     return -1;
 }
 
 void wxChoice::SetSelection(int n)
 {

-    m_inSetValue = TRUE;
+    m_inSetValue = true;

 
 

-    wxStringListNode *node = m_stringList.Item(n);
+    wxStringList::compatibility_iterator node = m_stringList.Item(n);

     if (node)
     {
 #if 0
     if (node)
     {
 #if 0


@@ -303,27 +336,12 @@ void wxChoice::SetSelection(int n)
             XmNmenuHistory, (Widget) m_widgetArray[n], NULL);
 #endif
     }
             XmNmenuHistory, (Widget) m_widgetArray[n], NULL);
 #endif
     }

-    m_inSetValue = FALSE;
-}
-
-int wxChoice::FindString(const wxString& s) const
-{
-    int i = 0;
-    for (wxStringListNode* node = m_stringList.GetFirst();
-         node; node = node->GetNext ())
-    {
-        if (s == node->GetData())
-            return i;
-
-        i++;
-    }
-
-    return -1;
+    m_inSetValue = false;

 }
 
 wxString wxChoice::GetString(int n) const
 {
 }
 
 wxString wxChoice::GetString(int n) const
 {

-    wxStringListNode *node = m_stringList.Item(n);
+    wxStringList::compatibility_iterator node = m_stringList.Item(n);

     if (node)
         return node->GetData();
     else
     if (node)
         return node->GetData();
     else


@@ -334,7 +352,7 @@ void wxChoice::SetColumns(int n)
 {
     if (n<1) n = 1 ;
 
 {
     if (n<1) n = 1 ;
 

-    short numColumns = n ;
+    short numColumns = (short)n ;

     Arg args[3];
 
     XtSetArg(args[0], XmNnumColumns, numColumns);
     Arg args[3];
 
     XtSetArg(args[0], XmNnumColumns, numColumns);


@@ -363,7 +381,8 @@ void wxChoice::DoSetSize(int x, int y, int width, int height, int sizeFlags)
     if (managed)
         XtUnmanageChild ((Widget) m_formWidget);
 
     if (managed)
         XtUnmanageChild ((Widget) m_formWidget);
 

-    int actualWidth = width, actualHeight = height;
+    int actualWidth = width - WIDTH_OVERHEAD_SUBTRACT,
+        actualHeight = height - HEIGHT_OVERHEAD;

 
     if (width > -1)
     {
 
     if (width > -1)
     {


@@ -377,11 +396,13 @@ void wxChoice::DoSetSize(int x, int y, int width, int height, int sizeFlags)
     }
     if (height > -1)
     {
     }
     if (height > -1)
     {

+#if 0

         size_t i;
         for (i = 0; i < m_noStrings; i++)
             XtVaSetValues ((Widget) m_widgetArray[i],
                            XmNheight, actualHeight,
                            NULL);
         size_t i;
         for (i = 0; i < m_noStrings; i++)
             XtVaSetValues ((Widget) m_widgetArray[i],
                            XmNheight, actualHeight,
                            NULL);

+#endif

         XtVaSetValues ((Widget) m_buttonWidget, XmNheight, actualHeight,
             NULL);
     }
         XtVaSetValues ((Widget) m_buttonWidget, XmNheight, actualHeight,
             NULL);
     }


@@ -412,8 +433,8 @@ void wxChoiceCallback (Widget w, XtPointer clientData, XtPointer WXUNUSED(ptr))
         {
             wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, item->GetId());
             event.SetEventObject(item);
         {
             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() )
             if ( item->HasClientObjectData() )
                 event.SetClientObject( item->GetClientObject(n) );
             else if ( item->HasClientUntypedData() )


@@ -430,44 +451,50 @@ void wxChoice::ChangeFont(bool keepOriginalSize)
     // back again. TODO: a better way in Motif?
     if (m_font.Ok())
     {
     // 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);
 
         int width, height, width1, height1;
         GetSize(& width, & height);
 

-        XmFontList fontList = (XmFontList) m_font.GetFontList(1.0, XtDisplay((Widget) m_mainWidget));
-        XtVaSetValues ((Widget) m_formWidget, XmNfontList, fontList, NULL);
-        XtVaSetValues ((Widget) m_buttonWidget, XmNfontList, fontList, NULL);
+        WXString fontTag = wxFont::GetFontTag();
+
+        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],
 
         for( size_t i = 0; i < m_noStrings; ++i )
             XtVaSetValues( (Widget)m_widgetArray[i],

-                           XmNfontList, fontList,
+                           fontTag, m_font.GetFontTypeC(dpy),

                            NULL );
                            NULL );

-        
+

         GetSize(& width1, & height1);
         if (keepOriginalSize && (width != width1 || height != height1))
         {
         GetSize(& width1, & height1);
         if (keepOriginalSize && (width != width1 || height != height1))
         {

-            SetSize(-1, -1, width, height);
+            SetSize(wxDefaultCoord, wxDefaultCoord, width, height);

         }
     }
 }
 
 void wxChoice::ChangeBackgroundColour()
 {
         }
     }
 }
 
 void wxChoice::ChangeBackgroundColour()
 {

-    DoChangeBackgroundColour(m_formWidget, m_backgroundColour);
-    DoChangeBackgroundColour(m_buttonWidget, m_backgroundColour);
-    DoChangeBackgroundColour(m_menuWidget, m_backgroundColour);
+    wxDoChangeBackgroundColour(m_formWidget, m_backgroundColour);
+    wxDoChangeBackgroundColour(m_buttonWidget, m_backgroundColour);
+    wxDoChangeBackgroundColour(m_menuWidget, m_backgroundColour);

     size_t i;
     for (i = 0; i < m_noStrings; i++)
     size_t i;
     for (i = 0; i < m_noStrings; i++)

-        DoChangeBackgroundColour(m_widgetArray[i], m_backgroundColour);
+        wxDoChangeBackgroundColour(m_widgetArray[i], m_backgroundColour);

 }
 
 void wxChoice::ChangeForegroundColour()
 {
 }
 
 void wxChoice::ChangeForegroundColour()
 {

-    DoChangeForegroundColour(m_formWidget, m_foregroundColour);
-    DoChangeForegroundColour(m_buttonWidget, m_foregroundColour);
-    DoChangeForegroundColour(m_menuWidget, m_foregroundColour);
+    wxDoChangeForegroundColour(m_formWidget, m_foregroundColour);
+    wxDoChangeForegroundColour(m_buttonWidget, m_foregroundColour);
+    wxDoChangeForegroundColour(m_menuWidget, m_foregroundColour);

     size_t i;
     for (i = 0; i < m_noStrings; i++)
     size_t i;
     for (i = 0; i < m_noStrings; i++)

-        DoChangeForegroundColour(m_widgetArray[i], m_foregroundColour);
+        wxDoChangeForegroundColour(m_widgetArray[i], m_foregroundColour);

 }
 
 int wxChoice::GetCount() const
 }
 
 int wxChoice::GetCount() const


@@ -477,7 +504,7 @@ int wxChoice::GetCount() const
 
 void wxChoice::DoSetItemClientData(int n, void* clientData)
 {
 
 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
 }
 
 void* wxChoice::DoGetItemClientData(int n) const


@@ -488,7 +515,7 @@ void* wxChoice::DoGetItemClientData(int n) const
 void wxChoice::DoSetItemClientObject(int n, wxClientData* clientData)
 {
     // don't delete, wxItemContainer does that for us
 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
 }
 
 wxClientData* wxChoice::DoGetItemClientObject(int n) const


@@ -508,7 +535,7 @@ wxSize wxChoice::GetItemsSize() const
     // get my
     GetTextExtent( "|", &x, &my );
 
     // get my
     GetTextExtent( "|", &x, &my );
 

-    wxStringList::Node* curr = m_stringList.GetFirst();
+    wxStringList::compatibility_iterator curr = m_stringList.GetFirst();

     while( curr )
     {
         GetTextExtent( curr->GetData(), &x, &y );
     while( curr )
     {
         GetTextExtent( curr->GetData(), &x, &y );


@@ -524,6 +551,8 @@ wxSize wxChoice::DoGetBestSize() const
 {
     wxSize items = GetItemsSize();
     // FIXME arbitrary constants
 {
     wxSize items = GetItemsSize();
     // FIXME arbitrary constants

-    return wxSize( ( items.x ? items.x + 50 : 120 ),
-                     items.y + 15 );
+    return wxSize( ( items.x ? items.x + WIDTH_OVERHEAD : 120 ),
+                     items.y + HEIGHT_OVERHEAD );

 }
 }

+
+#endif // wxUSE_CHOICE