load wsock32.dll dynamically, so that wxCore has no dependency on it

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

diff --git a/src/motif/listbox.cpp b/src/motif/listbox.cpp
index 6beec8c9e7ec37c197527dbb00d716c92aa37308..1ad6566347e527948eee4557b7a9783bacac5734 100644 (file)
--- a/src/motif/listbox.cpp
+++ b/src/motif/listbox.cpp
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "listbox.h"
 #endif
 
     #pragma implementation "listbox.h"
 #endif
 


@@ -23,6 +23,7 @@
 #include "wx/dynarray.h"
 #include "wx/log.h"
 #include "wx/utils.h"
 #include "wx/dynarray.h"
 #include "wx/log.h"
 #include "wx/utils.h"

+#include "wx/arrstr.h"

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


@@ -92,22 +93,35 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
 
     Widget parentWidget = (Widget) parent->GetClientWidget();
 
 
     Widget parentWidget = (Widget) parent->GetClientWidget();
 

-    Arg args[3];
+    WXFontType fontType = (WXFontType)NULL;
+
+    if( m_font.Ok() )
+    {
+        fontType = m_font.GetFontType(XtDisplay(parentWidget));
+    }
+
+    Arg args[4];

     int count = 0;
     int count = 0;

-    XtSetArg( args[0], XmNlistSizePolicy, XmCONSTANT ); ++count;
-    XtSetArg( args[1], XmNselectionPolicy,
+    XtSetArg( args[count], XmNlistSizePolicy, XmCONSTANT ); ++count;
+    XtSetArg( args[count], XmNselectionPolicy,

               ( m_windowStyle & wxLB_MULTIPLE ) ? XmMULTIPLE_SELECT :
               ( m_windowStyle & wxLB_EXTENDED ) ? XmEXTENDED_SELECT :
                                                   XmBROWSE_SELECT );
     ++count;
               ( m_windowStyle & wxLB_MULTIPLE ) ? XmMULTIPLE_SELECT :
               ( m_windowStyle & wxLB_EXTENDED ) ? XmEXTENDED_SELECT :
                                                   XmBROWSE_SELECT );
     ++count;

+    if( fontType )
+    {
+        XtSetArg( args[count], (String)wxFont::GetFontTag(), fontType );
+        ++count;
+    }

     if( m_windowStyle & wxLB_ALWAYS_SB )
     {
     if( m_windowStyle & wxLB_ALWAYS_SB )
     {

-        XtSetArg( args[2], XmNscrollBarDisplayPolicy, XmSTATIC );
+        XtSetArg( args[count], XmNscrollBarDisplayPolicy, XmSTATIC );

         ++count;
     }
 
         ++count;
     }
 

-    Widget listWidget = XmCreateScrolledList(parentWidget,
-                                             (char*)name.c_str(), args, count);
+    Widget listWidget =
+        XmCreateScrolledList(parentWidget,
+                             wxConstCast(name.c_str(), char), args, count);

 
     m_mainWidget = (WXWidget) listWidget;
 
 
     m_mainWidget = (WXWidget) listWidget;
 


@@ -115,12 +129,9 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
 
     XtManageChild (listWidget);
 
 
     XtManageChild (listWidget);
 

-    long width = size.x;
-    long height = size.y;
-    if (width == -1)
-        width = 150;
-    if (height == -1)
-        height = 80;
+    wxSize best = GetBestSize();
+    if( size.x != -1 ) best.x = size.x;
+    if( size.y != -1 ) best.y = size.y;

 
     XtAddCallback (listWidget,
                    XmNbrowseSelectionCallback,
 
     XtAddCallback (listWidget,
                    XmNbrowseSelectionCallback,


@@ -139,17 +150,27 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
                    (XtCallbackProc) wxListBoxCallback,
                    (XtPointer) this);
 
                    (XtCallbackProc) wxListBoxCallback,
                    (XtPointer) this);
 

-    ChangeFont(FALSE);
-
-    SetCanAddEventHandler(TRUE);

     AttachWidget (parent, m_mainWidget, (WXWidget) NULL,
     AttachWidget (parent, m_mainWidget, (WXWidget) NULL,

-                  pos.x, pos.y, width, height);
+                  pos.x, pos.y, best.x, best.y);

 
     ChangeBackgroundColour();
 
     return TRUE;
 }
 
 
     ChangeBackgroundColour();
 
     return TRUE;
 }
 

+bool wxListBox::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);
+}
+

 wxListBox::~wxListBox()
 {
     if( HasClientObjectData() )
 wxListBox::~wxListBox()
 {
     if( HasClientObjectData() )


@@ -249,7 +270,7 @@ void wxListBox::DoSetItems(const wxArrayString& items, void** clientData)
     XmString *text = new XmString[items.GetCount()];
     size_t i;
     for (i = 0; i < items.GetCount(); ++i)
     XmString *text = new XmString[items.GetCount()];
     size_t i;
     for (i = 0; i < items.GetCount(); ++i)

-        text[i] = XmStringCreateSimple ((char*)items[i].c_str());
+        text[i] = wxStringToXmString (items[i]);

 
     if ( clientData )
         for (i = 0; i < items.GetCount(); ++i)
 
     if ( clientData )
         for (i = 0; i < items.GetCount(); ++i)


@@ -443,28 +464,25 @@ int wxListBox::GetSelection() const
 }
 
 // Find string for position
 }
 
 // Find string for position

-wxString wxListBox::GetString(int N) const
+wxString wxDoGetStringInList( Widget listBox, int n )

 {
 {

-    Widget listBox = (Widget) m_mainWidget;

     XmString *strlist;
     XmString *strlist;

-    int n;
-    XtVaGetValues (listBox, XmNitemCount, &n, XmNitems, &strlist, NULL);
-    if (N <= n && N >= 0)
-    {
-        char *txt;
-        if (XmStringGetLtoR (strlist[N], XmSTRING_DEFAULT_CHARSET, &txt))
-        {
-            wxString str(txt);
-            XtFree (txt);
-            return str;
-        }
-        else
-            return wxEmptyString;
-    }
+    int count;
+    XtVaGetValues( listBox,
+                   XmNitemCount, &count,
+                   XmNitems, &strlist,
+                   NULL );
+    if( n < count && n >= 0 )
+        return wxXmStringToString( strlist[n] );

     else
         return wxEmptyString;
 }
 
     else
         return wxEmptyString;
 }
 

+wxString wxListBox::GetString( int n ) const
+{
+    return wxDoGetStringInList( (Widget)m_mainWidget, n );
+}
+

 void wxListBox::DoInsertItems(const wxArrayString& items, int pos)
 {
     wxSizeKeeper sk( this );
 void wxListBox::DoInsertItems(const wxArrayString& items, int pos)
 {
     wxSizeKeeper sk( this );


@@ -482,12 +500,12 @@ void wxListBox::DoInsertItems(const wxArrayString& items, int pos)
     // Corrected by Sergey Krasnov from Steve Hammes' code
 #if XmVersion > 1001
     for (i = 0; i < items.GetCount(); i++)
     // Corrected by Sergey Krasnov from Steve Hammes' code
 #if XmVersion > 1001
     for (i = 0; i < items.GetCount(); i++)

-        text[i] = XmStringCreateSimple((char*)items[i].c_str());
+        text[i] = wxStringToXmString(items[i]);

     XmListAddItemsUnselected(listBox, text, items.GetCount(), pos+1);
 #else
     for (i = 0; i < items.GetCount(); i++)
     {
     XmListAddItemsUnselected(listBox, text, items.GetCount(), pos+1);
 #else
     for (i = 0; i < items.GetCount(); i++)
     {

-        text[i] = XmStringCreateSimple((char*)items[i].c_str());
+        text[i] = wxStringToXmString(items[i]);

         // Another Sergey correction
         XmListAddItemUnselected(listBox, text[i], pos+i+1);
     }
         // Another Sergey correction
         XmListAddItemUnselected(listBox, text[i], pos+i+1);
     }


@@ -614,8 +632,8 @@ void wxListBox::ChangeBackgroundColour()
     * function to change them (by default, taken from wxSystemSettings)
     */
     wxColour backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
     * function to change them (by default, taken from wxSystemSettings)
     */
     wxColour backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);

-    DoChangeBackgroundColour((WXWidget) hsb, backgroundColour, TRUE);
-    DoChangeBackgroundColour((WXWidget) vsb, backgroundColour, TRUE);
+    wxDoChangeBackgroundColour((WXWidget) hsb, backgroundColour, TRUE);
+    wxDoChangeBackgroundColour((WXWidget) vsb, backgroundColour, TRUE);

 
     XtVaSetValues (hsb,
         XmNtroughColor, backgroundColour.AllocColour(XtDisplay(hsb)),
 
     XtVaSetValues (hsb,
         XmNtroughColor, backgroundColour.AllocColour(XtDisplay(hsb)),


@@ -624,7 +642,8 @@ void wxListBox::ChangeBackgroundColour()
         XmNtroughColor, backgroundColour.AllocColour(XtDisplay(vsb)),
         NULL);
 
         XmNtroughColor, backgroundColour.AllocColour(XtDisplay(vsb)),
         NULL);
 

-    DoChangeBackgroundColour((WXWidget) parent, m_backgroundColour, TRUE);
+    // MBN: why change parent's background? It looks really ugly.
+    // wxDoChangeBackgroundColour((WXWidget) parent, m_backgroundColour, TRUE);

 }
 
 void wxListBox::ChangeForegroundColour()
 }
 
 void wxListBox::ChangeForegroundColour()


@@ -642,9 +661,9 @@ void wxListBox::ChangeForegroundColour()
     /* TODO: should scrollbars be affected? Should probably have separate
              function to change them (by default, taken from wxSystemSettings)
 
     /* TODO: should scrollbars be affected? Should probably have separate
              function to change them (by default, taken from wxSystemSettings)
 

-        DoChangeForegroundColour((WXWidget) hsb, m_foregroundColour);
-        DoChangeForegroundColour((WXWidget) vsb, m_foregroundColour);
-        DoChangeForegroundColour((WXWidget) parent, m_foregroundColour);
+        wxDoChangeForegroundColour((WXWidget) hsb, m_foregroundColour);
+        wxDoChangeForegroundColour((WXWidget) vsb, m_foregroundColour);
+        wxDoChangeForegroundColour((WXWidget) parent, m_foregroundColour);

     */
 }
 
     */
 }
 


@@ -652,3 +671,51 @@ int wxListBox::GetCount() const
 {
     return m_noItems;
 }
 {
     return m_noItems;
 }

+
+#define LIST_SCROLL_SPACING 6
+
+wxSize wxDoGetListBoxBestSize( Widget listWidget, const wxWindow* window )
+{
+    int max;
+    Dimension spacing, highlight, xmargin, ymargin, shadow;
+    int width = 0;
+    int x, y;
+
+    XtVaGetValues( listWidget,
+                   XmNitemCount, &max,
+                   XmNlistSpacing, &spacing,
+                   XmNhighlightThickness, &highlight,
+                   XmNlistMarginWidth, &xmargin,
+                   XmNlistMarginHeight, &ymargin,
+                   XmNshadowThickness, &shadow,
+                   NULL );
+
+    for( size_t i = 0; i < (size_t)max; ++i )
+    {
+        window->GetTextExtent( wxDoGetStringInList( listWidget, i ), &x, &y );
+        width = wxMax( width, x );
+    }
+
+    // use some arbitrary value if there are no strings
+    if( width == 0 )
+        width = 100;
+
+    // get my
+    window->GetTextExtent( "v", &x, &y );
+
+    // make it a little larger than widest string, plus the scrollbar
+    width += wxSystemSettings::GetMetric( wxSYS_VSCROLL_X )
+        + 2 * highlight + LIST_SCROLL_SPACING + 2 * xmargin + 2 * shadow;
+
+    // at least 3 items, at most 10
+    int height = wxMax( 3, wxMin( 10, max ) ) *
+        ( y + spacing + 2 * highlight ) + 2 * ymargin + 2 * shadow;
+
+    return wxSize( width, height );
+}
+
+wxSize wxListBox::DoGetBestSize() const
+{
+    return wxDoGetListBoxBestSize( (Widget)m_mainWidget, this );
+}
+