A few tweaks and cleanups

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

diff --git a/src/os2/ownerdrw.cpp b/src/os2/ownerdrw.cpp
index a270099a340e4c69bf4ffad246fcca9b6aac1fb2..5e156318e31661d7b84a74f729b0425ff590424f 100644 (file)
--- a/src/os2/ownerdrw.cpp
+++ b/src/os2/ownerdrw.cpp
@@ -75,17 +75,6 @@ bool wxOwnerDrawn::OnMeasureItem(
 
     wxString                        sStr = wxStripMenuCodes(m_strName);
 
 
     wxString                        sStr = wxStripMenuCodes(m_strName);
 

-    wxString                        sTgt = "\t";
-    size_t                          nIndex;
-
-    nIndex = sStr.Find(sTgt.c_str());
-    if (nIndex != -1)
-        sStr.Remove(nIndex);
-    sTgt = "~";
-    nIndex = sStr.Find(sTgt.c_str());
-    if (nIndex != -1)
-        sStr.Replace(sTgt.c_str(), "", TRUE);
-

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


@@ -120,7 +109,9 @@ bool wxOwnerDrawn::OnDrawItem(
     wxColour                        vColBack;
     wxColour                        vColText;
     COLORREF                        vRef;
     wxColour                        vColBack;
     wxColour                        vColText;
     COLORREF                        vRef;

-    char                            zMsg[128];
+    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


@@ -133,17 +124,18 @@ bool wxOwnerDrawn::OnDrawItem(
     {
         ::GpiSetCharSet(hPS, LCID_DEFAULT);
     }
     {
         ::GpiSetCharSet(hPS, LCID_DEFAULT);
     }

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

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

-        vRef = (ULONG)::WinQuerySysColor( HWND_DESKTOP
-                                         ,SYSCLR_MENUHILITEBGND // Light gray
-                                         ,0L
-                                        );
-        vColBack.Set( GetRValue(vRef)
-                     ,GetGValue(vRef)
-                     ,GetBValue(vRef)
-                    );
-        vColText = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_MENUTEXT);
+        wxColour                        vCol2("WHITE");
+        vColBack.Set( (unsigned char)0
+                     ,(unsigned char)0
+                     ,(unsigned char)160
+                    ); // no dark blue in color table
+        vColText = vCol2;

     }
     else if (eStatus & wxODDisabled)
     {
     }
     else if (eStatus & wxODDisabled)
     {


@@ -186,24 +178,26 @@ bool wxOwnerDrawn::OnDrawItem(
                      ,GetBValue(vRef)
                     );
     }
                      ,GetBValue(vRef)
                     );
     }

-    vRef = vColBack.GetPixel();
-    vCbnd.lBackColor = (LONG)vRef;
-
-    vRef = vColText.GetPixel();
-    vCbnd.lColor = (LONG)vRef;
-
-        sprintf(zMsg, "Color: %ld", vRef);
-        wxMessageBox( "wxWindows Menu Sample"
-                     ,zMsg
-                     ,wxICON_INFORMATION
-                    );

 
 

+    rDC.SetTextBackground(vColBack);
+    rDC.SetTextForeground(vColText);
+    rDC.SetBackgroundMode(wxTRANSPARENT);
+    vCbnd.lColor     = vColText.GetPixel();
+    vCbnd.lBackColor = vColBack.GetPixel();

     ::GpiSetAttrs( hPS
                   ,PRIM_CHAR
     ::GpiSetAttrs( hPS
                   ,PRIM_CHAR

-                  ,CBB_COLOR | CBB_BACK_COLOR
+                  ,CBB_BACK_COLOR | CBB_COLOR

                   ,0
                   ,&vCbnd
                  );
                   ,0
                   ,&vCbnd
                  );

+    ::GpiSetBackMix( hPS
+                    ,BM_LEAVEALONE
+                   );
+
+    //
+    // Paint the background
+    //
+    ::WinFillRect(hPS, &vRect, vColBack.GetPixel());

 
     //
     // Determine where to draw and leave space for a check-mark.
 
     //
     // Determine where to draw and leave space for a check-mark.


@@ -215,34 +209,106 @@ bool wxOwnerDrawn::OnDrawItem(
     // drawing methods like ::DrawState that can cleanly handle accel
     // pneumonics and deal, automatically, with various states, so we have
     // to handle them ourselves. Notice Win32 can't handle \t in ownerdrawn
     // drawing methods like ::DrawState that can cleanly handle accel
     // pneumonics and deal, automatically, with various states, so we have
     // to handle them ourselves. Notice Win32 can't handle \t in ownerdrawn

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

 
     //
 
     //

-    // Manually replace the tab with spaces
+    // Display main text and accel text separately to allign better

     //
     wxString                        sTgt = "\t";
     //
     wxString                        sTgt = "\t";

-    wxString                        sReplace = "           ";
+    wxString                        sFullString = m_strName; // need to save the original text
+    wxString                        sAccel;

     size_t                          nIndex;
     size_t                          nIndex;

+    size_t                          nWidth;
+    size_t                          nCharWidth;
+    size_t                          nHeight;
+    bool                            bFoundMneumonic = FALSE;
+    bool                            bFoundAccel = FALSE;

 
 

-    nIndex = m_strName.Find(sTgt.c_str());
+    //
+    // Deal with the tab, extracting the Accel text
+    //
+    nIndex = sFullString.Find(sTgt.c_str());

     if (nIndex != -1)
     if (nIndex != -1)

-        m_strName.Replace(sTgt.c_str(), sReplace.c_str(), TRUE);
+    {
+        bFoundAccel = TRUE;
+        sAccel = sFullString.Mid(nIndex + 1);
+        sFullString.Remove(nIndex);
+    }
+
+    //
+    // Deal with the mneumonic character
+    //

     sTgt = "~";
     sTgt = "~";

-    nIndex = m_strName.Find(sTgt.c_str());
+    nIndex = sFullString.Find(sTgt.c_str());

     if (nIndex != -1)
     if (nIndex != -1)

-        m_strName.Replace(sTgt.c_str(), "", TRUE);
-
-    POINTL                          vPoint;
+    {
+        wxString                    sTmp = sFullString;
+
+        bFoundMneumonic = TRUE;
+        sTmp.Remove(nIndex);
+        rDC.GetTextExtent( sTmp
+                          ,(long *)&nWidth
+                          ,(long *)&nHeight
+                         );
+        sTmp = sFullString[nIndex + 1];
+        rDC.GetTextExtent( sTmp
+                          ,(long *)&nCharWidth
+                          ,(long *)&nHeight
+                         );
+        sFullString.Replace(sTgt.c_str(), "", TRUE);
+    }

 
 

-    vPoint.x = nX;
-    vPoint.y = rRect.y + 4;
-    ::GpiCharStringAt( hPS
-                      ,&vPoint
-                      ,m_strName.length()
-                      ,(PCH)m_strName.c_str()
+    //
+    // Draw the main item text sans the accel text
+    //
+    POINTL                      vPntStart = {nX, rRect.y + 4};
+    ::GpiCharStringAt( rDC.GetHPS()
+                      ,&vPntStart
+                      ,sFullString.length()
+                      ,(PCH)sFullString.c_str()

                      );
                      );

+    if (bFoundMneumonic)
+    {
+        //
+        // Underline the mneumonic -- still won't work, but at least it "looks" right
+        //
+        wxPen                       vPen;
+        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);
+        ::GpiLine(hPS, &vPntEnd);
+    }
+
+    //
+    // Now draw the accel text
+    //
+    if (bFoundAccel)
+    {
+        size_t                      nWidth;
+        size_t                      nHeight;
+
+        rDC.GetTextExtent( sAccel
+                          ,(long *)&nWidth
+                          ,(long *)&nHeight
+                         );
+        //
+        // Back off the starting position from the right edge
+        //
+        vPntStart.x = rRect.width - (nWidth + 7);
+        vPntStart.y = rRect.y + 4;
+        ::GpiCharStringAt( rDC.GetHPS()
+                          ,&vPntStart
+                          ,sAccel.length()
+                          ,(PCH)sAccel.c_str()
+                         );
+    }

 
 

-#if 0

     //
     // Draw the bitmap
     // ---------------
     //
     // Draw the bitmap
     // ---------------


@@ -257,7 +323,7 @@ bool wxOwnerDrawn::OnDrawItem(
             vRect.xLeft   = rRect.x;
             vRect.xRight  = rRect.x + GetMarginWidth();
             vRect.yBottom = rRect.y;
             vRect.xLeft   = rRect.x;
             vRect.xRight  = rRect.x + GetMarginWidth();
             vRect.yBottom = rRect.y;

-            vRect.yTop    = rRect.y + m_nHeight;
+            vRect.yTop    = rRect.y + m_nHeight - 3;

 
             ::WinDrawBitmap( hPS             // PS for this menuitem
                             ,hBmpCheck       // system checkmark
 
             ::WinDrawBitmap( hPS             // PS for this menuitem
                             ,hBmpCheck       // system checkmark


@@ -278,8 +344,14 @@ bool wxOwnerDrawn::OnDrawItem(
 
         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);
 
             //


@@ -314,25 +386,29 @@ bool wxOwnerDrawn::OnDrawItem(
                                                 ,rRect.x + GetMarginWidth()
                                                 ,rRect.y + m_nHeight
                                                };
                                                 ,rRect.x + GetMarginWidth()
                                                 ,rRect.y + m_nHeight
                                                };

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

                 LINEBUNDLE          vLine;
 
                 LINEBUNDLE          vLine;
 

-                vLine.lColor = lColBack;
+                vLine.lColor = vColBack.GetPixel();

                 ::GpiSetAttrs( hPS
                               ,PRIM_LINE
                               ,LBB_COLOR
                               ,0
                               ,&vLine
                              );
                 ::GpiSetAttrs( hPS
                               ,PRIM_LINE
                               ,LBB_COLOR
                               ,0
                               ,&vLine
                              );

+                ::GpiMove(hPS, &vPnt1);

                 ::GpiBox( hPS
                          ,DRO_OUTLINE
                 ::GpiBox( hPS
                          ,DRO_OUTLINE

-                         ,(PPOINTL)&vRectBmp
+                         ,&vPnt2

                          ,0L
                          ,0L
                         );
             }
                          ,0L
                          ,0L
                         );
             }

+            vBmp.SetSelectedInto(NULL);

         }
     }
         }
     }

-#endif

     return TRUE;
 } // end of wxOwnerDrawn::OnDrawItem
 
     return TRUE;
 } // end of wxOwnerDrawn::OnDrawItem