ICCCM says that the TIMESTAMP atom is required, so provide it. This is patch 1424755...

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

diff --git a/src/os2/ownerdrw.cpp b/src/os2/ownerdrw.cpp
index 46a4560cf4918ebb6d01383e111e4d042ece6e8a..ac75b71f40ee14cb7a7ba2ada36dd7ebd6e4c8d0 100644 (file)
--- a/src/os2/ownerdrw.cpp
+++ b/src/os2/ownerdrw.cpp
@@ -6,19 +6,15 @@
 // Created:     10/12/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
 // Created:     10/12/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifndef WX_PRECOMP
   #include "wx/window.h"
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifndef WX_PRECOMP
   #include "wx/window.h"

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

   #include "wx/font.h"
   #include "wx/bitmap.h"
   #include "wx/dcmemory.h"
   #include "wx/font.h"
   #include "wx/bitmap.h"
   #include "wx/dcmemory.h"


@@ -28,6 +24,7 @@
 
 #if wxUSE_OWNER_DRAWN
 
 
 #if wxUSE_OWNER_DRAWN
 

+#include "wx/settings.h"

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


@@ -40,11 +37,9 @@
 // ctor
 // ----
 //
 // ctor
 // ----
 //

-wxOwnerDrawn::wxOwnerDrawn(
-  const wxString&                   rsStr
-, bool                              bCheckable
-, bool                              bMenuItem
-)
+wxOwnerDrawn::wxOwnerDrawn( const wxString& rsStr,
+                            bool            bCheckable,
+                            bool            WXUNUSED(bMenuItem) )

 : m_strName(rsStr)
 {
     m_bCheckable   = bCheckable;
 : m_strName(rsStr)
 {
     m_bCheckable   = bCheckable;


@@ -55,6 +50,8 @@ wxOwnerDrawn::wxOwnerDrawn(
         m_font = *wxNORMAL_FONT;
 } // end of wxOwnerDrawn::wxOwnerDrawn
 
         m_font = *wxNORMAL_FONT;
 } // end of wxOwnerDrawn::wxOwnerDrawn
 

+wxOwnerDrawn::~wxOwnerDrawn() { }
+

 size_t wxOwnerDrawn::ms_nDefaultMarginWidth = 15;
 
 size_t wxOwnerDrawn::ms_nLastMarginWidth = ms_nDefaultMarginWidth;
 size_t wxOwnerDrawn::ms_nDefaultMarginWidth = 15;
 
 size_t wxOwnerDrawn::ms_nLastMarginWidth = ms_nDefaultMarginWidth;


@@ -64,40 +61,118 @@ size_t wxOwnerDrawn::ms_nLastMarginWidth = ms_nDefaultMarginWidth;
 // -------
 //
 
 // -------
 //
 

-bool wxOwnerDrawn::OnMeasureItem(
-  size_t*                           pWidth
-, size_t*                           pHeight
-)
+bool wxOwnerDrawn::OnMeasureItem( size_t* pWidth,
+                                  size_t* pHeight )

 {
 {

-    wxMemoryDC                      vDC;
+    wxMemoryDC vDC;

 
 

-    vDC.SetFont(GetFont());
-
-    wxString                        sStr = wxStripMenuCodes(m_strName);
+    wxString  sStr = wxStripMenuCodes(m_strName);

 
 

+    //
+    // If we have a valid accel string, then pad out
+    // the menu string so that the menu and accel string are not
+    // placed on top of each other.
+    if (!m_strAccel.empty() )
+    {
+        sStr.Pad(sStr.Length()%8);
+        sStr += m_strAccel;
+    }
+    vDC.SetFont(GetFont());

     vDC.GetTextExtent( sStr
                       ,(long *)pWidth
                       ,(long *)pHeight
                      );
     vDC.GetTextExtent( sStr
                       ,(long *)pWidth
                       ,(long *)pHeight
                      );

+    if (!m_strAccel.empty())
+    {
+        //
+        // Measure the accelerator string, and add its width to
+        // the total item width, plus 16 (Accelerators are right justified,
+        // with the right edge of the text rectangle 16 pixels left of
+        // the right edge of the menu)
+        //
+        int                         nAccelWidth;
+        int                         nAccelHeight;
+
+        vDC.GetTextExtent( m_strAccel
+                          ,&nAccelWidth
+                          ,&nAccelHeight
+                         );
+        *pWidth += nAccelWidth;
+    }
+
+    //
+    // 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 = (size_t)(*pWidth + GetDefaultMarginWidth() * 1.5);
+
+    //
+    // JACS: items still look too tightly packed, so adding 5 pixels.
+    //
+    (*pHeight) += 5;

 
 

-    (*pHeight) = (*pHeight) + 2;
-    m_nHeight = *pHeight;        // remember height for use in OnDrawItem
-    return TRUE;
+    //
+    // Ray Gilbert's changes - Corrects the problem of a BMP
+    // being placed next to text in a menu item, and the BMP does
+    // not match the size expected by the system.  This will
+    // resize the space so the BMP will fit.  Without this, BMPs
+    // must be no larger or smaller than 16x16.
+    //
+    if (m_bmpChecked.Ok())
+    {
+        //
+        // Is BMP height larger then text height?
+        //
+        size_t                      nAdjustedHeight = m_bmpChecked.GetHeight() +
+                                                      wxSystemSettings::GetMetric(wxSYS_EDGE_Y);
+        if (*pHeight < nAdjustedHeight)
+            *pHeight = nAdjustedHeight;
+
+        //
+        // Does BMP encroach on default check menu position?
+        //
+        size_t                      nAdjustedWidth = m_bmpChecked.GetWidth() +
+                                                     (wxSystemSettings::GetMetric(wxSYS_EDGE_X) * 2);
+
+        //
+        // Do we need to widen margin to fit BMP?
+        //
+        if ((size_t)GetMarginWidth() < nAdjustedWidth)
+            SetMarginWidth(nAdjustedWidth);
+
+        //
+        // Add the size of the bitmap to our total size...
+        //
+        *pWidth += GetMarginWidth();
+    }
+
+    //
+    // Add the size of the bitmap to our total size - even if we don't have
+    // a bitmap we leave room for one...
+    //
+    *pWidth += GetMarginWidth();
+
+    //
+    // Make sure that this item is at least as
+    // tall as the user's system settings specify
+    //
+    if (*pHeight < m_nMinHeight)
+        *pHeight = m_nMinHeight;
+    m_nHeight = *pHeight;                // remember height for use in OnDrawItem
+    return true;

 } // end of wxOwnerDrawn::OnMeasureItem
 
 // draw the item
 } // end of wxOwnerDrawn::OnMeasureItem
 
 // draw the item

-bool wxOwnerDrawn::OnDrawItem(
-  wxDC&                             rDC
-, const wxRect&                     rRect
-, wxODAction                        eAction
-, wxODStatus                        eStatus
-)
+bool wxOwnerDrawn::OnDrawItem( wxDC& rDC,
+                               const wxRect& rRect,
+                               wxODAction eAction,
+                               wxODStatus eStatus )

 {
     //
     // We do nothing on focus change
     //
     if (eAction == wxODFocusChanged )
 {
     //
     // We do nothing on focus change
     //
     if (eAction == wxODFocusChanged )

-        return TRUE;
+        return true;

 
     //
     // Select the font and draw the text
 
     //
     // Select the font and draw the text


@@ -111,6 +186,8 @@ bool wxOwnerDrawn::OnDrawItem(
     COLORREF                        vRef;
     RECTL                           vRect = {rRect.x + 4, rRect.y + 1, rRect.x + (rRect.width - 2), rRect.y + rRect.height};
 
     COLORREF                        vRef;
     RECTL                           vRect = {rRect.x + 4, rRect.y + 1, rRect.x + (rRect.width - 2), rRect.y + rRect.height};
 

+    memset(&vCbnd, 0, sizeof(CHARBUNDLE));
+

     //
     // Use default font if no font set
     //
     //
     // Use default font if no font set
     //


@@ -124,11 +201,11 @@ bool wxOwnerDrawn::OnDrawItem(
     }
 
     //
     }
 
     //

-    // Base on the status of the menu item pick the right colors
+    // Based on the status of the menu item, pick the right colors

     //
     if (eStatus & wxODSelected)
     {
     //
     if (eStatus & wxODSelected)
     {

-        wxColour                        vCol2("WHITE");
+        wxColour                        vCol2(wxT("WHITE"));

         vColBack.Set( (unsigned char)0
                      ,(unsigned char)0
                      ,(unsigned char)160
         vColBack.Set( (unsigned char)0
                      ,(unsigned char)0
                      ,(unsigned char)160


@@ -160,7 +237,7 @@ bool wxOwnerDrawn::OnDrawItem(
         // Fall back to default colors if none explicitly specified
         //
         vRef = ::WinQuerySysColor( HWND_DESKTOP
         // Fall back to default colors if none explicitly specified
         //
         vRef = ::WinQuerySysColor( HWND_DESKTOP

-                                  ,SYSCLR_MENU  // we are using gray for all our window backgrounds in wxWindows
+                                  ,SYSCLR_MENU  // we are using gray for all our window backgrounds in wxWidgets

                                   ,0L
                                  );
         vColBack.Set( GetRValue(vRef)
                                   ,0L
                                  );
         vColBack.Set( GetRValue(vRef)


@@ -176,9 +253,21 @@ bool wxOwnerDrawn::OnDrawItem(
                      ,GetBValue(vRef)
                     );
     }
                      ,GetBValue(vRef)
                     );
     }

+

     rDC.SetTextBackground(vColBack);
     rDC.SetTextForeground(vColText);
     rDC.SetBackgroundMode(wxTRANSPARENT);
     rDC.SetTextBackground(vColBack);
     rDC.SetTextForeground(vColText);
     rDC.SetBackgroundMode(wxTRANSPARENT);

+    vCbnd.lColor     = vColText.GetPixel();
+    vCbnd.lBackColor = vColBack.GetPixel();
+    ::GpiSetAttrs( hPS
+                  ,PRIM_CHAR
+                  ,CBB_BACK_COLOR | CBB_COLOR
+                  ,0
+                  ,&vCbnd
+                 );
+    ::GpiSetBackMix( hPS
+                    ,BM_LEAVEALONE
+                   );

 
     //
     // Paint the background
 
     //
     // Paint the background


@@ -193,24 +282,24 @@ bool wxOwnerDrawn::OnDrawItem(
     //
     // Unfortunately, unlike Win32, PM has no owner drawn specific text
     // drawing methods like ::DrawState that can cleanly handle accel
     //
     // Unfortunately, unlike Win32, PM has no owner drawn specific text
     // drawing methods like ::DrawState that can cleanly handle accel

-    // pneumonics and deal, automatically, with various states, so we have
+    // mnemonics and deal, automatically, with various states, so we have

     // to handle them ourselves. Notice Win32 can't handle \t in ownerdrawn
     // to handle them ourselves. Notice Win32 can't handle \t in ownerdrawn

-    // strings either.  We cannot handle mneumonics either.  We display
-    // it, though, in hopes we can figure it out some day.
+    // strings either.  We cannot handle mnemonics either.  We display
+    // them, though, in the hope we can figure them out some day.

     //
 
     //
     //
 
     //

-    // Display main text and accel text separately to allign better
+    // Display main text and accel text separately to align better

     //
     //

-    wxString                        sTgt = "\t";
-    wxString                        sFullString = m_strName; // need to save the original text
-    wxString                        sAccel;
-    size_t                          nIndex;
-    size_t                          nWidth;
-    size_t                          nCharWidth;
-    size_t                          nHeight;
-    bool                            bFoundMneumonic = FALSE;
-    bool                            bFoundAccel = FALSE;
+    wxString sTgt = wxT("\t");
+    wxString sFullString = m_strName; // need to save the original text
+    wxString sAccel;
+    int      nIndex;
+    size_t   nWidth;
+    size_t   nCharWidth;
+    size_t   nHeight;
+    bool     bFoundMnemonic = false;
+    bool     bFoundAccel = false;

 
     //
     // Deal with the tab, extracting the Accel text
 
     //
     // Deal with the tab, extracting the Accel text


@@ -218,49 +307,53 @@ bool wxOwnerDrawn::OnDrawItem(
     nIndex = sFullString.Find(sTgt.c_str());
     if (nIndex != -1)
     {
     nIndex = sFullString.Find(sTgt.c_str());
     if (nIndex != -1)
     {

-        bFoundAccel = TRUE;
+        bFoundAccel = true;

         sAccel = sFullString.Mid(nIndex + 1);
         sFullString.Remove(nIndex);
     }
 
     //
         sAccel = sFullString.Mid(nIndex + 1);
         sFullString.Remove(nIndex);
     }
 
     //

-    // Deal with the mneumonic character
+    // Deal with the mnemonic character

     //
     //

-    sTgt = "~";
+    sTgt = wxT("~");

     nIndex = sFullString.Find(sTgt.c_str());
     if (nIndex != -1)
     {
     nIndex = sFullString.Find(sTgt.c_str());
     if (nIndex != -1)
     {

-        wxString                    sTmp = sFullString;
+        wxString sTmp = sFullString;

 
 

-        bFoundMneumonic = TRUE;
+        bFoundMnemonic = true;

         sTmp.Remove(nIndex);
         rDC.GetTextExtent( sTmp
                           ,(long *)&nWidth
                           ,(long *)&nHeight
                          );
         sTmp.Remove(nIndex);
         rDC.GetTextExtent( sTmp
                           ,(long *)&nWidth
                           ,(long *)&nHeight
                          );

-        sTmp = sFullString[nIndex + 1];
+        sTmp = sFullString[(size_t)(nIndex + 1)];

         rDC.GetTextExtent( sTmp
                           ,(long *)&nCharWidth
                           ,(long *)&nHeight
                          );
         rDC.GetTextExtent( sTmp
                           ,(long *)&nCharWidth
                           ,(long *)&nHeight
                          );

-        sFullString.Replace(sTgt.c_str(), "", TRUE);
+        sFullString.Replace(sTgt.c_str(), wxEmptyString, true);

     }
 
     //
     // Draw the main item text sans the accel text
     }
 
     //
     // Draw the main item text sans the accel text

-    rDC.DrawText( sFullString
-                 ,nX
-                 ,rRect.y + 4
-                );
-    if (bFoundMneumonic)
+    //
+    POINTL                      vPntStart = {nX, rRect.y + 4};
+    ::GpiCharStringAt( rDC.GetHPS()
+                      ,&vPntStart
+                      ,sFullString.length()
+                      ,(PCH)sFullString.c_str()
+                     );
+    if (bFoundMnemonic)

     {
         //
     {
         //

-        // Underline the mneumonic -- still won't work, but at least it "looks" right
+        // Underline the mnemonic -- still won't work, but at least it "looks" right

         //
         wxPen                       vPen;
         //
         wxPen                       vPen;

-        POINTL                      vPntStart = {nX + nWidth - 1, rRect.y + 2}; // Make it look pretty!

         POINTL                      vPntEnd = {nX + nWidth + nCharWidth - 3, rRect.y + 2}; //CharWidth is bit wide
 
         POINTL                      vPntEnd = {nX + nWidth + nCharWidth - 3, rRect.y + 2}; //CharWidth is bit wide
 

+        vPntStart.x = nX + nWidth - 1;
+        vPntStart.y = rRect.y + 2; // Make it look pretty!

         vPen = wxPen(vColText, 1, wxSOLID); // Assuming we are always black
         rDC.SetPen(vPen);
         ::GpiMove(hPS, &vPntStart);
         vPen = wxPen(vColText, 1, wxSOLID); // Assuming we are always black
         rDC.SetPen(vPen);
         ::GpiMove(hPS, &vPntStart);


@@ -282,10 +375,13 @@ bool wxOwnerDrawn::OnDrawItem(
         //
         // Back off the starting position from the right edge
         //
         //
         // Back off the starting position from the right edge
         //

-        rDC.DrawText( sAccel
-                     ,rRect.width - (nWidth + 7) // this seems to mimic the default OS/2 positioning
-                     ,rRect.y + 4
-                    );
+        vPntStart.x = rRect.width - (nWidth + 7);
+        vPntStart.y = rRect.y + 4;
+        ::GpiCharStringAt( rDC.GetHPS()
+                          ,&vPntStart
+                          ,sAccel.length()
+                          ,(PCH)sAccel.c_str()
+                         );

     }
 
     //
     }
 
     //


@@ -319,12 +415,18 @@ bool wxOwnerDrawn::OnDrawItem(
         //
         // For uncheckable item we use only the 'checked' bitmap
         //
         //
         // For uncheckable item we use only the 'checked' bitmap
         //

-        wxBitmap                    vBmp(GetBitmap(IsCheckable() ? ((eStatus & wxODChecked) != 0) : TRUE));
+        wxBitmap vBmp(GetBitmap(IsCheckable() ? ((eStatus & wxODChecked) != 0) : TRUE));

 
         if (vBmp.Ok())
         {
 
         if (vBmp.Ok())
         {

+

             wxMemoryDC              vDCMem(&rDC);
             wxMemoryDC              vDCMem(&rDC);

+            wxMemoryDC*             pOldDC = (wxMemoryDC*)vBmp.GetSelectedInto();

 
 

+            if(pOldDC != NULL)
+            {
+                vBmp.SetSelectedInto(NULL);
+            }

             vDCMem.SelectObject(vBmp);
 
             //
             vDCMem.SelectObject(vBmp);
 
             //


@@ -338,29 +440,24 @@ bool wxOwnerDrawn::OnDrawItem(
             //
             wxASSERT((nBmpWidth <= rRect.width) && (nBmpHeight <= rRect.height));
 
             //
             wxASSERT((nBmpWidth <= rRect.width) && (nBmpHeight <= rRect.height));
 

-            //
-            //MT: blit with mask enabled.
-            //
+            int                     nHeightDiff = m_nHeight - nBmpHeight;
+

             rDC.Blit( rRect.x + (GetMarginWidth() - nBmpWidth) / 2
             rDC.Blit( rRect.x + (GetMarginWidth() - nBmpWidth) / 2

-                     ,rRect.y + (m_nHeight - nBmpHeight) /2
+                     ,rRect.y + nHeightDiff / 2

                      ,nBmpWidth
                      ,nBmpHeight
                      ,&vDCMem
                      ,0
                      ,0
                      ,wxCOPY
                      ,nBmpWidth
                      ,nBmpHeight
                      ,&vDCMem
                      ,0
                      ,0
                      ,wxCOPY

-                     ,TRUE
+                     ,true

                     );
 
             if (eStatus & wxODSelected)
             {
                     );
 
             if (eStatus & wxODSelected)
             {

-                RECT                vRectBmp = { rRect.x
-                                                ,rRect.y
-                                                ,rRect.x + GetMarginWidth()
-                                                ,rRect.y + m_nHeight
-                                               };
-                POINTL              vPnt1 = {2, 4}; // Leave a little background border
+                POINTL              vPnt1 = {rRect.x + 1, rRect.y + 3}; // Leave a little background border

                 POINTL              vPnt2 = {rRect.x + GetMarginWidth(), rRect.y + m_nHeight - 3};
                 POINTL              vPnt2 = {rRect.x + GetMarginWidth(), rRect.y + m_nHeight - 3};

+

                 LINEBUNDLE          vLine;
 
                 vLine.lColor = vColBack.GetPixel();
                 LINEBUNDLE          vLine;
 
                 vLine.lColor = vColBack.GetPixel();


@@ -378,9 +475,10 @@ bool wxOwnerDrawn::OnDrawItem(
                          ,0L
                         );
             }
                          ,0L
                         );
             }

+            vBmp.SetSelectedInto(NULL);

         }
     }
         }
     }

-    return TRUE;
+    return true;

 } // end of wxOwnerDrawn::OnDrawItem
 
 #endif //wxUSE_OWNER_DRAWN
 } // end of wxOwnerDrawn::OnDrawItem
 
 #endif //wxUSE_OWNER_DRAWN