Added ability to switch off more components of the size page UI

[wxWidgets.git] / src / msw / checklst.cpp

diff --git a/src/msw/checklst.cpp b/src/msw/checklst.cpp
index 98a4e6763bbc39ef5464faf282c9ac885fc4d8a2..235019ca178732df33b3c88857ad24795754ef0e 100644 (file)
--- a/src/msw/checklst.cpp
+++ b/src/msw/checklst.cpp
@@ -47,6 +47,7 @@
 
 #include "wx/renderer.h"
 #include "wx/msw/private.h"
 
 #include "wx/renderer.h"
 #include "wx/msw/private.h"

+#include "wx/msw/dc.h"

 
 // ----------------------------------------------------------------------------
 // private functions
 
 // ----------------------------------------------------------------------------
 // private functions


@@ -55,135 +56,88 @@
 // get item (converted to right type)
 #define GetItem(n)    ((wxCheckListBoxItem *)(GetItem(n)))
 
 // get item (converted to right type)
 #define GetItem(n)    ((wxCheckListBoxItem *)(GetItem(n)))
 

+namespace
+{
+    // space around check mark bitmap in pixels
+    static const int CHECKMARK_EXTRA_SPACE = 1;
+
+    // space between check bitmap and text label
+    static const int CHECKMARK_LABEL_SPACE = 2;
+
+} // anonymous namespace
+

 // ============================================================================
 // implementation
 // ============================================================================
 
 // ============================================================================
 // implementation
 // ============================================================================
 

-
-#if wxUSE_EXTENDED_RTTI
-WX_DEFINE_FLAGS( wxCheckListBoxStyle )
-
-wxBEGIN_FLAGS( wxCheckListBoxStyle )
-    // new style border flags, we put them first to
-    // use them for streaming out
-    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-    wxFLAGS_MEMBER(wxBORDER_RAISED)
-    wxFLAGS_MEMBER(wxBORDER_STATIC)
-    wxFLAGS_MEMBER(wxBORDER_NONE)
-
-    // old style border flags
-    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-    wxFLAGS_MEMBER(wxRAISED_BORDER)
-    wxFLAGS_MEMBER(wxSTATIC_BORDER)
-    wxFLAGS_MEMBER(wxBORDER)
-
-    // standard window styles
-    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-    wxFLAGS_MEMBER(wxWANTS_CHARS)
-    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
-    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
-    wxFLAGS_MEMBER(wxVSCROLL)
-    wxFLAGS_MEMBER(wxHSCROLL)
-
-    wxFLAGS_MEMBER(wxLB_SINGLE)
-    wxFLAGS_MEMBER(wxLB_MULTIPLE)
-    wxFLAGS_MEMBER(wxLB_EXTENDED)
-    wxFLAGS_MEMBER(wxLB_HSCROLL)
-    wxFLAGS_MEMBER(wxLB_ALWAYS_SB)
-    wxFLAGS_MEMBER(wxLB_NEEDED_SB)
-    wxFLAGS_MEMBER(wxLB_SORT)
-    wxFLAGS_MEMBER(wxLB_OWNERDRAW)
-
-wxEND_FLAGS( wxCheckListBoxStyle )
-
-IMPLEMENT_DYNAMIC_CLASS_XTI(wxCheckListBox, wxListBox,"wx/checklst.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxCheckListBox)
-    wxEVENT_PROPERTY( Toggle , wxEVT_COMMAND_CHECKLISTBOX_TOGGLED , wxCommandEvent )
-    wxPROPERTY_FLAGS( WindowStyle , wxCheckListBoxStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , wxLB_OWNERDRAW /*flags*/ , wxT("Helpstring") , wxT("group")) // style
-wxEND_PROPERTIES_TABLE()
-
-wxBEGIN_HANDLERS_TABLE(wxCheckListBox)
-wxEND_HANDLERS_TABLE()
-
-wxCONSTRUCTOR_4( wxCheckListBox , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size )
-
-#else
-IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox)
-#endif
-

 // ----------------------------------------------------------------------------
 // declaration and implementation of wxCheckListBoxItem class
 // ----------------------------------------------------------------------------
 
 class wxCheckListBoxItem : public wxOwnerDrawn
 {
 // ----------------------------------------------------------------------------
 // declaration and implementation of wxCheckListBoxItem class
 // ----------------------------------------------------------------------------
 
 class wxCheckListBoxItem : public wxOwnerDrawn
 {

-friend class WXDLLIMPEXP_FWD_CORE wxCheckListBox;

 public:
     // ctor
 public:
     // ctor

-    wxCheckListBoxItem(wxCheckListBox *pParent, size_t nIndex);
+    wxCheckListBoxItem(wxCheckListBox *parent);

 
     // drawing functions
     virtual bool OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODStatus stat);
 
     // simple accessors and operations
 
     // drawing functions
     virtual bool OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODStatus stat);
 
     // simple accessors and operations

-    bool IsChecked() const { return m_bChecked; }
+    wxCheckListBox *GetParent() const
+        { return m_parent; }
+
+    int GetIndex() const
+        { return m_parent->GetItemIndex(const_cast<wxCheckListBoxItem*>(this)); }
+
+    wxString GetName() const
+        { return m_parent->GetString(GetIndex()); }

 
 

-    void Check(bool bCheck);
-    void Toggle() { Check(!IsChecked()); }

 
 

-    void SendEvent();
+    bool IsChecked() const
+        { return m_checked; }
+
+    void Check(bool bCheck)
+        { m_checked = bCheck; }
+
+    void Toggle()
+        { Check(!IsChecked()); }

 
 private:
 
 private:

-    bool            m_bChecked;
-    wxCheckListBox *m_pParent;
-    size_t          m_nIndex;
+    wxCheckListBox *m_parent;
+    bool m_checked;

 
 

-    DECLARE_NO_COPY_CLASS(wxCheckListBoxItem)
+    wxDECLARE_NO_COPY_CLASS(wxCheckListBoxItem);

 };
 
 };
 

-wxCheckListBoxItem::wxCheckListBoxItem(wxCheckListBox *pParent, size_t nIndex)
-                  : wxOwnerDrawn(wxEmptyString, true)   // checkable
+wxCheckListBoxItem::wxCheckListBoxItem(wxCheckListBox *parent)

 {
 {

-    m_bChecked = false;
-    m_pParent  = pParent;
-    m_nIndex   = nIndex;
+    m_parent = parent;
+    m_checked = false;

 
 

-    // we don't initialize m_nCheckHeight/Width vars because it's
-    // done in OnMeasure while they are used only in OnDraw and we
-    // know that there will always be OnMeasure before OnDraw
+    wxSize size = wxRendererNative::Get().GetCheckBoxSize(parent);
+    size.x += 2 * CHECKMARK_EXTRA_SPACE + CHECKMARK_LABEL_SPACE;

 
 

-    SetMarginWidth(::GetSystemMetrics(SM_CXMENUCHECK) - 2);
-
-    SetBackgroundColour(pParent->GetBackgroundColour());
+    SetMarginWidth(size.GetWidth());
+    SetBackgroundColour(parent->GetBackgroundColour());

 }
 
 bool wxCheckListBoxItem::OnDrawItem(wxDC& dc, const wxRect& rc,
                                     wxODAction act, wxODStatus stat)
 {
     // first draw the label
 }
 
 bool wxCheckListBoxItem::OnDrawItem(wxDC& dc, const wxRect& rc,
                                     wxODAction act, wxODStatus stat)
 {
     // first draw the label

-    if ( IsChecked() )
-        stat = (wxOwnerDrawn::wxODStatus)(stat | wxOwnerDrawn::wxODChecked);
-

     if ( !wxOwnerDrawn::OnDrawItem(dc, rc, act, stat) )
         return false;
 
     // now draw the check mark part
     if ( !wxOwnerDrawn::OnDrawItem(dc, rc, act, stat) )
         return false;
 
     // now draw the check mark part

-    HDC hdc = GetHdcOf(dc);
-
-    int nBmpWidth  = ::GetSystemMetrics(SM_CXMENUCHECK),
-        nBmpHeight = ::GetSystemMetrics(SM_CYMENUCHECK);
+    wxMSWDCImpl *impl = (wxMSWDCImpl*) dc.GetImpl();
+    HDC hdc = GetHdcOf(*impl);

 
 

+    wxSize size = wxRendererNative::Get().GetCheckBoxSize(GetParent());

 
     // first create bitmap in a memory DC
     MemoryHDC hdcMem(hdc);
 
     // first create bitmap in a memory DC
     MemoryHDC hdcMem(hdc);

-    CompatibleBitmap hBmpCheck(hdc, nBmpWidth, nBmpHeight);
+    CompatibleBitmap hBmpCheck(hdc, size.GetWidth(), size.GetHeight());

 
     // then draw a check mark into it
     {
 
     // then draw a check mark into it
     {


@@ -194,67 +148,21 @@ bool wxCheckListBoxItem::OnDrawItem(wxDC& dc, const wxRect& rc,
             flags |= wxCONTROL_CHECKED;
 
         wxDCTemp dcMem(hdcMem);
             flags |= wxCONTROL_CHECKED;
 
         wxDCTemp dcMem(hdcMem);

-        wxRendererNative::Get().DrawCheckBox(
-                m_pParent, dcMem, wxRect(0, 0, nBmpWidth, nBmpHeight), flags);
+        wxRendererNative::Get().DrawCheckBox(GetParent(), dcMem, wxRect(size), flags);

     } // select hBmpCheck out of hdcMem
 
     } // select hBmpCheck out of hdcMem
 

-    // shift check mark 2 pixel to the right and bottom, looks better like this
-    int x = rc.GetX() + 2,
-        y = rc.GetY() + 2;
-
-    // finally draw bitmap to screen: uses image list functions to blend
-    // the bitmap with the background colour (better for the selected items)
-    HIMAGELIST himl = ImageList_Create(nBmpWidth, nBmpHeight,
-                                       ILC_COLOR32 | ILC_MASK, 1, 1);
-    ImageList_Add(himl, hBmpCheck, NULL);
+    // finally draw bitmap to screen

 
 

-    UINT fStyle = stat & wxOwnerDrawn::wxODSelected ? ILD_SELECTED : ILD_NORMAL;
-    ImageList_Draw(himl, 0, hdc, x, y, fStyle);
+    // position of check mark bitmap
+    int x = rc.GetX() + CHECKMARK_EXTRA_SPACE;
+    int y = rc.GetY() + (rc.GetHeight() - size.GetHeight()) / 2;

 
 

-    ImageList_Destroy(himl);
+    UINT uState = stat & wxOwnerDrawn::wxODSelected ? wxDSB_SELECTED : wxDSB_NORMAL;
+    wxDrawStateBitmap(hdc, hBmpCheck, x, y, uState);

 
     return true;
 }
 
 
     return true;
 }
 

-// change the state of the item and redraw it
-void wxCheckListBoxItem::Check(bool check)
-{
-    m_bChecked = check;
-
-    // index may be changed because new items were added/deleted
-    if ( m_pParent->GetItemIndex(this) != (int)m_nIndex )
-    {
-        // update it
-        int index = m_pParent->GetItemIndex(this);
-
-        wxASSERT_MSG( index != wxNOT_FOUND, wxT("what does this item do here?") );
-
-        m_nIndex = (size_t)index;
-    }
-
-    HWND hwndListbox = (HWND)m_pParent->GetHWND();
-
-    RECT rcUpdate;
-
-    if ( ::SendMessage(hwndListbox, LB_GETITEMRECT,
-                       m_nIndex, (LPARAM)&rcUpdate) == LB_ERR )
-    {
-        wxLogDebug(wxT("LB_GETITEMRECT failed"));
-    }
-
-    ::InvalidateRect(hwndListbox, &rcUpdate, FALSE);
-}
-
-// send an "item checked" event
-void wxCheckListBoxItem::SendEvent()
-{
-    wxCommandEvent event(wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, m_pParent->GetId());
-    event.SetInt(m_nIndex);
-    event.SetEventObject(m_pParent);
-    event.SetString(m_pParent->GetString(m_nIndex));
-    m_pParent->ProcessCommand(event);
-}
-

 // ----------------------------------------------------------------------------
 // implementation of wxCheckListBox class
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // implementation of wxCheckListBox class
 // ----------------------------------------------------------------------------


@@ -313,78 +221,64 @@ bool wxCheckListBox::Create(wxWindow *parent, wxWindowID id,
                              style | wxLB_OWNERDRAW, validator, name);
 }
 
                              style | wxLB_OWNERDRAW, validator, name);
 }
 

-// misc overloaded methods
-// -----------------------
-
-void wxCheckListBox::Delete(unsigned int n)
-{
-    wxCHECK_RET( IsValid(n),
-                 wxT("invalid index in wxListBox::Delete") );
-
-    wxListBox::Delete(n);
-
-    // free memory
-    delete m_aItems[n];
-
-    m_aItems.RemoveAt(n);
-}
-
-bool wxCheckListBox::SetFont( const wxFont &font )
-{
-    unsigned int i;
-    for ( i = 0; i < m_aItems.GetCount(); i++ )
-        m_aItems[i]->SetFont(font);
-
-    wxListBox::SetFont(font);
-
-    return true;
-}
-

 // create/retrieve item
 // --------------------
 
 // create a check list box item
 // create/retrieve item
 // --------------------
 
 // create a check list box item

-wxOwnerDrawn *wxCheckListBox::CreateLboxItem(size_t nIndex)
+wxOwnerDrawn *wxCheckListBox::CreateLboxItem(size_t WXUNUSED(n))

 {
 {

-  wxCheckListBoxItem *pItem = new wxCheckListBoxItem(this, nIndex);
-  return pItem;
+    wxCheckListBoxItem *pItem = new wxCheckListBoxItem(this);
+    return pItem;

 }
 
 // return item size
 // ----------------
 bool wxCheckListBox::MSWOnMeasure(WXMEASUREITEMSTRUCT *item)
 {
 }
 
 // return item size
 // ----------------
 bool wxCheckListBox::MSWOnMeasure(WXMEASUREITEMSTRUCT *item)
 {

-  if ( wxListBox::MSWOnMeasure(item) ) {
-    MEASUREITEMSTRUCT *pStruct = (MEASUREITEMSTRUCT *)item;
+    if ( wxListBox::MSWOnMeasure(item) )
+    {
+        MEASUREITEMSTRUCT *pStruct = (MEASUREITEMSTRUCT *)item;

 
 

-    // add place for the check mark
-    pStruct->itemWidth  += wxOwnerDrawn::GetDefaultMarginWidth();
-    pStruct->itemHeight += 1;
+        wxSize size = wxRendererNative::Get().GetCheckBoxSize(this);
+        size.x += 2 * CHECKMARK_EXTRA_SPACE;
+        size.y += 2 * CHECKMARK_EXTRA_SPACE;

 
 

-    // save item height
-    m_nItemHeight = pStruct->itemHeight;
+        // add place for the check mark
+        pStruct->itemWidth += size.GetWidth();

 
 

-    return true;
-  }
+        if ( pStruct->itemHeight < static_cast<unsigned int>(size.GetHeight()) )
+            pStruct->itemHeight = size.GetHeight();

 
 

-  return false;
-}
+        return true;
+    }
+
+    return false;
+  }

 
 // check items
 // -----------
 
 bool wxCheckListBox::IsChecked(unsigned int uiIndex) const
 {
 
 // check items
 // -----------
 
 bool wxCheckListBox::IsChecked(unsigned int uiIndex) const
 {

-    wxCHECK_MSG( IsValid(uiIndex), false, _T("bad wxCheckListBox index") );
+    wxCHECK_MSG( IsValid(uiIndex), false, wxT("bad wxCheckListBox index") );

 
     return GetItem(uiIndex)->IsChecked();
 }
 
 void wxCheckListBox::Check(unsigned int uiIndex, bool bCheck)
 {
 
     return GetItem(uiIndex)->IsChecked();
 }
 
 void wxCheckListBox::Check(unsigned int uiIndex, bool bCheck)
 {

-    wxCHECK_RET( IsValid(uiIndex), _T("bad wxCheckListBox index") );
+    wxCHECK_RET( IsValid(uiIndex), wxT("bad wxCheckListBox index") );

 
     GetItem(uiIndex)->Check(bCheck);
 
     GetItem(uiIndex)->Check(bCheck);

+    RefreshItem(uiIndex);
+}
+
+void wxCheckListBox::Toggle(unsigned int uiIndex)
+{
+    wxCHECK_RET( IsValid(uiIndex), wxT("bad wxCheckListBox index") );
+
+    GetItem(uiIndex)->Toggle();
+    RefreshItem(uiIndex);

 }
 
 // process events
 }
 
 // process events


@@ -395,33 +289,33 @@ void wxCheckListBox::OnKeyDown(wxKeyEvent& event)
     // what do we do?
     enum
     {
     // what do we do?
     enum
     {

-        None,
-        Toggle,
-        Set,
-        Clear
+        NONE,
+        TOGGLE,
+        SET,
+        CLEAR

     } oper;
 
     switch ( event.GetKeyCode() )
     {
         case WXK_SPACE:
     } oper;
 
     switch ( event.GetKeyCode() )
     {
         case WXK_SPACE:

-            oper = Toggle;
+            oper = TOGGLE;

             break;
 
         case WXK_NUMPAD_ADD:
         case '+':
             break;
 
         case WXK_NUMPAD_ADD:
         case '+':

-            oper = Set;
+            oper = SET;

             break;
 
         case WXK_NUMPAD_SUBTRACT:
         case '-':
             break;
 
         case WXK_NUMPAD_SUBTRACT:
         case '-':

-            oper = Clear;
+            oper = CLEAR;

             break;
 
         default:
             break;
 
         default:

-            oper = None;
+            oper = NONE;

     }
 
     }
 

-    if ( oper != None )
+    if ( oper != NONE )

     {
         wxArrayInt selections;
         int count = 0;
     {
         wxArrayInt selections;
         int count = 0;


@@ -441,31 +335,26 @@ void wxCheckListBox::OnKeyDown(wxKeyEvent& event)
 
         for ( int i = 0; i < count; i++ )
         {
 
         for ( int i = 0; i < count; i++ )
         {

-            wxCheckListBoxItem *item = GetItem(selections[i]);
-            if ( !item )
-            {
-                wxFAIL_MSG( _T("no wxCheckListBoxItem?") );
-                continue;
-            }
+            int nItem = selections[i];

 
             switch ( oper )
             {
 
             switch ( oper )
             {

-                case Toggle:
-                    item->Toggle();
+                case TOGGLE:
+                    Toggle(nItem);

                     break;
 
                     break;
 

-                case Set:
-                case Clear:
-                    item->Check( oper == Set );
+                case SET:
+                case CLEAR:
+                    Check(nItem, oper == SET);

                     break;
 
                 default:
                     break;
 
                 default:

-                    wxFAIL_MSG( _T("what should this key do?") );
+                    wxFAIL_MSG( wxT("what should this key do?") );

             }
 
             // we should send an event as this has been done by the user and
             // not by the program
             }
 
             // we should send an event as this has been done by the user and
             // not by the program

-            item->SendEvent();
+            SendEvent(nItem);

         }
     }
     else // nothing to do
         }
     }
     else // nothing to do


@@ -477,11 +366,21 @@ void wxCheckListBox::OnKeyDown(wxKeyEvent& event)
 void wxCheckListBox::OnLeftClick(wxMouseEvent& event)
 {
     // clicking on the item selects it, clicking on the checkmark toggles
 void wxCheckListBox::OnLeftClick(wxMouseEvent& event)
 {
     // clicking on the item selects it, clicking on the checkmark toggles

-    if ( event.GetX() <= wxOwnerDrawn::GetDefaultMarginWidth() )
+
+    int nItem = HitTest(event.GetX(), event.GetY());
+
+    if ( nItem != wxNOT_FOUND )

     {
     {

-        int nItem = HitTest(event.GetX(), event.GetY());
+        wxRect rect;
+        GetItemRect(nItem, rect);

 
 

-        if ( nItem != wxNOT_FOUND )
+        // convert item rect to check mark rect
+        wxSize size = wxRendererNative::Get().GetCheckBoxSize(this);
+        rect.x += CHECKMARK_EXTRA_SPACE;
+        rect.y += (rect.GetHeight() - size.GetHeight()) / 2;
+        rect.SetSize(size);
+
+        if ( rect.Contains(event.GetX(), event.GetY()) )

         {
             // people expect to get "kill focus" event for the currently
             // focused control before getting events from the other controls
         {
             // people expect to get "kill focus" event for the currently
             // focused control before getting events from the other controls


@@ -492,40 +391,45 @@ void wxCheckListBox::OnLeftClick(wxMouseEvent& event)
             SetFocus();
             if ( FindFocus() == this )
             {
             SetFocus();
             if ( FindFocus() == this )
             {

-                wxCheckListBoxItem *item = GetItem(nItem);
-                item->Toggle();
-                item->SendEvent();
+                Toggle(nItem);
+                SendEvent(nItem);
+
+                // scroll one item down if the item is the last one
+                // and isn't visible at all
+                int h;
+                GetClientSize(NULL, &h);
+                if ( rect.GetBottom() > h )
+                    ScrollLines(1);

             }
         }
             }
         }

-        //else: it's not an error, just click outside of client zone
+        else
+        {
+            // implement default behaviour: clicking on the item selects it
+            event.Skip();
+        }

     }
     else
     {
     }
     else
     {

-        // implement default behaviour: clicking on the item selects it
+        // implement default behaviour on click outside of client zone

         event.Skip();
     }
 }
 
         event.Skip();
     }
 }
 

-int wxCheckListBox::DoHitTestItem(wxCoord x, wxCoord y) const
+wxSize wxCheckListBox::DoGetBestClientSize() const

 {
 {

-    int nItem = (int)::SendMessage
-                             (
-                              (HWND)GetHWND(),
-                              LB_ITEMFROMPOINT,
-                              0,
-                              MAKELPARAM(x, y)
-                             );
-
-    return nItem >= (int)m_noItems ? wxNOT_FOUND : nItem;
-}
+    wxSize best = wxListBox::DoGetBestClientSize();

 
 

+    // add room for the checkbox
+    wxSize size = wxRendererNative::Get().GetCheckBoxSize(const_cast<wxCheckListBox*>(this));
+    size.x += 2 * CHECKMARK_EXTRA_SPACE;
+    size.y += 2 * CHECKMARK_EXTRA_SPACE;
+
+    best.x += size.GetWidth();
+    if ( best.y < size.GetHeight() )
+        best.y = size.GetHeight();

 
 

-wxSize wxCheckListBox::DoGetBestSize() const
-{
-    wxSize best = wxListBox::DoGetBestSize();
-    best.x += wxOwnerDrawn::GetDefaultMarginWidth();  // add room for the checkbox

     CacheBestSize(best);
     return best;
 }
 
     CacheBestSize(best);
     return best;
 }
 

-#endif
+#endif // wxUSE_CHECKLISTBOX