]> git.saurik.com Git - wxWidgets.git/blobdiff - src/os2/checklst.cpp
Fix typo in last commit
[wxWidgets.git] / src / os2 / checklst.cpp
index ca3be193376ef60fb1731c74cc3d2677bbfd5d92..6773983e9ff35bff453c7e92f7c0ba98d2b39b05 100644 (file)
@@ -1,12 +1,12 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        checklst.cpp
+// Name:        src/os2/checklst.cpp
 // Purpose:     implementation of wxCheckListBox class
 // Author:      David Webster
 // Modified by:
 // Created:     10/13/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#if wxUSE_OWNER_DRAWN
+#if wxUSE_CHECKLISTBOX && wxUSE_OWNER_DRAWN
+
+#include "wx/checklst.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/object.h"
+    #include "wx/log.h"
+    #include "wx/window.h"
+    #include "wx/dcmemory.h"
+    #include "wx/dcscreen.h"
+    #include "wx/settings.h"
+    #include "wx/listbox.h"
+    #include "wx/bitmap.h"
+    #include "wx/colour.h"
+    #include "wx/font.h"
+#endif
 
-#include "wx/object.h"
-#include "wx/colour.h"
-#include "wx/font.h"
-#include "wx/bitmap.h"
-#include "wx/window.h"
-#include "wx/listbox.h"
+#include "wx/os2/dc.h"
 #include "wx/ownerdrw.h"
-#include "wx/settings.h"
-#include "wx/dcmemory.h"
-#include "wx/dcscreen.h"
-#include "wx/os2/checklst.h"
-#include "wx/log.h"
 
 #define INCL_PM
 #include <os2.h>
 
+// ----------------------------------------------------------------------------
+// constants for base class
+// ----------------------------------------------------------------------------
+
+static const int CHECK_MARK_WIDTH = 15;
+
 // ----------------------------------------------------------------------------
 // private functions
 // ----------------------------------------------------------------------------
@@ -45,8 +56,6 @@
 // implementation
 // ============================================================================
 
-IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox)
-
 // ----------------------------------------------------------------------------
 // declaration and implementation of wxCheckListBoxItem class
 // ----------------------------------------------------------------------------
@@ -58,17 +67,15 @@ public:
     //
     // ctor
     //
-    wxCheckListBoxItem( wxCheckListBox* pParent
-                       ,size_t          nIndex
-                      );
+    wxCheckListBoxItem(wxCheckListBox* pParent, size_t nIndex);
 
     //
     // Drawing functions
     //
-    virtual bool OnDrawItem( wxDC&         rDc
-                            ,const wxRect& rRect
-                            ,wxODAction    eAct
-                            ,wxODStatus    eStat
+    virtual bool OnDrawItem( wxDC&         rDc,
+                             const wxRect& rRect,
+                             wxODAction    eAct,
+                             wxODStatus    eStat
                            );
 
     //
@@ -78,21 +85,20 @@ public:
     void Check(bool bCheck);
     void Toggle(void) { Check(!IsChecked()); }
 
+    virtual wxString GetName() const { return m_pParent->GetString(m_nIndex); }
+
 private:
-    bool                            m_bChecked;
-    wxCheckListBox*                 m_pParent;
-    size_t                          m_nIndex;
+    bool            m_bChecked;
+    wxCheckListBox* m_pParent;
+    size_t          m_nIndex;
 }; // end of CLASS wxCheckListBoxItem
 
-wxCheckListBoxItem::wxCheckListBoxItem (
-  wxCheckListBox*                   pParent
-, size_t                            nIndex
-)
-: wxOwnerDrawn( ""
-               ,TRUE // checkable
-              )
+
+
+wxCheckListBoxItem::wxCheckListBoxItem(wxCheckListBox* pParent, size_t nIndex)
+                   :wxOwnerDrawn( wxEmptyString, true /* checkable */ )
 {
-    m_bChecked = FALSE;
+    m_bChecked = false;
     m_pParent  = pParent;
     m_nIndex   = nIndex;
 
@@ -101,21 +107,21 @@ wxCheckListBoxItem::wxCheckListBoxItem (
     // done in OnMeasure while they are used only in OnDraw and we
     // know that there will always be OnMeasure before OnDraw
     //
-    SetMarginWidth(GetDefaultMarginWidth());
+    SetMarginWidth(CHECK_MARK_WIDTH);
 } // end of wxCheckListBoxItem::wxCheckListBoxItem
 
-bool wxCheckListBoxItem::OnDrawItem (
-  wxDC&                             rDc
-, const wxRect&                     rRect
-, wxODAction                        eAct
-, wxODStatus                        eStat
-)
+
+
+bool wxCheckListBoxItem::OnDrawItem ( wxDC& rDc,
+                                      const wxRect& rRect,
+                                      wxODAction eAct,
+                                      wxODStatus eStat )
 {
-    wxRect                          vRect = rRect;
+    wxRect vRect = rRect;
 
-    ::WinQueryWindowRect( m_pParent->GetHWND()
-                         ,&rDc.m_vRclPaint
-                        );
+
+    wxPMDCImpl *impl = (wxPMDCImpl*) rDc.GetImpl();
+    ::WinQueryWindowRect( m_pParent->GetHWND(), &impl->m_vRclPaint );
     if (IsChecked())
         eStat = (wxOwnerDrawn::wxODStatus)(eStat | wxOwnerDrawn::wxODChecked);
 
@@ -126,39 +132,28 @@ bool wxCheckListBoxItem::OnDrawItem (
     //
     vRect.x += 5;
     vRect.y -= 3;
-    if (wxOwnerDrawn::OnDrawItem( rDc
-                                 ,vRect
-                                 ,eAct
-                                 ,eStat))
+    if (wxOwnerDrawn::OnDrawItem( rDc, vRect, eAct, eStat))
     {
-        size_t                      nCheckWidth  = GetDefaultMarginWidth();
-        size_t                      nCheckHeight = m_pParent->GetItemHeight();
-        int                         nParentHeight;
-        int                         nX = rRect.GetX();
-        int                         nY = rRect.GetY();
-        int                         nOldY = nY;
-        wxColour                    vColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
-        wxPen                       vPenBack;
-        wxPen                       vPenGray;
-        wxPen                       vPenPrev;
-
-        m_pParent->GetSize( NULL
-                           ,&nParentHeight
-                          );
+        size_t    nCheckWidth  = CHECK_MARK_WIDTH;
+        size_t    nCheckHeight = m_pParent->GetItemHeight();
+        int       nParentHeight;
+        int       nX = rRect.GetX();
+        int       nY = rRect.GetY();
+        int       nOldY = nY;
+        wxColour  vColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
+        wxPen     vPenBack;
+        wxPen     vPenPrev;
+
+        m_pParent->GetSize( NULL, &nParentHeight);
 
         nY = nParentHeight - nY - nCheckHeight;
         vPenBack = wxPen(vColour, 1, wxSOLID);
-        vPenGray = wxPen(wxColour(127, 127, 127), 1, wxSOLID);
 
         //
         // Erase the 1-pixel border
         //
         rDc.SetPen(vPenBack);
-        rDc.DrawRectangle( nX
-                          ,nY
-                          ,nCheckWidth
-                          ,nCheckHeight
-                         );
+        rDc.DrawRectangle( nX, nY, nCheckWidth, nCheckHeight );
 
         //
         // Now we draw the smaller rectangle
@@ -170,12 +165,8 @@ bool wxCheckListBoxItem::OnDrawItem (
         //
         // Draw hollow gray rectangle
         //
-        rDc.SetPen(vPenGray);
-        rDc.DrawRectangle( nX
-                          ,nY
-                          ,nCheckWidth
-                          ,nCheckHeight
-                         );
+        rDc.SetPen(*wxGREY_PEN);
+        rDc.DrawRectangle( nX, nY, nCheckWidth, nCheckHeight );
 
         nX++;
         if (IsChecked())
@@ -183,31 +174,27 @@ bool wxCheckListBoxItem::OnDrawItem (
             //
             // Draw the check by loading the sys standard bitmap and drawing it
             //
-            HBITMAP                 hChkBmp = ::WinGetSysBitmap( HWND_DESKTOP
-                                                                ,SBMP_MENUCHECK
-                                                               );
-            POINTL                  vPoint = {nX, nOldY + 3};
-
-            ::WinDrawBitmap( rDc.GetHPS()
-                            ,hChkBmp
-                            ,NULL
-                            ,&vPoint
-                            ,NULL
-                            ,NULL
-                            ,DBM_NORMAL
+            HBITMAP hChkBmp = ::WinGetSysBitmap( HWND_DESKTOP, SBMP_MENUCHECK );
+            POINTL  vPoint = {nX, nOldY + 3};
+            wxPMDCImpl *impl = (wxPMDCImpl*) rDc.GetImpl();
+            ::WinDrawBitmap( impl->GetHPS(),
+                             hChkBmp,
+                             NULL,
+                             &vPoint,
+                             NULL,
+                             NULL,
+                             DBM_NORMAL
                            );
         }
-        return TRUE;
+        return true;
     }
-    return FALSE;
+    return false;
 } // end of wxCheckListBoxItem::OnDrawItem
 
 //
 // Change the state of the item and redraw it
 //
-void wxCheckListBoxItem::Check (
-  bool                              bCheck
-)
+void wxCheckListBoxItem::Check( bool bCheck )
 {
     m_bChecked = bCheck;
 
@@ -219,7 +206,7 @@ void wxCheckListBoxItem::Check (
         //
         // Update it
         //
-        int                         nIndex = m_pParent->GetItemIndex(this);
+        int nIndex = m_pParent->GetItemIndex(this);
 
         wxASSERT_MSG(nIndex != wxNOT_FOUND, wxT("what does this item do here?"));
 
@@ -227,15 +214,14 @@ void wxCheckListBoxItem::Check (
     }
 
 
-    wxCommandEvent                  vEvent( wxEVT_COMMAND_CHECKLISTBOX_TOGGLED
-                                           ,m_pParent->GetId()
-                                          );
+    wxCommandEvent vEvent( wxEVT_COMMAND_CHECKLISTBOX_TOGGLED,m_pParent->GetId());
 
     vEvent.SetInt(m_nIndex);
     vEvent.SetEventObject(m_pParent);
     m_pParent->ProcessCommand(vEvent);
 } // end of wxCheckListBoxItem::Check
 
+
 // ----------------------------------------------------------------------------
 // implementation of wxCheckListBox class
 // ----------------------------------------------------------------------------
@@ -243,10 +229,12 @@ void wxCheckListBoxItem::Check (
 // define event table
 // ------------------
 BEGIN_EVENT_TABLE(wxCheckListBox, wxListBox)
-  EVT_CHAR(wxCheckListBox::OnChar)
-  EVT_LEFT_DOWN(wxCheckListBox::OnLeftClick)
+    EVT_CHAR(wxCheckListBox::OnChar)
+    EVT_LEFT_DOWN(wxCheckListBox::OnLeftClick)
 END_EVENT_TABLE()
 
+
+
 //
 // Control creation
 // ----------------
@@ -256,119 +244,65 @@ END_EVENT_TABLE()
 // Default ctor: use Create() to really create the control
 //
 wxCheckListBox::wxCheckListBox()
-: wxListBox()
+               :wxCheckListBoxBase()
 {
 } // end of wxCheckListBox::wxCheckListBox
 
 //
 // Ctor which creates the associated control
 //
-wxCheckListBox::wxCheckListBox (
-  wxWindow*                         pParent
-, wxWindowID                        vId
-, const wxPoint&                    rPos
-, const wxSize&                     rSize
-, int                               nStrings
-, const wxString                    asChoices[]
-, long                              lStyle
-, const wxValidator&                rVal
-, const wxString&                   rsName
-)
-              : wxListBox()
+wxCheckListBox::wxCheckListBox ( wxWindow* pParent,
+                                 wxWindowID vId,
+                                 const wxPoint& rPos,
+                                 const wxSize& rSize,
+                                 int nStrings,
+                                 const wxString asChoices[],
+                                 long lStyle,
+                                 const wxValidator& rVal,
+                                 const wxString& rsName)
+               :wxCheckListBoxBase()
 {
-    Create( pParent
-           ,vId
-           ,rPos
-           ,rSize
-           ,nStrings
-           ,asChoices
-           ,lStyle | wxLB_OWNERDRAW
-           ,rVal
-           ,rsName
-          );
+    Create( pParent, vId, rPos, rSize, nStrings, asChoices, lStyle | wxLB_OWNERDRAW, rVal, rsName );
 } // end of wxCheckListBox::wxCheckListBox
 
-wxCheckListBox::wxCheckListBox (
-  wxWindow*                         pParent
-, wxWindowID                        vId
-, const wxPoint&                    rPos
-, const wxSize&                     rSize
-, const wxArrayString&              asChoices
-, long                              lStyle
-, const wxValidator&                rVal
-, const wxString&                   rsName
-)
-              : wxListBox()
+wxCheckListBox::wxCheckListBox ( wxWindow* pParent,
+                                 wxWindowID vId,
+                                 const wxPoint& rPos,
+                                 const wxSize& rSize,
+                                 const wxArrayString& asChoices,
+                                 long lStyle,
+                                 const wxValidator& rVal,
+                                 const wxString& rsName )
+               :wxCheckListBoxBase()
 {
     wxCArrayString chs(asChoices);
-    Create( pParent
-           ,vId
-           ,rPos
-           ,rSize
-           ,chs.GetCount()
-           ,chs.GetStrings()
-           ,lStyle | wxLB_OWNERDRAW
-           ,rVal
-           ,rsName
-          );
+    Create( pParent, vId, rPos, rSize, chs.GetCount(), chs.GetStrings(),
+            lStyle | wxLB_OWNERDRAW, rVal, rsName );
 } // end of wxCheckListBox::wxCheckListBox
 
-void wxCheckListBox::Delete(
-  int                               N
-)
+void wxCheckListBox::Delete(unsigned int n)
 {
-    wxCHECK_RET( N >= 0 && N < m_nNumItems,
-                 wxT("invalid index in wxListBox::Delete") );
-    wxListBox::Delete(N);
+    wxCHECK_RET( IsValid(n),
+                 wxT("invalid index in wxCheckListBox::Delete") );
+    wxListBox::Delete(n);
 
     //
     // Free memory
     //
-    delete m_aItems[N];
-    m_aItems.RemoveAt(N);
+    delete m_aItems[n];
+    m_aItems.RemoveAt(n);
 } // end of wxCheckListBox::Delete
 
-void wxCheckListBox::InsertItems (
-  int                               nItems
-, const wxString                    asItems[]
-, int                               nPos
-)
+bool wxCheckListBox::SetFont ( const wxFont& rFont )
 {
-    int                             i;
-
-    wxCHECK_RET( nPos >= 0 && nPos <= m_nNumItems,
-                 wxT("invalid index in wxCheckListBox::InsertItems") );
-
-    wxListBox::InsertItems( nItems
-                           ,asItems
-                           ,nPos
-                          );
-    for (i = 0; i < nItems; i++)
-    {
-        wxOwnerDrawn*               pNewItem = CreateItem((size_t)(nPos + i));
-
-        pNewItem->SetName(asItems[i]);
-        m_aItems.Insert(pNewItem, (size_t)(nPos + i));
-        ::WinSendMsg( (HWND)GetHWND()
-                     ,LM_SETITEMHANDLE
-                     ,(MPARAM)(i + nPos)
-                     ,MPFROMP(pNewItem)
-                    );
-    }
-} // end of wxCheckListBox::InsertItems
-
-bool wxCheckListBox::SetFont (
-  const wxFont&                     rFont
-)
-{
-    size_t                          i;
-
-    for (i = 0; i < m_aItems.GetCount(); i++)
+    for (unsigned int i = 0; i < m_aItems.GetCount(); i++)
         m_aItems[i]->SetFont(rFont);
     wxListBox::SetFont(rFont);
-    return TRUE;
+    return true;
 } // end of wxCheckListBox::SetFont
 
+
+
 //
 // Create/retrieve item
 // --------------------
@@ -377,29 +311,25 @@ bool wxCheckListBox::SetFont (
 //
 // Create a check list box item
 //
-wxOwnerDrawn* wxCheckListBox::CreateItem (
-  size_t                            nIndex
-)
+wxOwnerDrawn* wxCheckListBox::CreateItem(size_t nIndex)
 {
-    wxCheckListBoxItem*             pItem = new wxCheckListBoxItem( this
-                                                                   ,nIndex
-                                                                  );
+    wxCheckListBoxItem* pItem = new wxCheckListBoxItem( this, nIndex );
     return pItem;
 } // end of wxCheckListBox::CreateItem
 
+
+
 //
 // Return item size
 // ----------------
 //
-long wxCheckListBox::OS2OnMeasure (
-  WXMEASUREITEMSTRUCT*             pItem
-)
+long wxCheckListBox::OS2OnMeasure ( WXMEASUREITEMSTRUCT* pItem )
 {
     if (!pItem)
         pItem = (WXMEASUREITEMSTRUCT*)new OWNERITEM;
-    if (wxListBox::OS2OnMeasure(pItem) )
+    if (wxListBox::OS2OnMeasure(pItem))
     {
-        POWNERITEM                  pStruct = (POWNERITEM)pItem;
+        POWNERITEM pStruct = (POWNERITEM)pItem;
 
         //
         // Save item height
@@ -409,38 +339,35 @@ long wxCheckListBox::OS2OnMeasure (
         //
         // Add place for the check mark
         //
-        pStruct->rclItem.xRight += wxOwnerDrawn::GetDefaultMarginWidth();
+        pStruct->rclItem.xRight += CHECK_MARK_WIDTH;
         return long(MRFROM2SHORT((USHORT)m_nItemHeight, (USHORT)(pStruct->rclItem.xRight - pStruct->rclItem.xLeft)));
     }
     return 0L;
 } // end of wxCheckListBox::CreateItem
 
+
+
 //
 // Check items
 // -----------
 //
-bool wxCheckListBox::IsChecked (
-  size_t                            uiIndex
-) const
+bool wxCheckListBox::IsChecked(unsigned int uiIndex) const
 {
     return GetItem(uiIndex)->IsChecked();
 } // end of wxCheckListBox::IsChecked
 
-void wxCheckListBox::Check (
-  size_t                            uiIndex
-, bool                              bCheck
-)
+void wxCheckListBox::Check(unsigned int uiIndex, bool bCheck)
 {
     GetItem(uiIndex)->Check(bCheck);
 } // end of wxCheckListBox::Check
 
+
+
 //
 // Process events
 // --------------
 //
-void wxCheckListBox::OnChar (
-  wxKeyEvent&                       rEvent
-)
+void wxCheckListBox::OnChar ( wxKeyEvent& rEvent )
 {
     if (rEvent.GetKeyCode() == WXK_SPACE)
         GetItem(GetSelection())->Toggle();
@@ -448,35 +375,31 @@ void wxCheckListBox::OnChar (
         rEvent.Skip();
 } // end of wxCheckListBox::OnChar
 
-void wxCheckListBox::OnLeftClick (
-  wxMouseEvent&                     rEvent
-)
+void wxCheckListBox::OnLeftClick ( wxMouseEvent& rEvent )
 {
     //
     // Clicking on the item selects it, clicking on the checkmark toggles
     //
-    if (rEvent.GetX() <= wxOwnerDrawn::GetDefaultMarginWidth())
+    if (rEvent.GetX() <= CHECK_MARK_WIDTH)
     {
         int                         nParentHeight;
         wxScreenDC                  vDc;
         wxCoord                     vHeight;
 
-        GetSize( NULL
-                ,&nParentHeight
-               );
+        GetSize( NULL, &nParentHeight );
         vDc.SetFont(GetFont());
         vHeight = (wxCoord)(vDc.GetCharHeight() * 2.5);
 
         //
         // This, of course, will not work if the LB is scrolled
         //
-        int                         nY = rEvent.GetY();
+        int nY = rEvent.GetY();
 
         nY = nParentHeight - (nY + vHeight);
 
-        size_t                      nItem = (size_t)(nY / vHeight);
+        size_t nItem = (size_t)(nY / vHeight);
 
-        if (nItem < (size_t)m_nNumItems)
+        if (nItem < m_nNumItems)
             GetItem(nItem)->Toggle();
         //
         // else: it's not an error, just click outside of client zone
@@ -491,5 +414,4 @@ void wxCheckListBox::OnLeftClick (
     }
 } // end of wxCheckListBox::OnLeftClick
 
-#endif
-
+#endif // wxUSE_CHECKLISTBOX && wxUSE_OWNER_DRAWN