More wxMotif work, OGL enhancements, USE_ macro corrections, object.cpp delete

operator correction for VC++ 6 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@780 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1998-09-28 15:42:54 +00:00
parent 23e09f1115
commit f97c985452
44 changed files with 3439 additions and 614 deletions
--- a/src/motif/choice.cpp
+++ b/src/motif/choice.cpp
@@ -15,11 +15,32 @@

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/choice.h"
+#include "wx/utils.h"
+
+#include <Xm/Xm.h>
+#include <Xm/PushBG.h>
+#include <Xm/PushB.h>
+#include <Xm/RowColumn.h>
+
+#include "wx/motif/private.h"

 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)
 #endif

+void wxChoiceCallback (Widget w, XtPointer clientData,
+		  XtPointer ptr);
+
+wxChoice::wxChoice()
+{
+    m_noStrings = 0;
+    m_buttonWidget = (WXWidget) 0;
+    m_menuWidget = (WXWidget) 0;
+    m_widgetList = (WXWidget*) 0;
+    m_formWidget = (WXWidget) 0;
+    m_inSetValue = FALSE;
+}
+
 bool wxChoice::Create(wxWindow *parent, wxWindowID id,
           const wxPoint& pos,
           const wxSize& size,
@@ -32,62 +53,320 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
    SetValidator(validator);
    m_noStrings = n;
    m_windowStyle = style;
+    m_buttonWidget = (WXWidget) 0;
+    m_menuWidget = (WXWidget) 0;
+    m_widgetList = (WXWidget*) 0;
+    m_formWidget = (WXWidget) 0;
+    m_inSetValue = FALSE;

    if (parent) parent->AddChild(this);

    if ( id == -1 )
    	m_windowId = (int)NewControlId();
    else
-	m_windowId = id;
+	    m_windowId = id;

-    // TODO: create choice control
-    return FALSE;
+    Widget parentWidget = (Widget) parent->GetClientWidget();
+
+    m_formWidget = (WXWidget) XtVaCreateManagedWidget ((char*) (const char*) name,
+					xmRowColumnWidgetClass, parentWidget,
+					XmNmarginHeight, 0,
+					XmNmarginWidth, 0,
+					XmNpacking, XmPACK_TIGHT,
+					XmNorientation, XmHORIZONTAL,
+					NULL);
+
+    XtVaSetValues ((Widget) m_formWidget, XmNspacing, 0, NULL);
+
+   /*
+    * Create the popup menu
+    */
+    m_menuWidget = (WXWidget) XmCreatePulldownMenu ((Widget) m_formWidget, "choiceMenu", NULL, 0);
+
+    int i;
+    if (n > 0)
+    {
+        int i;
+        for (i = 0; i < n; i++)
+            Append (choices[i]);
+    }
+
+   /*
+    * Create button
+    */
+    Arg args[10];
+    Cardinal argcnt = 0;
+
+    XtSetArg (args[argcnt], XmNsubMenuId, (Widget) m_menuWidget);
+    argcnt++;
+    XtSetArg (args[argcnt], XmNmarginWidth, 0);
+    argcnt++;
+    XtSetArg (args[argcnt], XmNmarginHeight, 0);
+    argcnt++;
+    XtSetArg (args[argcnt], XmNpacking, XmPACK_TIGHT);
+    argcnt++;
+    m_buttonWidget = (WXWidget) XmCreateOptionMenu ((Widget) m_formWidget, "choiceButton", args, argcnt);
+
+    m_mainWidget = m_buttonWidget;
+
+    XtManageChild ((Widget) m_buttonWidget);
+
+    // New code from Roland Haenel (roland_haenel@ac.cybercity.de)
+    // Some time ago, I reported a problem with wxChoice-items under
+    // Linux and Motif 2.0 (they caused sporadic GPFs). Now it seems
+    // that I have found the code responsible for this behaviour.
+#if XmVersion >= 1002
+#if XmVersion <  2000
+    Widget optionLabel = XmOptionLabelGadget ((Widget) m_buttonWidget);
+    XtUnmanageChild (optionLabel);
+#endif
+#endif
+
+    XtVaSetValues((Widget) m_formWidget, XmNresizePolicy, XmRESIZE_NONE, NULL);
+
+    AttachWidget (parent, m_buttonWidget, m_formWidget, pos.x, pos.y, size.x, size.y);
+
+    SetFont(* parent->GetFont());
+    ChangeColour(m_mainWidget);
+
+    return TRUE;
+}
+
+wxChoice::~wxChoice()
+{
+  // For some reason destroying the menuWidget
+  // can cause crashes on some machines. It will
+  // be deleted implicitly by deleting the parent form
+  // anyway.
+//  XtDestroyWidget (menuWidget);
+    if (m_widgetList)
+        delete[] m_widgetList;
+
+    DetachWidget(GetMainWidget()); // Removes event handlers
+
+    XtDestroyWidget((Widget) m_formWidget);
+    m_formWidget = (WXWidget) 0;
+
+    // Presumably the other widgets have been deleted now, via the form
+    m_mainWidget = (WXWidget) 0;
+    m_buttonWidget = (WXWidget) 0;
 }

 void wxChoice::Append(const wxString& item)
 {
-    // TODO
-    m_noStrings ++;
+  wxStripMenuCodes ((char *)(const char *)item, wxBuffer);
+  Widget w = XtVaCreateManagedWidget (wxBuffer,
+#if USE_GADGETS
+				      xmPushButtonGadgetClass, (Widget) m_menuWidget,
+#else
+				      xmPushButtonWidgetClass, (Widget) m_menuWidget,
+#endif
+				      NULL);
+
+  if (m_windowFont.Ok())
+    XtVaSetValues (w,
+		   XmNfontList, (XmFontList) m_windowFont.GetFontList(1.0, XtDisplay((Widget) m_formWidget)),
+		   NULL);
+
+  WXWidget *new_widgetList = new WXWidget[m_noStrings + 1];
+  int i;
+  for (i = 0; i < m_noStrings; i++)
+    new_widgetList[i] = m_widgetList[i];
+  new_widgetList[m_noStrings] = (WXWidget) w;
+  if (m_widgetList)
+    delete[] m_widgetList;
+  m_widgetList = new_widgetList;
+
+  char mnem = wxFindMnemonic ((char*) (const char*) item);
+  if (mnem != 0)
+    XtVaSetValues (w, XmNmnemonic, mnem, NULL);
+
+  XtAddCallback (w, XmNactivateCallback, (XtCallbackProc) wxChoiceCallback, (XtPointer) this);
+
+  if (m_noStrings == 0 && m_buttonWidget)
+    {
+      XtVaSetValues ((Widget) m_buttonWidget, XmNmenuHistory, w, NULL);
+      Widget label = XmOptionButtonGadget ((Widget) m_buttonWidget);
+      XmString text = XmStringCreateSimple ((char*) (const char*) item);
+      XtVaSetValues (label,
+		     XmNlabelString, text,
+		     NULL);
+      XmStringFree (text);
+    }
+  wxNode *node = m_stringList.Add (item);
+  XtVaSetValues (w, XmNuserData, node->Data (), NULL);
+
+  m_noStrings ++;
 }

 void wxChoice::Delete(int n)
 {
+    wxFAIL_MSG( "Sorry, wxChoice::Delete isn't implemented yet. Maybe you'd like to volunteer? :-)" );
+
+    // What should we do -- remove the callback for this button widget,
+    // delete the m_stringList entry, delete the button widget, construct a new widget list
+    // (see Append)
+
    // TODO
    m_noStrings --;
 }

 void wxChoice::Clear()
 {
-    // TODO
+    m_stringList.Clear ();
+    int i;
+    for (i = 0; i < m_noStrings; i++)
+    {
+        XtUnmanageChild ((Widget) m_widgetList[i]);
+        XtDestroyWidget ((Widget) m_widgetList[i]);
+    }
+    if (m_noStrings)
+        delete[] m_widgetList;
+    m_widgetList = (WXWidget*) NULL;
+    if (m_buttonWidget)
+        XtVaSetValues ((Widget) m_buttonWidget, XmNmenuHistory, (Widget) NULL, NULL);
    m_noStrings = 0;
 }

 int wxChoice::GetSelection() const
 {
-    // TODO
-    return 0;
+  XmString text;
+  char *s;
+  Widget label = XmOptionButtonGadget ((Widget) m_buttonWidget);
+  XtVaGetValues (label,
+         XmNlabelString, &text,
+         NULL);
+
+  if (XmStringGetLtoR (text, XmSTRING_DEFAULT_CHARSET, &s))
+  {
+      int i = 0;
+      for (wxNode * node = m_stringList.First (); node; node = node->Next ())
+      {
+        char *s1 = (char *) node->Data ();
+        if (s1 == s || strcmp (s1, s) == 0)
+        {
+          XmStringFree(text) ;
+          XtFree (s);
+          return i;
+        }
+        else
+            i++;
+      }            // for()
+
+      XmStringFree(text) ;
+      XtFree (s);
+      return -1;
+  }
+  XmStringFree(text) ;
+  return -1;
 }

 void wxChoice::SetSelection(int n)
 {
-    // TODO
+  m_inSetValue = TRUE;
+  
+  wxNode *node = m_stringList.Nth (n);
+  if (node)
+    {
+      Dimension selectionWidth, selectionHeight;
+
+      char *s = (char *) node->Data ();
+      XmString text = XmStringCreateSimple (s);
+      XtVaGetValues ((Widget) m_widgetList[n], XmNwidth, &selectionWidth, XmNheight, &selectionHeight, NULL);
+      Widget label = XmOptionButtonGadget ((Widget) m_buttonWidget);
+      XtVaSetValues (label,
+                     XmNlabelString, text,
+                     NULL);
+      XmStringFree (text);
+      XtVaSetValues ((Widget) m_buttonWidget,
+                     XmNwidth, selectionWidth, XmNheight, selectionHeight,
+                     XmNmenuHistory, (Widget) m_widgetList[n], NULL);
+    }
+  m_inSetValue = FALSE;
 }

 int wxChoice::FindString(const wxString& s) const
 {
-    // TODO
-    return 0;
+    int i = 0;
+    for (wxNode * node = m_stringList.First (); node; node = node->Next ())
+    {
+        char *s1 = (char *) node->Data ();
+        if (s == s1)
+        {
+            return i;
+        }
+        else
+            i++;
+    }
+    return -1;
 }

 wxString wxChoice::GetString(int n) const
 {
-    // TODO
-    return wxString("");
+  wxNode *node = m_stringList.Nth (n);
+  if (node)
+    return wxString((char *) node->Data ());
+  else
+    return wxEmptyString;
+}
+
+void wxChoice::SetColumns(int n)
+{
+  if (n<1) n = 1 ;
+
+  short numColumns = n ;
+  Arg args[3];
+
+  XtSetArg(args[0], XmNnumColumns, numColumns);
+  XtSetArg(args[1], XmNpacking, XmPACK_COLUMN);
+  XtSetValues((Widget) m_menuWidget,args,2) ;
+}
+
+int wxChoice::GetColumns(void) const
+{
+  short numColumns ;
+
+  XtVaGetValues((Widget) m_menuWidget,XmNnumColumns,&numColumns,NULL) ;
+  return numColumns ;
+}
+
+void wxChoice::SetFocus()
+{
+  XmProcessTraversal(XtParent((Widget)m_mainWidget), XmTRAVERSE_CURRENT);
 }

 void wxChoice::SetSize(int x, int y, int width, int height, int sizeFlags)
 {
-    // TODO
+    XtVaSetValues((Widget) m_formWidget, XmNresizePolicy, XmRESIZE_ANY, NULL);
+    bool managed = XtIsManaged((Widget) m_formWidget);
+
+    if (managed)
+        XtUnmanageChild ((Widget) m_formWidget);
+
+    int actualWidth = width, actualHeight = height;
+
+    if (width > -1)
+    {
+        int i;
+        for (i = 0; i < m_noStrings; i++)
+            XtVaSetValues ((Widget) m_widgetList[i], XmNwidth, actualWidth, NULL);
+        XtVaSetValues ((Widget) m_buttonWidget, XmNwidth, actualWidth,
+             NULL);
+    }
+    if (height > -1)
+    {
+        int i;
+        for (i = 0; i < m_noStrings; i++)
+            XtVaSetValues ((Widget) m_widgetList[i], XmNheight, actualHeight, NULL);
+        XtVaSetValues ((Widget) m_buttonWidget, XmNheight, actualHeight,
+             NULL);
+    }
+
+    if (managed)
+        XtManageChild ((Widget) m_formWidget);
+    XtVaSetValues((Widget) m_formWidget, XmNresizePolicy, XmRESIZE_NONE, NULL);
+
+    wxControl::SetSize (x, y, width, height, sizeFlags);
 }

 wxString wxChoice::GetStringSelection () const
@@ -96,7 +375,7 @@ wxString wxChoice::GetStringSelection () const
    if (sel > -1)
        return wxString(this->GetString (sel));
    else
-        return wxString("");
+        return wxEmptyString;
 }

 bool wxChoice::SetStringSelection (const wxString& s)
@@ -117,3 +396,24 @@ void wxChoice::Command(wxCommandEvent & event)
    ProcessCommand (event);
 }

+void wxChoiceCallback (Widget w, XtPointer clientData,
+          XtPointer ptr)
+{
+    wxChoice *item = (wxChoice *) clientData;
+    if (item)
+    {
+        if (item->m_inSetValue)
+            return;
+        
+        char *s = NULL;
+        XtVaGetValues (w, XmNuserData, &s, NULL);
+        if (s)
+        {
+            wxCommandEvent event (wxEVT_COMMAND_CHOICE_SELECTED);
+            event.m_commandInt = item->FindString (s);
+//            event.m_commandString = s;
+            item->ProcessCommand (event);
+        }
+    }
+}
+