Deprecate wxDC::{Begin,End}Drawing()

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

diff --git a/src/msw/ownerdrw.cpp b/src/msw/ownerdrw.cpp
index 380a2fe5c63ae69e87d4f41fd3c26a6d7ca88d0a..5b3312796e58bcbac3c3e7f7dc65b2e046f26ce2 100644 (file)
--- a/src/msw/ownerdrw.cpp
+++ b/src/msw/ownerdrw.cpp
@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 #include "wx/msw/private.h"
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 #include "wx/msw/private.h"


@@ -97,16 +93,27 @@ bool wxMSWSystemMenuFontModule::ms_showCues = true;
 IMPLEMENT_DYNAMIC_CLASS(wxMSWSystemMenuFontModule, wxModule)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxMSWSystemMenuFontModule, wxModule)
 
 

-// temporary hack to implement wxOwnerDrawn::IsMenuItem() without breaking
-// backwards compatibility
-#if wxCHECK_VERSION(2, 7, 0)
-    #pragma warning "TODO: remove gs_menuItems hack"
+// VC++ 6 gives a warning here:
+//
+//      return type for 'OwnerDrawnSet_wxImplementation_HashTable::iterator::
+//      operator ->' is 'class wxOwnerDrawn ** ' (ie; not a UDT or reference to
+//      a UDT.  Will produce errors if applied using infix notation.
+//
+// shut it down
+#ifdef __VISUALC__
+    #if __VISUALC__ <= 1300
+        #pragma warning(push)
+        #pragma warning(disable: 4284)
+        #define POP_WARNINGS
+    #endif

 #endif
 
 #include "wx/hashset.h"
 WX_DECLARE_HASH_SET(wxOwnerDrawn*, wxPointerHash, wxPointerEqual, OwnerDrawnSet);
 
 #endif
 
 #include "wx/hashset.h"
 WX_DECLARE_HASH_SET(wxOwnerDrawn*, wxPointerHash, wxPointerEqual, OwnerDrawnSet);
 

-static OwnerDrawnSet gs_menuItems;
+#ifdef POP_WARNINGS
+    #pragma warning(pop)
+#endif

 
 // ============================================================================
 // implementation of wxOwnerDrawn class
 
 // ============================================================================
 // implementation of wxOwnerDrawn class


@@ -119,7 +126,7 @@ wxOwnerDrawn::wxOwnerDrawn(const wxString& str,
                            bool bMenuItem)
             : m_strName(str)
 {
                            bool bMenuItem)
             : m_strName(str)
 {

-    if (ms_nDefaultMarginWidth == 0)
+    if ( ms_nDefaultMarginWidth == 0 )

     {
        ms_nDefaultMarginWidth = ::GetSystemMetrics(SM_CXMENUCHECK) +
                                 wxSystemSettings::GetMetric(wxSYS_EDGE_X);
     {
        ms_nDefaultMarginWidth = ::GetSystemMetrics(SM_CXMENUCHECK) +
                                 wxSystemSettings::GetMetric(wxSYS_EDGE_X);


@@ -128,30 +135,19 @@ wxOwnerDrawn::wxOwnerDrawn(const wxString& str,
 
     m_bCheckable   = bCheckable;
     m_bOwnerDrawn  = false;
 
     m_bCheckable   = bCheckable;
     m_bOwnerDrawn  = false;

+    m_isMenuItem   = bMenuItem;

     m_nHeight      = 0;
     m_nMarginWidth = ms_nLastMarginWidth;
     m_nMinHeight   = wxMSWSystemMenuFontModule::ms_systemMenuHeight;
     m_nHeight      = 0;
     m_nMarginWidth = ms_nLastMarginWidth;
     m_nMinHeight   = wxMSWSystemMenuFontModule::ms_systemMenuHeight;

-
-    m_bmpDisabled = wxNullBitmap;
-
-    // TODO: we can't add new m_isMenuItem field in 2.6, so we use this hack
-    //       with the map, but do add m_isMenuItem in 2.7
-    if ( bMenuItem )
-    {
-        gs_menuItems.insert(this);
-    }

 }
 
 wxOwnerDrawn::~wxOwnerDrawn()
 {
 }
 
 wxOwnerDrawn::~wxOwnerDrawn()
 {

-    // TODO: remove this in 2.7
-    gs_menuItems.erase(this);

 }
 
 bool wxOwnerDrawn::IsMenuItem() const
 {
 }
 
 bool wxOwnerDrawn::IsMenuItem() const
 {

-    // TODO: in 2.7, replace this with simple "return m_isMenuItem"
-    return gs_menuItems.count(this) == 1;
+    return m_isMenuItem;

 }
 
 
 }
 
 


@@ -255,203 +251,216 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc,
                               wxODAction act,
                               wxODStatus st)
 {
                               wxODAction act,
                               wxODStatus st)
 {

-  // we do nothing on focus change
-  if ( act == wxODFocusChanged )
-    return true;
+    // we do nothing on focus change
+    if ( act == wxODFocusChanged )
+        return true;

 
 
 
 

-  // this flag determines whether or not an edge will
-  // be drawn around the bitmap. In most "windows classic"
-  // applications, a 1-pixel highlight edge is drawn around
-  // the bitmap of an item when it is selected.  However,
-  // with the new "luna" theme, no edge is drawn around
-  // the bitmap because the background is white (this applies
-  // only to "non-XP style" menus w/ bitmaps --
-  // see IE 6 menus for an example)
+    // this flag determines whether or not an edge will
+    // be drawn around the bitmap. In most "windows classic"
+    // applications, a 1-pixel highlight edge is drawn around
+    // the bitmap of an item when it is selected.  However,
+    // with the new "luna" theme, no edge is drawn around
+    // the bitmap because the background is white (this applies
+    // only to "non-XP style" menus w/ bitmaps --
+    // see IE 6 menus for an example)

 
 

-  bool draw_bitmap_edge = true;
+    bool draw_bitmap_edge = true;

 
 

-  // set the colors
-  // --------------
-  DWORD colBack, colText;
-  if ( st & wxODSelected ) {
-    colBack = GetSysColor(COLOR_HIGHLIGHT);
-    if (!(st & wxODDisabled))
+    // set the colors
+    // --------------
+    DWORD colBack, colText;
+    if ( st & wxODSelected )

     {
     {

-        colText = GetSysColor(COLOR_HIGHLIGHTTEXT);
+        colBack = GetSysColor(COLOR_HIGHLIGHT);
+        if (!(st & wxODDisabled))
+        {
+            colText = GetSysColor(COLOR_HIGHLIGHTTEXT);
+        }
+        else
+        {
+            colText = GetSysColor(COLOR_GRAYTEXT);
+        }

     }
     }

-     else
+    else

     {
     {

-        colText = GetSysColor(COLOR_GRAYTEXT);
+        // fall back to default colors if none explicitly specified
+        colBack = m_colBack.Ok() ? wxColourToPalRGB(m_colBack)
+                                 : GetSysColor(COLOR_MENU);
+        colText = m_colText.Ok() ? wxColourToPalRGB(m_colText)
+                                 : GetSysColor(COLOR_MENUTEXT);

     }
     }

-  }
-  else {
-    // fall back to default colors if none explicitly specified
-    colBack = m_colBack.Ok() ? wxColourToPalRGB(m_colBack)
-                             : GetSysColor(COLOR_MENU);
-    colText = m_colText.Ok() ? wxColourToPalRGB(m_colText)
-                             : GetSysColor(COLOR_MENUTEXT);
-  }
-
-
-  // don't draw an edge around the bitmap, if background is white ...
-  DWORD menu_bg_color = GetSysColor(COLOR_MENU);
-  if (    ( GetRValue( menu_bg_color ) >= 0xf0 &&
-            GetGValue( menu_bg_color ) >= 0xf0 &&
-            GetBValue( menu_bg_color ) >= 0xf0 )
-    )
-  {
-      draw_bitmap_edge = false;
-  }

 
 

+    if ( IsOwnerDrawn() )
+    {
+        // don't draw an edge around the bitmap, if background is white ...
+        DWORD menu_bg_color = GetSysColor(COLOR_MENU);
+        if (    ( GetRValue( menu_bg_color ) >= 0xf0 &&
+                  GetGValue( menu_bg_color ) >= 0xf0 &&
+                  GetBValue( menu_bg_color ) >= 0xf0 )
+          )
+        {
+            draw_bitmap_edge = false;
+        }
+    }
+    else // edge doesn't look well with default Windows drawing
+    {
+        draw_bitmap_edge = false;
+    }

 
 

-  HDC hdc = GetHdcOf(dc);
-  COLORREF colOldText = ::SetTextColor(hdc, colText),
-           colOldBack = ::SetBkColor(hdc, colBack);

 
 

-  // *2, as in wxSYS_EDGE_Y
-  int margin = GetMarginWidth() + 2 * wxSystemSettings::GetMetric(wxSYS_EDGE_X);
+    HDC hdc = GetHdcOf(dc);
+    COLORREF colOldText = ::SetTextColor(hdc, colText),
+             colOldBack = ::SetBkColor(hdc, colBack);

 
 

-  // select the font and draw the text
-  // ---------------------------------
+    // *2, as in wxSYS_EDGE_Y
+    int margin = GetMarginWidth() + 2 * wxSystemSettings::GetMetric(wxSYS_EDGE_X);

 
 

+    // select the font and draw the text
+    // ---------------------------------

 
 

-  // determine where to draw and leave space for a check-mark.
-  // + 1 pixel to separate the edge from the highlight rectangle
-  int xText = rc.x + margin + 1;

 
 

+    // determine where to draw and leave space for a check-mark.
+    // + 1 pixel to separate the edge from the highlight rectangle
+    int xText = rc.x + margin + 1;

 
 

-  // using native API because it recognizes '&'
-  if ( IsOwnerDrawn() )
-  {
-    int nPrevMode = SetBkMode(hdc, TRANSPARENT);
-    AutoHBRUSH hbr(colBack);
-    SelectInHDC selBrush(hdc, hbr);

 
 

-    RECT rectFill = { rc.GetLeft(), rc.GetTop(),
-                        rc.GetRight() + 1, rc.GetBottom() + 1 };
+    // using native API because it recognizes '&'
+    if ( IsOwnerDrawn() )
+    {
+        int nPrevMode = SetBkMode(hdc, TRANSPARENT);
+        AutoHBRUSH hbr(colBack);
+        SelectInHDC selBrush(hdc, hbr);

 
 

-    if ( (st & wxODSelected) && m_bmpChecked.Ok() && draw_bitmap_edge ) {
-        // only draw the highlight under the text, not under
-        // the bitmap or checkmark
-        rectFill.left = xText;
-    }
+        RECT rectFill = { rc.GetLeft(), rc.GetTop(),
+                            rc.GetRight() + 1, rc.GetBottom() + 1 };

 
 

-    FillRect(hdc, &rectFill, hbr);
+        if ( (st & wxODSelected) && m_bmpChecked.Ok() && draw_bitmap_edge )
+        {
+            // only draw the highlight under the text, not under
+            // the bitmap or checkmark
+            rectFill.left = xText;
+        }

 
 

-    // use default font if no font set
-    wxFont fontToUse = GetFontToUse();
-    SelectInHDC selFont(hdc, GetHfontOf(fontToUse));
+        FillRect(hdc, &rectFill, hbr);

 
 

-    wxString strMenuText = m_strName.BeforeFirst('\t');
+        // use default font if no font set
+        wxFont fontToUse = GetFontToUse();
+        SelectInHDC selFont(hdc, GetHfontOf(fontToUse));

 
 

-    xText += 3; // separate text from the highlight rectangle
+        wxString strMenuText = m_strName.BeforeFirst('\t');

 
 

-    SIZE sizeRect;
-    ::GetTextExtentPoint32(hdc, strMenuText.c_str(), strMenuText.Length(), &sizeRect);
-    ::DrawState(hdc, NULL, NULL,
-                (LPARAM)strMenuText.c_str(), strMenuText.length(),
-                xText, rc.y + (int) ((rc.GetHeight()-sizeRect.cy)/2.0), // centre text vertically
-                rc.GetWidth()-margin, sizeRect.cy,
-                DST_PREFIXTEXT |
-                (((st & wxODDisabled) && !(st & wxODSelected)) ? DSS_DISABLED : 0) |
-                (((st & wxODHidePrefix) && !wxMSWSystemMenuFontModule::ms_showCues) ? 512 : 0)); // 512 == DSS_HIDEPREFIX
+        xText += 3; // separate text from the highlight rectangle

 
 

-    // ::SetTextAlign(hdc, TA_RIGHT) doesn't work with DSS_DISABLED or DSS_MONO
-    // as the last parameter in DrawState() (at least with Windows98). So we have
-    // to take care of right alignment ourselves.
-    if ( !m_strAccel.empty() )
-    {
-        int accel_width, accel_height;
-        dc.GetTextExtent(m_strAccel, &accel_width, &accel_height);
-        // right align accel string with right edge of menu ( offset by the
-        // margin width )
+        SIZE sizeRect;
+        ::GetTextExtentPoint32(hdc, strMenuText.c_str(), strMenuText.Length(), &sizeRect);

         ::DrawState(hdc, NULL, NULL,
         ::DrawState(hdc, NULL, NULL,

-                (LPARAM)m_strAccel.c_str(), m_strAccel.length(),
-                rc.GetWidth()-16-accel_width, rc.y+(int) ((rc.GetHeight()-sizeRect.cy)/2.0),
-                0, 0,
-                DST_TEXT |
-                (((st & wxODDisabled) && !(st & wxODSelected)) ? DSS_DISABLED : 0));
-    }
-
-    (void)SetBkMode(hdc, nPrevMode);
-  }
-
-
-  // draw the bitmap
-  // ---------------
-  if ( IsCheckable() && !m_bmpChecked.Ok() ) {
-    if ( st & wxODChecked ) {
-      // what goes on: DrawFrameControl creates a b/w mask,
-      // then we copy it to screen to have right colors
-
-        // first create a monochrome bitmap in a memory DC
-      HDC hdcMem = CreateCompatibleDC(hdc);
-      HBITMAP hbmpCheck = CreateBitmap(margin, m_nHeight, 1, 1, 0);
-      SelectObject(hdcMem, hbmpCheck);
-
-        // then draw a check mark into it
-      RECT rect = { 0, 0, margin, m_nHeight };
-      if ( m_nHeight > 0 )
-      {
-        ::DrawFrameControl(hdcMem, &rect, DFC_MENU, DFCS_MENUCHECK);
-      }
-
-        // finally copy it to screen DC and clean up
-      BitBlt(hdc, rc.x, rc.y, margin, m_nHeight,
-             hdcMem, 0, 0, SRCCOPY);
+                    (LPARAM)strMenuText.c_str(), strMenuText.length(),
+                    xText, rc.y + (int) ((rc.GetHeight()-sizeRect.cy)/2.0), // centre text vertically
+                    rc.GetWidth()-margin, sizeRect.cy,
+                    DST_PREFIXTEXT |
+                    (((st & wxODDisabled) && !(st & wxODSelected)) ? DSS_DISABLED : 0) |
+                    (((st & wxODHidePrefix) && !wxMSWSystemMenuFontModule::ms_showCues) ? 512 : 0)); // 512 == DSS_HIDEPREFIX
+
+        // ::SetTextAlign(hdc, TA_RIGHT) doesn't work with DSS_DISABLED or DSS_MONO
+        // as the last parameter in DrawState() (at least with Windows98). So we have
+        // to take care of right alignment ourselves.
+        if ( !m_strAccel.empty() )
+        {
+            int accel_width, accel_height;
+            dc.GetTextExtent(m_strAccel, &accel_width, &accel_height);
+            // right align accel string with right edge of menu ( offset by the
+            // margin width )
+            ::DrawState(hdc, NULL, NULL,
+                    (LPARAM)m_strAccel.c_str(), m_strAccel.length(),
+                    rc.GetWidth()-16-accel_width, rc.y+(int) ((rc.GetHeight()-sizeRect.cy)/2.0),
+                    0, 0,
+                    DST_TEXT |
+                    (((st & wxODDisabled) && !(st & wxODSelected)) ? DSS_DISABLED : 0));
+        }

 
 

-      DeleteDC(hdcMem);
-      DeleteObject(hbmpCheck);
+        (void)SetBkMode(hdc, nPrevMode);

     }
     }

-  }
-  else {
-    wxBitmap bmp;

 
 

-    if ( st & wxODDisabled )
-    {
-        bmp = GetDisabledBitmap();
-    }

 
 

-    if ( !bmp.Ok() )
+    // draw the bitmap
+    // ---------------
+    if ( IsCheckable() && !m_bmpChecked.Ok() )

     {
     {

-        // for not checkable bitmaps we should always use unchecked one because
-        // their checked bitmap is not set
-        bmp = GetBitmap(!IsCheckable() || (st & wxODChecked));
+        if ( st & wxODChecked )
+        {
+            // what goes on: DrawFrameControl creates a b/w mask,
+            // then we copy it to screen to have right colors
+
+            // first create a monochrome bitmap in a memory DC
+            HDC hdcMem = CreateCompatibleDC(hdc);
+            HBITMAP hbmpCheck = CreateBitmap(margin, m_nHeight, 1, 1, 0);
+            SelectObject(hdcMem, hbmpCheck);
+
+            // then draw a check mark into it
+            RECT rect = { 0, 0, margin, m_nHeight };
+            if ( m_nHeight > 0 )
+            {
+                ::DrawFrameControl(hdcMem, &rect, DFC_MENU, DFCS_MENUCHECK);
+            }
+
+            // finally copy it to screen DC and clean up
+            BitBlt(hdc, rc.x, rc.y, margin, m_nHeight, hdcMem, 0, 0, SRCCOPY);
+
+            DeleteDC(hdcMem);
+            DeleteObject(hbmpCheck);
+        }

     }
     }

+    else
+    {
+        wxBitmap bmp;

 
 

-    if ( bmp.Ok() ) {
-      wxMemoryDC dcMem(&dc);
-      dcMem.SelectObject(bmp);
-
-      // center bitmap
-      int nBmpWidth = bmp.GetWidth(),
-          nBmpHeight = bmp.GetHeight();
-
-      // there should be enough space!
-      wxASSERT((nBmpWidth <= rc.GetWidth()) && (nBmpHeight <= rc.GetHeight()));
-
-      int heightDiff = m_nHeight - nBmpHeight;
-      dc.Blit(rc.x + (margin - nBmpWidth) / 2,
-              rc.y + heightDiff / 2,
-              nBmpWidth, nBmpHeight,
-              &dcMem, 0, 0, wxCOPY, true /* use mask */);
+        if ( st & wxODDisabled )
+        {
+            bmp = GetDisabledBitmap();
+        }

 
 

-      if ( ( st & wxODSelected ) && !( st & wxODDisabled ) && draw_bitmap_edge ) {
-          RECT rectBmp = { rc.GetLeft(), rc.GetTop(),
-                           rc.GetLeft() + margin,
-                           rc.GetTop() + m_nHeight };
-          SetBkColor(hdc, colBack);
+        if ( !bmp.Ok() )
+        {
+            // for not checkable bitmaps we should always use unchecked one because
+            // their checked bitmap is not set
+            bmp = GetBitmap(!IsCheckable() || (st & wxODChecked));
+        }

 
 

-          DrawEdge(hdc, &rectBmp, BDR_RAISEDINNER, BF_RECT);
-      }
+        if ( bmp.Ok() )
+        {
+            wxMemoryDC dcMem(&dc);
+            dcMem.SelectObject(bmp);
+
+            // center bitmap
+            int nBmpWidth = bmp.GetWidth(),
+                nBmpHeight = bmp.GetHeight();
+
+            // there should be enough space!
+            wxASSERT((nBmpWidth <= rc.GetWidth()) && (nBmpHeight <= rc.GetHeight()));
+
+            int heightDiff = m_nHeight - nBmpHeight;
+            dc.Blit(rc.x + (margin - nBmpWidth) / 2,
+                    rc.y + heightDiff / 2,
+                    nBmpWidth, nBmpHeight,
+                    &dcMem, 0, 0, wxCOPY, true /* use mask */);
+
+            if ( ( st & wxODSelected ) && !( st & wxODDisabled ) && draw_bitmap_edge )
+            {
+                RECT rectBmp = { rc.GetLeft(), rc.GetTop(),
+                                 rc.GetLeft() + margin,
+                                 rc.GetTop() + m_nHeight };
+                SetBkColor(hdc, colBack);
+
+                DrawEdge(hdc, &rectBmp, BDR_RAISEDINNER, BF_RECT);
+            }
+        }

     }
     }

-  }

 
 

-  ::SetTextColor(hdc, colOldText);
-  ::SetBkColor(hdc, colOldBack);
+    ::SetTextColor(hdc, colOldText);
+    ::SetBkColor(hdc, colOldBack);

 
 

-  return true;
+    return true;

 }
 
 
 }