wxSplitterWindow mouse capture improvements and cleanup.

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

diff --git a/src/msw/ownerdrw.cpp b/src/msw/ownerdrw.cpp
index 6fa6d7734020fec7b1ff06c67091a94020db64ef..29467f8417987aa6a54d64fd74f23fdad683ea18 100644 (file)
--- a/src/msw/ownerdrw.cpp
+++ b/src/msw/ownerdrw.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        msw/ownerdrw.cpp
+// Name:        src/msw/ownerdrw.cpp

 // Purpose:     implementation of wxOwnerDrawn class
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     implementation of wxOwnerDrawn class
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -9,79 +9,115 @@
 // 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"
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"

-#include "wx/msw/private.h"

 
 #ifdef __BORLANDC__
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

+#if wxUSE_OWNER_DRAWN
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-  #include "wx/window.h"
-  #include "wx/msw/private.h"
-  #include "wx/font.h"
-  #include "wx/bitmap.h"
-  #include "wx/dcmemory.h"
-  #include "wx/menu.h"
-  #include "wx/utils.h"
+    #include "wx/window.h"
+    #include "wx/font.h"
+    #include "wx/bitmap.h"
+    #include "wx/image.h"
+    #include "wx/dcmemory.h"
+    #include "wx/menu.h"
+    #include "wx/utils.h"
+    #include "wx/settings.h"
+    #include "wx/menuitem.h"
+    #include "wx/module.h"
+    #include "wx/msw/wrapcctl.h"

 #endif
 
 #endif
 

-#include "wx/settings.h"

 #include "wx/ownerdrw.h"
 #include "wx/ownerdrw.h"

-#include "wx/menuitem.h"

 #include "wx/fontutil.h"
 #include "wx/fontutil.h"

-#include "wx/module.h"

 
 

-#if wxUSE_OWNER_DRAWN
+#include "wx/msw/private.h"
+#include "wx/msw/private/metrics.h"
+#include "wx/msw/dc.h"

 
 #ifndef SPI_GETKEYBOARDCUES
 #define SPI_GETKEYBOARDCUES 0x100A
 #endif
 
 
 #ifndef SPI_GETKEYBOARDCUES
 #define SPI_GETKEYBOARDCUES 0x100A
 #endif
 

+#ifndef DSS_HIDEPREFIX
+#define DSS_HIDEPREFIX  0x0200
+#endif
+

 class wxMSWSystemMenuFontModule : public wxModule
 {
 public:
 class wxMSWSystemMenuFontModule : public wxModule
 {
 public:

-

     virtual bool OnInit()
     {
     virtual bool OnInit()
     {

-        ms_systemMenuFont = new wxFont;
+        return true;
+    }

 
 

-#if defined(__WXMSW__) && defined(__WIN32__) && defined(SM_CXMENUCHECK)
-        NONCLIENTMETRICS nm;
-        nm.cbSize = sizeof(NONCLIENTMETRICS);
-        SystemParametersInfo(SPI_GETNONCLIENTMETRICS,0,&nm,0);
+    virtual void OnExit()
+    {
+        if ( ms_systemMenuFont )
+        {
+            delete ms_systemMenuFont;
+            ms_systemMenuFont = NULL;
+        }
+    }

 
 

-        ms_systemMenuButtonWidth = nm.iMenuHeight;
-        ms_systemMenuHeight = nm.iMenuHeight;
+    static const wxFont& GetSystemMenuFont()
+    {
+        if ( !ms_systemMenuFont )
+            DoInitFont();

 
 

-        // create menu font
-        wxNativeFontInfo info;
-        memcpy(&info.lf, &nm.lfMenuFont, sizeof(LOGFONT));
-        ms_systemMenuFont->Create(info);
+        return *ms_systemMenuFont;
+    }

 
 

-        if (SystemParametersInfo(SPI_GETKEYBOARDCUES, 0, &ms_showCues, 0) == 0)
-            ms_showCues = true;
-#endif
+    static int GetSystemMenuHeight()
+    {
+        if ( !ms_systemMenuHeight )
+            DoInitMetrics();

 
 

-        return true;
+        return ms_systemMenuHeight;

     }
 
     }
 

-    virtual void OnExit()
+    static bool AlwaysShowCues()

     {
     {

-        delete ms_systemMenuFont;
-        ms_systemMenuFont = NULL;
+        if ( !ms_systemMenuHeight )
+            DoInitMetrics();
+
+        return ms_alwaysShowCues;

     }
 
     }
 

-    static wxFont* ms_systemMenuFont;
-    static int ms_systemMenuButtonWidth;   // windows clean install default
-    static int ms_systemMenuHeight;        // windows clean install default
-    static bool ms_showCues;

 private:
 private:

+    static void DoInitMetrics()
+    {
+        // iMenuHeight is the menu bar height and the menu items are less tall,
+        // although I don't know by how much -- below is the value for my system
+        ms_systemMenuHeight = wxMSWImpl::GetNonClientMetrics().iMenuHeight - 4;
+
+        wxASSERT_MSG( ms_systemMenuHeight > 0,
+                        "menu height should be positive" );
+
+        if ( ::SystemParametersInfo(SPI_GETKEYBOARDCUES, 0,
+                                    &ms_alwaysShowCues, 0) == 0 )
+        {
+            // if it's not supported, we must be on an old Windows version
+            // which always shows them
+            ms_alwaysShowCues = true;
+        }
+    }
+
+    static void DoInitFont()
+    {
+        ms_systemMenuFont = new
+          wxFont(wxNativeFontInfo(wxMSWImpl::GetNonClientMetrics().lfMenuFont));
+    }
+
+    static wxFont* ms_systemMenuFont;
+    static int ms_systemMenuHeight;
+    static bool ms_alwaysShowCues;
+
+

     DECLARE_DYNAMIC_CLASS(wxMSWSystemMenuFontModule)
 };
 
     DECLARE_DYNAMIC_CLASS(wxMSWSystemMenuFontModule)
 };
 


@@ -90,19 +126,12 @@ private:
 // SystemParametersInfo() call.
 
 wxFont* wxMSWSystemMenuFontModule::ms_systemMenuFont = NULL;
 // SystemParametersInfo() call.
 
 wxFont* wxMSWSystemMenuFontModule::ms_systemMenuFont = NULL;

-int wxMSWSystemMenuFontModule::ms_systemMenuButtonWidth = 18;   // windows clean install default
-int wxMSWSystemMenuFontModule::ms_systemMenuHeight = 18;        // windows clean install default
-bool wxMSWSystemMenuFontModule::ms_showCues = true;
+int wxMSWSystemMenuFontModule::ms_systemMenuHeight = 0;
+bool wxMSWSystemMenuFontModule::ms_alwaysShowCues = false;

 
 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"
-#endif
-

 // VC++ 6 gives a warning here:
 //
 //      return type for 'OwnerDrawnSet_wxImplementation_HashTable::iterator::
 // VC++ 6 gives a warning here:
 //
 //      return type for 'OwnerDrawnSet_wxImplementation_HashTable::iterator::


@@ -110,12 +139,12 @@ IMPLEMENT_DYNAMIC_CLASS(wxMSWSystemMenuFontModule, wxModule)
 //      a UDT.  Will produce errors if applied using infix notation.
 //
 // shut it down
 //      a UDT.  Will produce errors if applied using infix notation.
 //
 // shut it down

-#ifdef __VISUALC__
-    #if __VISUALC__ <= 1300
+#if defined __VISUALC__ && __VISUALC__ <= 1300
+    #if __VISUALC__ >= 1200

         #pragma warning(push)
         #pragma warning(push)

-        #pragma warning(disable: 4284)

         #define POP_WARNINGS
     #endif
         #define POP_WARNINGS
     #endif

+    #pragma warning(disable: 4284)

 #endif
 
 #include "wx/hashset.h"
 #endif
 
 #include "wx/hashset.h"


@@ -125,8 +154,6 @@ WX_DECLARE_HASH_SET(wxOwnerDrawn*, wxPointerHash, wxPointerEqual, OwnerDrawnSet)
     #pragma warning(pop)
 #endif
 
     #pragma warning(pop)
 #endif
 

-static OwnerDrawnSet gs_menuItems;
-

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


@@ -138,7 +165,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);


@@ -147,34 +174,22 @@ 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_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;

 }
 
 
 }
 
 

-// these items will be set during the first invocation of the c'tor,
+// these items will be set during the first invocation of the ctor,

 // because the values will be determined by checking the system settings,
 // which is a chunk of code
 size_t wxOwnerDrawn::ms_nDefaultMarginWidth = 0;
 // because the values will be determined by checking the system settings,
 // which is a chunk of code
 size_t wxOwnerDrawn::ms_nDefaultMarginWidth = 0;


@@ -190,7 +205,7 @@ wxFont wxOwnerDrawn::GetFontToUse() const
     if ( !font.Ok() )
     {
         if ( IsMenuItem() )
     if ( !font.Ok() )
     {
         if ( IsMenuItem() )

-            font = *wxMSWSystemMenuFontModule::ms_systemMenuFont;
+            font = wxMSWSystemMenuFontModule::GetSystemMenuFont();

 
         if ( !font.Ok() )
             font = *wxNORMAL_FONT;
 
         if ( !font.Ok() )
             font = *wxNORMAL_FONT;


@@ -215,17 +230,16 @@ bool wxOwnerDrawn::OnMeasureItem(size_t *pwidth, size_t *pheight)
         // placed on top of each other.
         if ( !m_strAccel.empty() )
         {
         // placed on top of each other.
         if ( !m_strAccel.empty() )
         {

-            str.Pad(str.Length()%8);
+            str.Pad(str.length()%8);

             str += m_strAccel;
         }
 
         dc.SetFont(GetFontToUse());
 
             str += m_strAccel;
         }
 
         dc.SetFont(GetFontToUse());
 

-        dc.GetTextExtent(str, (long *)pwidth, (long *)pheight);
-
-        // add space at the end of the menu for the submenu expansion arrow
-        // this will also allow offsetting the accel string from the right edge
-        *pwidth += GetMarginWidth() + 16;
+        wxCoord w, h;
+        dc.GetTextExtent(str, &w, &h);
+        *pwidth = w;
+        *pheight = h;

     }
     else // don't draw the text, just the bitmap (if any)
     {
     }
     else // don't draw the text, just the bitmap (if any)
     {


@@ -236,17 +250,16 @@ bool wxOwnerDrawn::OnMeasureItem(size_t *pwidth, size_t *pheight)
     // increase size to accommodate bigger bitmaps if necessary
     if (m_bmpChecked.Ok())
     {
     // increase size to accommodate bigger bitmaps if necessary
     if (m_bmpChecked.Ok())
     {

-        // Is BMP height larger then text height?
-        size_t adjustedHeight = m_bmpChecked.GetHeight() +
-                                  2*wxSystemSettings::GetMetric(wxSYS_EDGE_Y);
-        if (*pheight < adjustedHeight)
+        // Is BMP height larger than text height?
+        size_t adjustedHeight = m_bmpChecked.GetHeight();
+        if ( *pheight < adjustedHeight )

             *pheight = adjustedHeight;
 
             *pheight = adjustedHeight;
 

-        const size_t widthBmp = m_bmpChecked.GetWidth();
+        const int widthBmp = m_bmpChecked.GetWidth();

         if ( IsOwnerDrawn() )
         {
             // widen the margin to fit the bitmap if necessary
         if ( IsOwnerDrawn() )
         {
             // widen the margin to fit the bitmap if necessary

-            if ((size_t)GetMarginWidth() < widthBmp)
+            if ( GetMarginWidth() < widthBmp )

                 SetMarginWidth(widthBmp);
         }
         else // we must allocate enough space for the bitmap
                 SetMarginWidth(widthBmp);
         }
         else // we must allocate enough space for the bitmap


@@ -258,9 +271,19 @@ bool wxOwnerDrawn::OnMeasureItem(size_t *pwidth, size_t *pheight)
     // add a 4-pixel separator, otherwise menus look cluttered
     *pwidth += 4;
 
     // add a 4-pixel separator, otherwise menus look cluttered
     *pwidth += 4;
 

+    // notice that this adjustment must be done after (possibly) changing the
+    // margin width above
+    if ( IsOwnerDrawn() )
+    {
+        // add space at the end of the menu for the submenu expansion arrow
+        // this will also allow offsetting the accel string from the right edge
+        *pwidth += GetMarginWidth() + 16;
+    }
+

     // make sure that this item is at least as tall as the system menu height
     // make sure that this item is at least as tall as the system menu height

-    if ( *pheight < m_nMinHeight )
-      *pheight = m_nMinHeight;
+    const size_t heightStd = wxMSWSystemMenuFontModule::GetSystemMenuHeight();
+    if ( *pheight < heightStd )
+      *pheight = heightStd;

 
     // remember height for use in OnDrawItem
     m_nHeight = *pheight;
 
     // remember height for use in OnDrawItem
     m_nHeight = *pheight;


@@ -271,214 +294,289 @@ bool wxOwnerDrawn::OnMeasureItem(size_t *pwidth, size_t *pheight)
 // draw the item
 bool wxOwnerDrawn::OnDrawItem(wxDC& dc,
                               const wxRect& rc,
 // draw the item
 bool wxOwnerDrawn::OnDrawItem(wxDC& dc,
                               const wxRect& rc,

-                              wxODAction act,
+                              wxODAction,

                               wxODStatus st)
 {
                               wxODStatus st)
 {

-  // 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)
-
-  bool draw_bitmap_edge = true;
-
-  // set the colors
-  // --------------
-  DWORD colBack, colText;
-  if ( st & wxODSelected ) {
-    colBack = GetSysColor(COLOR_HIGHLIGHT);
-    if (!(st & wxODDisabled))
+    // 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;
+
+    // set the colors
+    // --------------
+    DWORD colBack, colText;
+    if ( st & wxODSelected )
+    {
+        colBack = GetSysColor(COLOR_HIGHLIGHT);
+        if (!(st & wxODDisabled))
+        {
+            colText = GetSysColor(COLOR_HIGHLIGHTTEXT);
+        }
+        else
+        {
+            colText = GetSysColor(COLOR_GRAYTEXT);
+        }
+    }
+    else

     {
     {

-        colText = GetSysColor(COLOR_HIGHLIGHTTEXT);
+        // 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
+
+    if ( IsOwnerDrawn() )

     {
     {

-        colText = GetSysColor(COLOR_GRAYTEXT);
+        // 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 {
-    // 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);
-  }
-
-  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 )
-      )
+    else // edge doesn't look well with default Windows drawing

     {
         draw_bitmap_edge = false;
     }
     {
         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);

 
 

-  // select the font and draw the text
-  // ---------------------------------
+    wxMSWDCImpl *impl = (wxMSWDCImpl*) dc.GetImpl();
+    HDC hdc = GetHdcOf(*impl);
+    COLORREF colOldText = ::SetTextColor(hdc, colText),
+             colOldBack = ::SetBkColor(hdc, colBack);

 
 

+    // *2, as in wxSYS_EDGE_Y
+    int margin = GetMarginWidth() + 2 * wxSystemSettings::GetMetric(wxSYS_EDGE_X);

 
 

-  // 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;
+    // select the font and draw the text
+    // ---------------------------------

 
 
 
 

-  // using native API because it recognizes '&'
-  if ( IsOwnerDrawn() )
-  {
-    int nPrevMode = SetBkMode(hdc, TRANSPARENT);
-    AutoHBRUSH hbr(colBack);
-    SelectInHDC selBrush(hdc, hbr);
+    // 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;

 
 

-    RECT rectFill = { rc.GetLeft(), rc.GetTop(),
-                        rc.GetRight() + 1, rc.GetBottom() + 1 };

 
 

-    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;
-    }
-
-    FillRect(hdc, &rectFill, hbr);
+    // using native API because it recognizes '&'
+    if ( IsOwnerDrawn() )
+    {
+        int nPrevMode = SetBkMode(hdc, TRANSPARENT);
+        AutoHBRUSH hbr(colBack);
+        SelectInHDC selBrush(hdc, hbr);

 
 

-    // use default font if no font set
-    wxFont fontToUse = GetFontToUse();
-    SelectInHDC selFont(hdc, GetHfontOf(fontToUse));
+        RECT rectFill;
+        wxCopyRectToRECT(rc, rectFill);

 
 

-    wxString strMenuText = m_strName.BeforeFirst('\t');
+        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;
+        }

 
 

-    xText += 3; // separate text from the highlight rectangle
+        FillRect(hdc, &rectFill, hbr);

 
 

-    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
+        // use default font if no font set
+        wxFont fontToUse = GetFontToUse();
+        SelectInHDC selFont(hdc, GetHfontOf(fontToUse));

 
 

-    // ::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));
-    }
+        wxString strMenuText = m_strName.BeforeFirst('\t');

 
 

-    (void)SetBkMode(hdc, nPrevMode);
-  }
+        xText += 3; // separate text from the highlight rectangle

 
 

+        SIZE sizeRect;
+        ::GetTextExtentPoint32(hdc, strMenuText.c_str(), strMenuText.length(), &sizeRect);

 
 

-  // 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
+        int flags = DST_PREFIXTEXT;
+        if ( (st & wxODDisabled) && !(st & wxODSelected) )
+            flags |= DSS_DISABLED;

 
 

-        // 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);
+        if ( (st & wxODHidePrefix) &&
+                !wxMSWSystemMenuFontModule::AlwaysShowCues() )
+            flags |= DSS_HIDEPREFIX;

 
 

-        // 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);
-      }
+        ::DrawState
+        (
+            hdc,
+            NULL,
+            NULL,
+            (LPARAM)strMenuText.wx_str(),
+            strMenuText.length(),
+            xText,
+            rc.y + (rc.height - sizeRect.cy) / 2, // centre vertically
+            rc.GetWidth() - margin,
+            sizeRect.cy,
+            flags
+        );

 
 

-        // finally copy it to screen DC and clean up
-      BitBlt(hdc, rc.x, rc.y, margin, m_nHeight,
-             hdcMem, 0, 0, SRCCOPY);
+        // ::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.wx_str(),
+                    m_strAccel.length(),
+                    rc.width - 16 - accel_width, rc.y + (rc.height - sizeRect.cy) / 2,
+                    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 )
+
+    // draw the bitmap
+    // ---------------
+    if ( IsCheckable() && !m_bmpChecked.Ok() )

     {
     {

-        bmp = GetDisabledBitmap();
+        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);
+        }

     }
     }

-
-    if ( !bmp.Ok() )
+    else

     {
     {

-        // for not checkable bitmaps we should always use unchecked one because
-        // their checked bitmap is not set
-        bmp = GetBitmap(!IsCheckable() || (st & wxODChecked));
+        wxBitmap bmp;
+
+        if ( st & wxODDisabled )
+        {
+            bmp = GetDisabledBitmap();
+        }
+
+        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));
+
+#if wxUSE_IMAGE
+            if ( bmp.Ok() && st & wxODDisabled )
+            {
+                // we need to grey out the bitmap as we don't have any specific
+                // disabled bitmap
+                wxImage imgGrey = bmp.ConvertToImage().ConvertToGreyscale();
+                if ( imgGrey.Ok() )
+                    bmp = wxBitmap(imgGrey);
+            }
+#endif // wxUSE_IMAGE
+        }
+
+        if ( bmp.Ok() )
+        {
+            wxMemoryDC dcMem(&dc);
+            dcMem.SelectObjectAsSource(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);
+            }
+        }

     }
 
     }
 

-    if ( bmp.Ok() ) {
-      wxMemoryDC dcMem(&dc);
-      dcMem.SelectObject(bmp);
+    ::SetTextColor(hdc, colOldText);
+    ::SetBkColor(hdc, colOldBack);

 
 

-      // center bitmap
-      int nBmpWidth = bmp.GetWidth(),
-          nBmpHeight = bmp.GetHeight();
+    return true;
+}

 
 

-      // 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 */);
+// ----------------------------------------------------------------------------
+// global helper functions implemented here
+// ----------------------------------------------------------------------------

 
 

-      if ( ( st & wxODSelected ) && !( st & wxODDisabled ) && draw_bitmap_edge ) {
-          RECT rectBmp = { rc.GetLeft(), rc.GetTop(),
-                           rc.GetLeft() + margin,
-                           rc.GetTop() + m_nHeight };
-          SetBkColor(hdc, colBack);
+BOOL wxDrawStateBitmap(HDC hDC, HBITMAP hBitmap, int x, int y, UINT uState)
+{
+    // determine size of bitmap image
+    BITMAP bmp;
+    if ( !::GetObject(hBitmap, sizeof(BITMAP), &bmp) )
+        return FALSE;

 
 

-          DrawEdge(hdc, &rectBmp, BDR_RAISEDINNER, BF_RECT);
-      }
-    }
-  }
+    BOOL result;

 
 

-  ::SetTextColor(hdc, colOldText);
-  ::SetBkColor(hdc, colOldBack);
+    switch ( uState )
+    {
+        case wxDSB_NORMAL:
+        case wxDSB_SELECTED:
+            {
+                // uses image list functions to draw
+                //  - normal bitmap with support transparency
+                //    (image list internally create mask etc.)
+                //  - blend bitmap with the background colour
+                //    (like default selected items)
+                HIMAGELIST hIml = ::ImageList_Create(bmp.bmWidth, bmp.bmHeight,
+                                                     ILC_COLOR32 | ILC_MASK, 1, 1);
+                ::ImageList_Add(hIml, hBitmap, NULL);
+                UINT fStyle = uState == wxDSB_SELECTED ? ILD_SELECTED : ILD_NORMAL;
+                result = ::ImageList_Draw(hIml, 0, hDC, x, y, fStyle);
+                ::ImageList_Destroy(hIml);
+            }
+            break;
+
+        case wxDSB_DISABLED:
+            result = ::DrawState(hDC, NULL, NULL, (LPARAM)hBitmap, 0, x, y,
+                                 bmp.bmWidth, bmp.bmHeight,
+                                 DST_BITMAP | DSS_DISABLED);
+            break;
+
+        default:
+            wxFAIL_MSG( wxT("DrawStateBitmap: unknown wxDSBStates value") );
+            result = FALSE;
+    }

 
 

-  return true;
+    return result;

 }
 
 }
 

-

 #endif // wxUSE_OWNER_DRAWN
 #endif // wxUSE_OWNER_DRAWN

-