no real changes

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

diff --git a/src/os2/choice.cpp b/src/os2/choice.cpp
index a584d5303fb41c40ef4ba78fe4aa66f5e8b13818..0597080b722f910dd4f710f891167e841bf5da78 100644 (file)
--- a/src/os2/choice.cpp
+++ b/src/os2/choice.cpp
@@ -1,119 +1,385 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        choice.cpp
 // Purpose:     wxChoice
 /////////////////////////////////////////////////////////////////////////////
 // Name:        choice.cpp
 // Purpose:     wxChoice

-// Author:      AUTHOR
+// Author:      David Webster

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     10/13/99

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) David Webster
+// Licence:     wxWindows licence

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

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

 #endif
 
 #endif
 

-// For compilers that support precompilation, includes "wx.h".
-#include "wx/choice.h"
+#include "wx/os2/private.h"

 
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)

-#endif

 
 

-bool wxChoice::Create(wxWindow *parent, wxWindowID id,
-           const wxPoint& pos,
-           const wxSize& size,
-                  int n, const wxString choices[],
-                  long style,
-           const wxValidator& validator,
-           const wxString& name)
+bool wxChoice::Create(
+  wxWindow*                         pParent
+, wxWindowID                        vId
+, const wxPoint&                    rPos
+, const wxSize&                     rSize
+, int                               n
+, const wxString                    asChoices[]
+, long                              lStyle
+#if wxUSE_VALIDATORS
+, const wxValidator&                rValidator
+#endif
+, const wxString&                   rsName
+)

 {
 {

-    SetName(name);
-    SetValidator(validator);
-    m_noStrings = n;
-    m_windowStyle = style;
+    long                            lSstyle;
+
+    if (!OS2CreateControl( pParent
+                          ,vId
+                          ,rPos
+                          ,rSize
+                          ,lStyle
+#if wxUSE_VALIDATORS
+                          ,rValidator
+#endif
+                          ,rsName
+                         ))
+        return FALSE;
+    lSstyle = CBS_DROPDOWNLIST |
+             WS_TABSTOP       |
+             WS_VISIBLE;

 
 

-    if (parent) parent->AddChild(this);
+    if (lStyle & wxCLIP_SIBLINGS )
+        lSstyle |= WS_CLIPSIBLINGS;

 
 

-    if ( id == -1 )
-       m_windowId = (int)NewControlId();
-    else
-       m_windowId = id;
+    wxASSERT_MSG( !(lStyle & wxCB_DROPDOWN) &&
+                  !(lStyle & wxCB_READONLY) &&
+                  !(lStyle & wxCB_SIMPLE),
+                  wxT("this style flag is ignored by wxChoice, you "
+                     "probably want to use a wxComboBox") );
+
+    if (!OS2CreateControl( wxT("COMBOBOX")
+                          ,lSstyle
+                         ))
+        return FALSE;

 
 

-    // TODO: create choice control
-    return FALSE;
-}
+    //
+    // A choice/combobox normally has a white background (or other, depending
+    // on global settings) rather than inheriting the parent's background colour.
+    //
+    SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW));
+    for (int i = 0; i < n; i++)
+    {
+        Append(asChoices[i]);
+    }
+    SetSize( rPos.x
+            ,rPos.y
+            ,rSize.x
+            ,rSize.y
+           );

 
 

-void wxChoice::Append(const wxString& item)
+    return TRUE;
+} // end of wxChoice::Create
+
+// ----------------------------------------------------------------------------
+// adding/deleting items to/from the list
+// ----------------------------------------------------------------------------
+
+int wxChoice::DoAppend(
+  const wxString&                   rsItem
+)

 {
 {

-    // TODO
-    m_noStrings ++;
-}
+    int                             nIndex;
+    SHORT                           nIndexType = 0;

 
 

-void wxChoice::Delete(int n)
+    if (m_windowStyle & wxLB_SORT)
+        nIndexType = LIT_SORTASCENDING;
+    else
+        nIndexType = LIT_END;
+    nIndex = (int)::WinSendMsg( GetHwnd()
+                               ,LM_INSERTITEM
+                               ,(MPARAM)nIndexType
+                               ,(MPARAM)rsItem.c_str()
+                              );
+    return nIndex;
+} // end of wxChoice::DoAppend
+
+void wxChoice::Delete(
+  int                               n
+)

 {
 {

-    // TODO
-    m_noStrings --;
-}
+    wxCHECK_RET( n < GetCount(), wxT("invalid item index in wxChoice::Delete") );
+    ::WinSendMsg(GetHwnd(), LM_DELETEITEM, (MPARAM)n, (MPARAM)0);
+} // end of wxChoice::Delete

 
 void wxChoice::Clear()
 {
 
 void wxChoice::Clear()
 {

-    // TODO
-    m_noStrings = 0;
-}
+    Free();
+    ::WinSendMsg(GetHwnd(), LM_DELETEALL, (MPARAM)0, (MPARAM)0);
+} // end of wxChoice::Clear
+
+// ----------------------------------------------------------------------------
+// selection
+// ----------------------------------------------------------------------------

 
 int wxChoice::GetSelection() const
 {
 
 int wxChoice::GetSelection() const
 {

-    // TODO
-    return 0;
-}
+    return((int)LONGFROMMR(::WinSendMsg(GetHwnd(), LM_QUERYSELECTION, (MPARAM)LIT_FIRST, (MPARAM)0)));
+} // end of wxChoice::GetSelection

 
 

-void wxChoice::SetSelection(int n)
+void wxChoice::SetSelection(
+  int                               n
+)

 {
 {

-    // TODO
-}
+    ::WinSendMsg( GetHwnd()
+                 ,LM_SELECTITEM
+                 ,(MPARAM)n
+                 ,(MPARAM)TRUE
+                );
+} // end of wxChoice::SetSelection

 
 

-int wxChoice::FindString(const wxString& s) const
+// ----------------------------------------------------------------------------
+// string list functions
+// ----------------------------------------------------------------------------
+
+int wxChoice::GetCount() const

 {
 {

-    // TODO
-    return 0;
-}
+    return((int)LONGFROMMR(::WinSendMsg(GetHwnd(), LM_QUERYITEMCOUNT, (MPARAM)0, (MPARAM)0)));
+} // end of wxChoice::GetCount

 
 

-wxString wxChoice::GetString(int n) const
+int wxChoice::FindString(
+  const wxString&                   rsStr
+) const

 {
 {

-    // TODO
-    return wxString("");
-}
+    int                             nPos;
+    int                             nTextLength;
+    PSZ                             zStr;
+    int                             nItemCount;

 
 

-void wxChoice::SetSize(int x, int y, int width, int height, int sizeFlags)
+    nItemCount = (int)LONGFROMMR(::WinSendMsg(GetHwnd(), LM_QUERYITEMCOUNT, (MPARAM)0, (MPARAM)0));
+    for (nPos = 0; nPos < nItemCount; nPos++)
+    {
+        nTextLength = (int)LONGFROMMR(::WinSendMsg(GetHwnd(), LM_QUERYITEMTEXTLENGTH, (MPARAM)nPos, (MPARAM)0));
+        zStr = new char[nTextLength + 1];
+        ::WinSendMsg(GetHwnd(), LM_QUERYITEMTEXT, MPFROM2SHORT((SHORT)nPos, (SHORT)nTextLength), (MPARAM)zStr);
+        if (rsStr == (char*)zStr)
+        {
+            delete [] zStr;
+            break;
+        }
+        delete [] zStr;
+    }
+    return nPos;
+} // end of wxChoice::FindString
+
+void wxChoice::SetString(
+  int                               n
+, const wxString&                   rsStr
+)

 {
 {

-    // TODO
-}
+    wxFAIL_MSG(wxT("not implemented"));

 
 

-wxString wxChoice::GetStringSelection () const
+#if 0 // should do this, but no Insert() so far
+    Delete(n);
+    Insert(n + 1, s);
+#endif
+} // end of wxChoice::SetString
+
+wxString wxChoice::GetString(
+  int                               n
+) const

 {
 {

-    int sel = GetSelection ();
-    if (sel > -1)
-        return wxString(this->GetString (sel));
-    else
-        return wxString("");
-}
+    size_t                          nLen = 0;
+    wxString                        sStr = "";
+    char*                           zBuf;
+
+    nLen = (size_t)LONGFROMMR(::WinSendMsg(GetHwnd(), LM_QUERYITEMTEXTLENGTH, (MPARAM)n, (MPARAM)0));
+    if (nLen)
+    {
+        zBuf = new char[nLen + 1];
+        ::WinSendMsg( GetHwnd()
+                     ,LM_QUERYITEMTEXT
+                     ,MPFROM2SHORT((SHORT)n, (SHORT)nLen)
+                     ,(MPARAM)zBuf
+                    );
+        sStr = zBuf;
+        delete [] zBuf;
+    }
+    return sStr;
+} // end of wxChoice::GetString

 
 

-bool wxChoice::SetStringSelection (const wxString& s)
+// ----------------------------------------------------------------------------
+// client data
+// ----------------------------------------------------------------------------
+
+void wxChoice::DoSetItemClientData(
+  int                               n
+, void*                             pClientData
+)

 {
 {

-    int sel = FindString (s);
-    if (sel > -1)
-        {
-            SetSelection (sel);
-            return TRUE;
-        }
-    else
+    ::WinSendMsg(GetHwnd(), LM_SETITEMHANDLE, (MPARAM)n, MPFROMP(pClientData));
+} // end of wxChoice::DoSetItemClientData
+
+void* wxChoice::DoGetItemClientData( int n ) const
+{
+    MRESULT                         rc = 0L;
+
+    rc = ::WinSendMsg(GetHwnd(), LM_QUERYITEMHANDLE, (MPARAM)n, (MPARAM)0);
+    return((void*)rc);
+} // end of wxChoice::DoSetItemClientData
+
+void wxChoice::DoSetItemClientObject(
+  int                               n
+, wxClientData*                     pClientData
+)
+{
+    DoSetItemClientData( n
+                        ,pClientData
+                       );
+} // end of wxChoice::DoSetItemClientObject
+
+wxClientData* wxChoice::DoGetItemClientObject(
+  int                               n
+) const
+{
+    return (wxClientData *)DoGetItemClientData(n);
+} // end of wxChoice::DoGetItemClientObject
+
+// ----------------------------------------------------------------------------
+// wxOS2 specific helpers
+// ----------------------------------------------------------------------------
+
+void wxChoice::DoSetSize(
+  int                               nX
+, int                               nY
+, int                               nWidth
+, int                               nHeight
+, int                               nSizeFlags
+)
+{
+    //
+    // Ignore height parameter because height doesn't mean 'initially
+    // displayed' height, it refers to the drop-down menu as well. The
+    // wxWindows interpretation is different; also, getting the size returns
+    // the _displayed_ size (NOT the drop down menu size) so
+    // setting-getting-setting size would not work.
+    //
+    wxControl::DoSetSize( nX
+                         ,nY
+                         ,nWidth
+                         ,-1
+                         ,nSizeFlags
+                        );
+} // end of wxChoice::DoSetSize
+
+wxSize wxChoice::DoGetBestSize() const
+{
+    //
+    // Find the widest string
+    //
+    int                             nLineWidth;
+    int                             nChoiceWidth = 0;
+    int                             nItems = GetCount();
+    int                             nCx;
+    int                             nCy;
+
+    for (int i = 0; i < nItems; i++)
+    {
+        wxString                    sStr(GetString(i));
+
+        GetTextExtent( sStr
+                      ,&nLineWidth
+                      ,NULL
+                     );
+        if (nLineWidth > nChoiceWidth)
+            nChoiceWidth = nLineWidth;
+    }
+
+    //
+    // Give it some reasonable default value if there are no strings in the
+    // list
+    //
+    if (nChoiceWidth == 0L)
+        nChoiceWidth = 100L;
+
+    //
+    // The combobox should be larger than the widest string
+    //
+    wxGetCharSize( GetHWND()
+                  ,&nCx
+                  ,&nCy
+                  ,(wxFont*)&GetFont()
+                 );
+    nChoiceWidth += 5 * nCx;
+
+    //
+    // Choice drop-down list depends on number of items (limited to 10)
+    //
+    size_t                          nStrings = nItems == 0 ? 10 : wxMin(10, nItems) + 1;
+    int                             nChoiceHeight = EDIT_HEIGHT_FROM_CHAR_HEIGHT(nCy) * nStrings;
+
+    return wxSize( nChoiceWidth
+                  ,nChoiceHeight
+                 );
+} // end of wxChoice::DoGetBestSize
+
+MRESULT wxChoice::OS2WindowProc(
+  WXUINT                            uMsg
+, WXWPARAM                          wParam
+, WXLPARAM                          lParam
+)
+{
+    return wxWindow::OS2WindowProc( uMsg
+                                   ,wParam
+                                   ,lParam
+                                  );
+} // end of wxChoice::OS2WindowProc
+
+bool wxChoice::OS2Command(
+  WXUINT                            uParam
+, WXWORD                            WXUNUSED(wId)
+)
+{
+    if (uParam != LN_SELECT)
+    {
+        //
+        // "selection changed" is the only event we're after
+        //

         return FALSE;
         return FALSE;

-}
+    }
+    int                             n = GetSelection();
+
+    if (n > -1)
+    {
+        wxCommandEvent              vEvent( wxEVT_COMMAND_CHOICE_SELECTED
+                                           ,m_windowId
+                                          );

 
 

-void wxChoice::Command(wxCommandEvent & event)
+        vEvent.SetInt(n);
+        vEvent.SetEventObject(this);
+        vEvent.SetString((char*)GetStringSelection().c_str());
+        if (HasClientObjectData())
+            vEvent.SetClientObject(GetClientObject(n));
+        else if (HasClientUntypedData())
+            vEvent.SetClientData(GetClientData(n));
+        ProcessCommand(vEvent);
+    }
+    return TRUE;
+} // end of wxChoice::OS2Command
+
+void wxChoice::Free()

 {
 {

-    SetSelection (event.GetInt());
-    ProcessCommand (event);
-}
+    if (HasClientObjectData())
+    {
+        size_t                      nCount = GetCount();

 
 

+        for (size_t n = 0; n < nCount; n++)
+        {
+            delete GetClientObject(n);
+        }
+    }
+} // end of wxhoice::Free