fixed wxrc's dependencies

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

diff --git a/src/os2/listbox.cpp b/src/os2/listbox.cpp
index f99ec829ec8f1908f5d3fc98a43a3b01fc258694..350cea8f687b69b656d4730253377ff903775922 100644 (file)
--- a/src/os2/listbox.cpp
+++ b/src/os2/listbox.cpp
@@ -21,6 +21,7 @@
 #include "wx/brush.h"
 #include "wx/font.h"
 #include "wx/dc.h"
 #include "wx/brush.h"
 #include "wx/font.h"
 #include "wx/dc.h"

+#include "wx/dcscreen.h"

 #include "wx/utils.h"
 #include "wx/scrolwin.h"
 #endif
 #include "wx/utils.h"
 #include "wx/scrolwin.h"
 #endif


@@ -55,7 +56,7 @@ wxListBoxItem::wxListBoxItem(
   const wxString& rsStr
 )
 : wxOwnerDrawn( rsStr
   const wxString& rsStr
 )
 : wxOwnerDrawn( rsStr

-               ,FALSE
+               ,false

               )
 {
     //
               )
 {
     //


@@ -84,6 +85,23 @@ wxListBox::wxListBox()
     m_nSelected = 0;
 } // end of wxListBox::wxListBox
 
     m_nSelected = 0;
 } // end of wxListBox::wxListBox
 

+bool wxListBox::Create(
+  wxWindow*                         pParent
+, wxWindowID                        vId
+, const wxPoint&                    rPos
+, const wxSize&                     rSize
+, const wxArrayString&              asChoices
+, long                              lStyle
+, const wxValidator&                rValidator
+, const wxString&                   rsName
+)
+{
+    wxCArrayString chs(asChoices);
+
+    return Create(pParent, vId, rPos, rSize, chs.GetCount(), chs.GetStrings(),
+                  lStyle, rValidator, rsName);
+}
+

 bool wxListBox::Create(
   wxWindow*                         pParent
 , wxWindowID                        vId
 bool wxListBox::Create(
   wxWindow*                         pParent
 , wxWindowID                        vId


@@ -92,9 +110,7 @@ bool wxListBox::Create(
 , int                               n
 , const wxString                    asChoices[]
 , long                              lStyle
 , int                               n
 , const wxString                    asChoices[]
 , long                              lStyle

-#if wxUSE_VALIDATORS

 , const wxValidator&                rValidator
 , const wxValidator&                rValidator

-#endif

 , const wxString&                   rsName
 )
 {
 , const wxString&                   rsName
 )
 {


@@ -112,7 +128,7 @@ bool wxListBox::Create(
 
     wxSystemSettings                vSettings;
 
 
     wxSystemSettings                vSettings;
 

-    SetBackgroundColour(vSettings.GetSystemColour(wxSYS_COLOUR_WINDOW));
+    SetBackgroundColour(vSettings.GetColour(wxSYS_COLOUR_WINDOW));

     SetForegroundColour(pParent->GetForegroundColour());
 
     m_windowId = (vId == -1) ? (int)NewControlId() : vId;
     SetForegroundColour(pParent->GetForegroundColour());
 
     m_windowId = (vId == -1) ? (int)NewControlId() : vId;


@@ -143,15 +159,6 @@ bool wxListBox::Create(
     //
     lStyle |= LS_NOADJUSTPOS;
 
     //
     lStyle |= LS_NOADJUSTPOS;
 

-    //
-    // If the parent is a scrolled window the controls must
-    // have this style or they will overlap the scrollbars
-    //
-    if (pParent)
-        if (pParent->IsKindOf(CLASSINFO(wxScrolledWindow)) ||
-            pParent->IsKindOf(CLASSINFO(wxGenericScrolledWindow)))
-            lStyle |= WS_CLIPSIBLINGS;
-

     m_hWnd = (WXHWND)::WinCreateWindow( GetWinHwnd(pParent) // Parent
                                        ,WC_LISTBOX          // Default Listbox class
                                        ,"LISTBOX"           // Control's name
     m_hWnd = (WXHWND)::WinCreateWindow( GetWinHwnd(pParent) // Parent
                                        ,WC_LISTBOX          // Default Listbox class
                                        ,"LISTBOX"           // Control's name


@@ -165,7 +172,7 @@ bool wxListBox::Create(
                                       );
     if (m_hWnd == 0)
     {
                                       );
     if (m_hWnd == 0)
     {

-        return FALSE;
+        return false;

     }
 
     //
     }
 
     //


@@ -179,10 +186,15 @@ bool wxListBox::Create(
     {
         Append(asChoices[lUi]);
     }
     {
         Append(asChoices[lUi]);
     }

-    SetFont(*wxSMALL_FONT);
+    wxFont*                          pTextFont = new wxFont( 10
+                                                            ,wxMODERN
+                                                            ,wxNORMAL
+                                                            ,wxNORMAL
+                                                           );
+    SetFont(*pTextFont);

 
     //
 
     //

-    // Set standard wxWindows colors for Listbox items and highlighting
+    // Set standard wxWidgets colors for Listbox items and highlighting

     //
     wxColour                        vColour;
 
     //
     wxColour                        vColour;
 


@@ -208,7 +220,8 @@ bool wxListBox::Create(
             ,nWidth
             ,nHeight
            );
             ,nWidth
             ,nHeight
            );

-    return TRUE;
+    delete pTextFont;
+    return true;

 } // end of wxListBox::Create
 
 wxListBox::~wxListBox()
 } // end of wxListBox::Create
 
 wxListBox::~wxListBox()


@@ -268,28 +281,30 @@ int wxListBox::DoAppend(
   const wxString&                   rsItem
 )
 {
   const wxString&                   rsItem
 )
 {

-    int                             nIndex = 0;
-    SHORT                           nIndexType = 0;
+    long                            lIndex = 0;
+    LONG                            lIndexType = 0;

 
     if (m_windowStyle & wxLB_SORT)
 
     if (m_windowStyle & wxLB_SORT)

-        nIndexType = LIT_SORTASCENDING;
+        lIndexType = LIT_SORTASCENDING;

     else
     else

-        nIndexType = LIT_END;
-    nIndex = (int)::WinSendMsg(GetHwnd(), LM_INSERTITEM, (MPARAM)nIndexType, (MPARAM)rsItem.c_str());
+        lIndexType = LIT_END;
+    lIndex = (long)::WinSendMsg(GetHwnd(), LM_INSERTITEM, (MPARAM)lIndexType, (MPARAM)rsItem.c_str());

     m_nNumItems++;
 
 #if wxUSE_OWNER_DRAWN
     if (m_windowStyle & wxLB_OWNERDRAW)
     {
     m_nNumItems++;
 
 #if wxUSE_OWNER_DRAWN
     if (m_windowStyle & wxLB_OWNERDRAW)
     {

-        wxOwnerDrawn*               pNewItem = CreateItem(nIndex); // dummy argument
+        wxOwnerDrawn*               pNewItem = CreateItem(lIndex); // dummy argument
+        wxScreenDC                  vDc;
+

 
         pNewItem->SetName(rsItem);
 
         pNewItem->SetName(rsItem);

-        m_aItems.Add(pNewItem);
-        ::WinSendMsg(GetHwnd(), LM_SETITEMHANDLE, (MPARAM)((SHORT)nIndex), MPFROMP(pNewItem));
+        m_aItems.Insert(pNewItem, lIndex);
+        ::WinSendMsg(GetHwnd(), LM_SETITEMHANDLE, (MPARAM)lIndex, MPFROMP(pNewItem));

         pNewItem->SetFont(GetFont());
     }
 #endif
         pNewItem->SetFont(GetFont());
     }
 #endif

-    return nIndex;
+    return (int)lIndex;

 } // end of wxListBox::DoAppend
 
 void wxListBox::DoSetItems(
 } // end of wxListBox::DoAppend
 
 void wxListBox::DoSetItems(


@@ -298,9 +313,8 @@ void wxListBox::DoSetItems(
 )
 {
     BOOL                            bHideAndShow = IsShown();
 )
 {
     BOOL                            bHideAndShow = IsShown();

-    int                             nCount = 0;

     int                             i;
     int                             i;

-    SHORT                           nIndexType = 0;
+    LONG                            lIndexType = 0;

 
     if (bHideAndShow)
     {
 
     if (bHideAndShow)
     {


@@ -312,10 +326,10 @@ void wxListBox::DoSetItems(
     {
 
         if (m_windowStyle & wxLB_SORT)
     {
 
         if (m_windowStyle & wxLB_SORT)

-            nIndexType = LIT_SORTASCENDING;
+            lIndexType = LIT_SORTASCENDING;

         else
         else

-            nIndexType = LIT_END;
-        ::WinSendMsg(GetHwnd(), LM_INSERTITEM, (MPARAM)nIndexType, (MPARAM)raChoices[i].c_str());
+            lIndexType = LIT_END;
+        ::WinSendMsg(GetHwnd(), LM_INSERTITEM, (MPARAM)lIndexType, (MPARAM)raChoices[i].c_str());

 
         if (ppClientData)
         {
 
         if (ppClientData)
         {


@@ -334,24 +348,18 @@ void wxListBox::DoSetItems(
         //
         // First delete old items
         //
         //
         // First delete old items
         //

-        size_t                      lUi = m_aItems.Count();
-
-        while (lUi-- != 0)
-        {
-            delete m_aItems[lUi];
-        }
-        m_aItems.Empty();
+        WX_CLEAR_ARRAY(m_aItems);

 
         //
         // Then create new ones
         //
 
         //
         // Then create new ones
         //

-        for (lUi = 0; lUi < (size_t)m_nNumItems; lUi++)
+        for (size_t ui = 0; ui < (size_t)m_nNumItems; ui++)

         {
         {

-            wxOwnerDrawn*           pNewItem = CreateItem(lUi);
+            wxOwnerDrawn*           pNewItem = CreateItem(ui);

 
 

-            pNewItem->SetName(raChoices[lUi]);
+            pNewItem->SetName(raChoices[ui]);

             m_aItems.Add(pNewItem);
             m_aItems.Add(pNewItem);

-            ::WinSendMsg(GetHwnd(), LM_SETITEMHANDLE, MPFROMLONG(lUi), MPFROMP(pNewItem));
+            ::WinSendMsg(GetHwnd(), LM_SETITEMHANDLE, MPFROMLONG(ui), MPFROMP(pNewItem));

         }
     }
 #endif // wxUSE_OWNER_DRAWN
         }
     }
 #endif // wxUSE_OWNER_DRAWN


@@ -407,7 +415,7 @@ void wxListBox::Clear()
     m_nNumItems = 0;
 } // end of wxListBox::Clear
 
     m_nNumItems = 0;
 } // end of wxListBox::Clear
 

-void wxListBox::SetSelection(
+void wxListBox::DoSetSelection(

   int                               N
 , bool                              bSelect
 )
   int                               N
 , bool                              bSelect
 )


@@ -419,19 +427,31 @@ void wxListBox::SetSelection(
                  ,MPFROMLONG(N)
                  ,(MPARAM)bSelect
                 );
                  ,MPFROMLONG(N)
                  ,(MPARAM)bSelect
                 );

+    if(m_windowStyle & wxLB_OWNERDRAW)
+        Refresh();

 } // end of wxListBox::SetSelection
 
 bool wxListBox::IsSelected(
   int                               N
 ) const
 {
 } // end of wxListBox::SetSelection
 
 bool wxListBox::IsSelected(
   int                               N
 ) const
 {

-    wxCHECK_MSG( N >= 0 && N < m_nNumItems, FALSE,
+    wxCHECK_MSG( N >= 0 && N < m_nNumItems, false,

                  wxT("invalid index in wxListBox::Selected") );
 
     LONG                            lItem;
 
                  wxT("invalid index in wxListBox::Selected") );
 
     LONG                            lItem;
 

-    lItem = LONGFROMMR(::WinSendMsg(GetHwnd(), LM_QUERYSELECTION, (MPARAM)N, (MPARAM)0));
-    return (lItem != LIT_NONE);
+    if (GetWindowStyleFlag() & wxLB_EXTENDED)
+    {
+        if (N == 0)
+            lItem = LONGFROMMR(::WinSendMsg(GetHwnd(), LM_QUERYSELECTION, (MPARAM)LIT_FIRST, (MPARAM)0));
+        else
+            lItem = LONGFROMMR(::WinSendMsg(GetHwnd(), LM_QUERYSELECTION, (MPARAM)(N - 1), (MPARAM)0));
+    }
+    else
+    {
+        lItem = LONGFROMMR(::WinSendMsg(GetHwnd(), LM_QUERYSELECTION, (MPARAM)LIT_FIRST, (MPARAM)0));
+    }
+    return (lItem == (LONG)N && lItem != LIT_NONE);

 } // end of wxListBox::IsSelected
 
 wxClientData* wxListBox::DoGetItemClientObject(
 } // end of wxListBox::IsSelected
 
 wxClientData* wxListBox::DoGetItemClientObject(


@@ -599,8 +619,25 @@ void wxListBox::DoInsertItems(
     int                             nItems = asItems.GetCount();
 
     for (int i = 0; i < nItems; i++)
     int                             nItems = asItems.GetCount();
 
     for (int i = 0; i < nItems; i++)

-        ::WinSendMsg(GetHwnd(), LM_INSERTITEM, MPFROMLONG((LONG)(i + nPos)), (MPARAM)asItems[i].c_str());
-    m_nNumItems += nItems;
+    {
+        int                         nIndex = (int)::WinSendMsg( GetHwnd()
+                                                               ,LM_INSERTITEM
+                                                               ,MPFROMLONG((LONG)(i + nPos))
+                                                               ,(MPARAM)asItems[i].c_str()
+                                                              );
+
+        wxOwnerDrawn*               pNewItem = CreateItem(nIndex);
+
+        pNewItem->SetName(asItems[i]);
+        pNewItem->SetFont(GetFont());
+        m_aItems.Insert(pNewItem, nIndex);
+        ::WinSendMsg( GetHwnd()
+                     ,LM_SETITEMHANDLE
+                     ,(MPARAM)((LONG)nIndex)
+                     ,MPFROMP(pNewItem)
+                    );
+        m_nNumItems += nItems;
+    }

 } // end of wxListBox::DoInsertItems
 
 void wxListBox::SetString(
 } // end of wxListBox::DoInsertItems
 
 void wxListBox::SetString(


@@ -748,7 +785,7 @@ bool wxListBox::OS2Command(
         //
         // Some event we're not interested in
         //
         //
         // Some event we're not interested in
         //

-        return FALSE;
+        return false;

     }
     wxCommandEvent                  vEvent( eEvtType
                                            ,m_windowId
     }
     wxCommandEvent                  vEvent( eEvtType
                                            ,m_windowId


@@ -773,7 +810,7 @@ bool wxListBox::OS2Command(
     {
         n = -1;
     }
     {
         n = -1;
     }

-    vEvent.m_commandInt = n;
+    vEvent.SetInt(n);

     return GetEventHandler()->ProcessEvent(vEvent);
 } // end of wxListBox::OS2Command
 
     return GetEventHandler()->ProcessEvent(vEvent);
 } // end of wxListBox::OS2Command
 


@@ -789,21 +826,152 @@ bool wxListBox::OS2Command(
 //
 #define OWNER_DRAWN_LISTBOX_EXTRA_SPACE    (1)
 
 //
 #define OWNER_DRAWN_LISTBOX_EXTRA_SPACE    (1)
 

-bool wxListBox::OS2OnMeasure(WXMEASUREITEMSTRUCT *item)
+long wxListBox::OS2OnMeasure(
+  WXMEASUREITEMSTRUCT*              pItem
+)

 {
 {

+    if (!pItem)
+        pItem = (WXMEASUREITEMSTRUCT*)new OWNERITEM;
+
+    POWNERITEM                      pMeasureStruct = (POWNERITEM)pItem;
+    wxScreenDC                      vDc;
+

     //
     //

-    // TODO: Get to this eventually
+    // Only owner-drawn control should receive this message

     //
     //

-    return TRUE;
-}
+    wxCHECK( ((m_windowStyle & wxLB_OWNERDRAW) == wxLB_OWNERDRAW), FALSE );

 
 

-bool wxListBox::OS2OnDraw(WXDRAWITEMSTRUCT *item)
+    vDc.SetFont(GetFont());
+
+    wxCoord                         vHeight;
+    wxCoord                         vWidth;
+
+    GetSize( &vWidth
+            ,NULL
+           );
+
+    pMeasureStruct->rclItem.xRight = (USHORT)vWidth;
+    pMeasureStruct->rclItem.xLeft  = 0;
+    pMeasureStruct->rclItem.yTop   = 0;
+    pMeasureStruct->rclItem.yBottom = 0;
+
+    vHeight = (wxCoord)(vDc.GetCharHeight() * 2.5);
+    pMeasureStruct->rclItem.yTop  = (USHORT)vHeight;
+
+    return long(MRFROM2SHORT((USHORT)vHeight, (USHORT)vWidth));
+} // end of wxListBox::OS2OnMeasure
+
+bool wxListBox::OS2OnDraw (
+  WXDRAWITEMSTRUCT*                 pItem
+)

 {
 {

+    POWNERITEM                      pDrawStruct = (POWNERITEM)pItem;
+    LONG                            lItemID = pDrawStruct->idItem;
+    int                             eAction = 0;
+    int                             eStatus = 0;
+

     //
     //

-    // TODO: Get to this eventually
+    // Only owner-drawn control should receive this message

     //
     //

-    return FALSE;
-}
+    wxCHECK(((m_windowStyle & wxLB_OWNERDRAW) == wxLB_OWNERDRAW), false);
+
+
+    //
+    // The item may be -1 for an empty listbox
+    //
+    if (lItemID == -1L)
+        return false;
+
+    wxListBoxItem*                   pData = (wxListBoxItem*)PVOIDFROMMR( ::WinSendMsg( GetHwnd()
+                                                                                       ,LM_QUERYITEMHANDLE
+                                                                                       ,MPFROMLONG(pDrawStruct->idItem)
+                                                                                       ,(MPARAM)0
+                                                                                      )
+                                                                        );
+
+    wxCHECK(pData, false );
+
+    wxDC                              vDc;
+    wxRect                            vRect( wxPoint( pDrawStruct->rclItem.xLeft
+                                                     ,pDrawStruct->rclItem.yTop
+                                                    )
+                                            ,wxPoint( pDrawStruct->rclItem.xRight
+                                                     ,pDrawStruct->rclItem.yBottom
+                                                    )
+                                           );
+
+    vDc.SetHPS(pDrawStruct->hps);
+
+    if (pDrawStruct->fsAttribute == pDrawStruct->fsAttributeOld)
+    {
+        //
+        // Entire Item needs to be redrawn (either it has reappeared from
+        // behind another window or is being displayed for the first time
+        //
+        eAction = wxOwnerDrawn::wxODDrawAll;
+
+        if (pDrawStruct->fsAttribute & MIA_HILITED)
+        {
+            //
+            // If it is currently selected we let the system handle it
+            //
+            eStatus |= wxOwnerDrawn::wxODSelected;
+        }
+        if (pDrawStruct->fsAttribute & MIA_CHECKED)
+        {
+            //
+            // If it is currently checked we draw our own
+            //
+            eStatus |= wxOwnerDrawn::wxODChecked;
+            pDrawStruct->fsAttributeOld = pDrawStruct->fsAttribute &= ~MIA_CHECKED;
+        }
+        if (pDrawStruct->fsAttribute & MIA_DISABLED)
+        {
+            //
+            // If it is currently disabled we let the system handle it
+            //
+            eStatus |= wxOwnerDrawn::wxODDisabled;
+        }
+        //
+        // Don't really care about framed (indicationg focus) or NoDismiss
+        //
+    }
+    else
+    {
+        if (pDrawStruct->fsAttribute & MIA_HILITED)
+        {
+            eAction = wxOwnerDrawn::wxODDrawAll;
+            eStatus |= wxOwnerDrawn::wxODSelected;
+            //
+            // Keep the system from trying to highlight with its bogus colors
+            //
+            pDrawStruct->fsAttributeOld = pDrawStruct->fsAttribute &= ~MIA_HILITED;
+        }
+        else if (!(pDrawStruct->fsAttribute & MIA_HILITED))
+        {
+            eAction = wxOwnerDrawn::wxODDrawAll;
+            eStatus = 0;
+            //
+            // Keep the system from trying to highlight with its bogus colors
+            //
+            pDrawStruct->fsAttribute = pDrawStruct->fsAttributeOld &= ~MIA_HILITED;
+        }
+        else
+        {
+            //
+            // For now we don't care about anything else
+            // just ignore the entire message!
+            //
+            return true;
+        }
+    }
+    return pData->OnDrawItem( vDc
+                             ,vRect
+                             ,(wxOwnerDrawn::wxODAction)eAction
+                             ,(wxOwnerDrawn::wxODStatus)eStatus
+                            );
+} // end of wxListBox::OS2OnDraw
+

 #endif // ndef for wxUSE_OWNER_DRAWN
 
 #endif // ndef for wxUSE_LISTBOX
 #endif // ndef for wxUSE_OWNER_DRAWN
 
 #endif // ndef for wxUSE_LISTBOX