Fix install_name_tool calls in OS X "make install".

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

diff --git a/src/os2/ownerdrw.cpp b/src/os2/ownerdrw.cpp
index 40044aae7540c4c39f5fe8b7b7916c0401f260d6..a6daa630cf9e9d4185b8848f6d642a44fad495e6 100644 (file)
--- a/src/os2/ownerdrw.cpp
+++ b/src/os2/ownerdrw.cpp
@@ -1,186 +1,38 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     implementation of wxOwnerDrawn class
 // Author:      David Webster
 // Purpose:     implementation of wxOwnerDrawn class
 // Author:      David Webster

-// Modified by:
+// Modified by: Marcin Malich

 // Created:     10/12/99
 // Created:     10/12/99

-// RCS-ID:      $Id$

 // Copyright:   (c) David Webster
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Copyright:   (c) David Webster
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#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"
 

-#ifndef WX_PRECOMP
-  #include "wx/window.h"
-  #include "wx/os2/private.h"
-  #include "wx/font.h"
-  #include "wx/bitmap.h"
-  #include "wx/dcmemory.h"
-  #include "wx/menu.h"
-  #include "wx/utils.h"
-#endif
-

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

-#include "wx/menuitem.h"
+#include "wx/os2/private.h"
+#include "wx/os2/dcclient.h"

 
 

+// ----------------------------------------------------------------------------
+// constants for base class
+// ----------------------------------------------------------------------------
+
+int wxOwnerDrawnBase::ms_defaultMargin = 3;

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

-//
-// ctor
-// ----
-//
-wxOwnerDrawn::wxOwnerDrawn(
-  const wxString&                   rsStr
-, bool                              bCheckable
-, bool                              bMenuItem
-)
-: m_strName(rsStr)
-{
-    m_bCheckable   = bCheckable;
-    m_bOwnerDrawn  = FALSE;
-    m_nHeight      = 0;
-    m_nMarginWidth = ms_nLastMarginWidth;
-    if (wxNORMAL_FONT)
-        m_font = *wxNORMAL_FONT;
-} // end of wxOwnerDrawn::wxOwnerDrawn
-
-size_t wxOwnerDrawn::ms_nDefaultMarginWidth = 15;
-
-size_t wxOwnerDrawn::ms_nLastMarginWidth = ms_nDefaultMarginWidth;
-
-//
-// Drawing
-// -------
-//
-
-bool wxOwnerDrawn::OnMeasureItem(
-  size_t*                           pWidth
-, size_t*                           pHeight
-)
-{
-    wxMemoryDC                      vDC;
-
-
-    wxString                        sStr = wxStripMenuCodes(m_strName);
-
-    //
-    // If we have a valid accel string, then pad out
-    // the menu string so the menu and accel string are not
-    // placed ontop of eachother.
-    if (!m_strAccel.empty() )
-    {
-        sStr.Pad(sStr.Length()%8);
-        sStr += m_strAccel;
-    }
-    vDC.SetFont(GetFont());
-    vDC.GetTextExtent( sStr
-                      ,(long *)pWidth
-                      ,(long *)pHeight
-                     );
-    if (!m_strAccel.IsEmpty())
-    {
-        //
-        // Measure the accelerator string, and add it's 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 += GetDefaultMarginWidth() * 1.5;
-
-    //
-    // JACS: items still look too tightly packed, so adding 5 pixels.
-    //
-    (*pHeight) += 5;
-
-    //
-    // 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
 // 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 )
-        return TRUE;

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


@@ -188,7 +40,9 @@ bool wxOwnerDrawn::OnDrawItem(
     //
 
     CHARBUNDLE                      vCbnd;
     //
 
     CHARBUNDLE                      vCbnd;

-    HPS                             hPS= rDC.GetHPS();
+    wxPMDCImpl                      *impl = (wxPMDCImpl*) rDC.GetImpl();
+    HPS                             hPS= impl->GetHPS();
+    wxFont                          vFont;

     wxColour                        vColBack;
     wxColour                        vColText;
     COLORREF                        vRef;
     wxColour                        vColBack;
     wxColour                        vColText;
     COLORREF                        vRef;


@@ -196,75 +50,14 @@ bool wxOwnerDrawn::OnDrawItem(
 
     memset(&vCbnd, 0, sizeof(CHARBUNDLE));
 
 
     memset(&vCbnd, 0, sizeof(CHARBUNDLE));
 

-    //
-    // Use default font if no font set
-    //
-    if (m_font.Ok())
-    {
-        m_font.RealizeResource();
-    }
-    else
-    {
-        ::GpiSetCharSet(hPS, LCID_DEFAULT);
-    }
-
-    //
-    // Base on the status of the menu item pick the right colors
-    //
-    if (eStatus & wxODSelected)
-    {
-        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)
-    {
-        vRef = (ULONG)::WinQuerySysColor( HWND_DESKTOP
-                                         ,SYSCLR_MENU // Light gray
-                                         ,0L
-                                        );
-        vColBack.Set( GetRValue(vRef)
-                     ,GetGValue(vRef)
-                     ,GetBValue(vRef)
-                    );
-        vRef = (ULONG)::WinQuerySysColor( HWND_DESKTOP
-                                         ,SYSCLR_MENUDISABLEDTEXT // dark gray
-                                         ,0L
-                                        );
-        vColText.Set( GetRValue(vRef)
-                     ,GetGValue(vRef)
-                     ,GetBValue(vRef)
-                    );
-    }
-    else
-    {
-        //
-        // 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
-                                  ,0L
-                                 );
-        vColBack.Set( GetRValue(vRef)
-                     ,GetGValue(vRef)
-                     ,GetBValue(vRef)
-                    );
-        vRef = ::WinQuerySysColor( HWND_DESKTOP
-                                  ,SYSCLR_WINDOWTEXT // Black
-                                  ,0L
-                                 );
-        vColText.Set( GetRValue(vRef)
-                     ,GetGValue(vRef)
-                     ,GetBValue(vRef)
-                    );
-    }
+    GetFontToUse(vFont);
+    GetColourToUse(eStatus, vColText, vColBack);

 
 

+    rDC.SetFont(vFont);

     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
     vCbnd.lColor     = vColText.GetPixel();
     vCbnd.lBackColor = vColBack.GetPixel();
     ::GpiSetAttrs( hPS


@@ -285,77 +78,62 @@ bool wxOwnerDrawn::OnDrawItem(
     //
     // Determine where to draw and leave space for a check-mark.
     //
     //
     // Determine where to draw and leave space for a check-mark.
     //

-    int                             nX = rRect.x + GetMarginWidth();
+    int nX = rRect.x + GetMarginWidth();

 
     //
     // 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

     //
     //

-    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 sFullString = GetItemLabel(); // need to save the original text
+    int      nIndex;
+    size_t   nWidth;
+    size_t   nCharWidth;
+    size_t   nHeight;
+    bool     bFoundMnemonic = false;

 
     //
 
     //

-    // Deal with the tab, extracting the Accel text
+    // Deal with the mnemonic character

     //
     //

-    nIndex = sFullString.Find(sTgt.c_str());
+    nIndex = sFullString.Find(wxT("~"));

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

-        bFoundAccel = TRUE;
-        sAccel = sFullString.Mid(nIndex + 1);
-        sFullString.Remove(nIndex);
-    }
+        wxString sTmp = sFullString;

 
 

-    //
-    // Deal with the mneumonic character
-    //
-    sTgt = "~";
-    nIndex = sFullString.Find(sTgt.c_str());
-    if (nIndex != -1)
-    {
-        wxString                    sTmp = sFullString;
-
-        bFoundMneumonic = TRUE;
+        bFoundMnemonic = true;

         sTmp.Remove(nIndex);
         rDC.GetTextExtent( sTmp
         sTmp.Remove(nIndex);
         rDC.GetTextExtent( sTmp

-                          ,(long *)&nWidth
-                          ,(long *)&nHeight
+                          ,(wxCoord *)&nWidth
+                          ,(wxCoord *)&nHeight

                          );
                          );

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

         rDC.GetTextExtent( sTmp
         rDC.GetTextExtent( sTmp

-                          ,(long *)&nCharWidth
-                          ,(long *)&nHeight
+                          ,(wxCoord *)&nCharWidth
+                          ,(wxCoord *)&nHeight

                          );
                          );

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

     }
 
     //
     // Draw the main item text sans the accel text
     //
     POINTL                      vPntStart = {nX, rRect.y + 4};
     }
 
     //
     // Draw the main item text sans the accel text
     //
     POINTL                      vPntStart = {nX, rRect.y + 4};

-    ::GpiCharStringAt( rDC.GetHPS()
+    ::GpiCharStringAt( impl->GetHPS()

                       ,&vPntStart
                       ,sFullString.length()
                       ,&vPntStart
                       ,sFullString.length()

-                      ,(PCH)sFullString.c_str()
+                      ,sFullString.char_str()

                      );
                      );

-    if (bFoundMneumonic)
+    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;
         POINTL                      vPntEnd = {nX + nWidth + nCharWidth - 3, rRect.y + 2}; //CharWidth is bit wide
         //
         wxPen                       vPen;
         POINTL                      vPntEnd = {nX + nWidth + nCharWidth - 3, rRect.y + 2}; //CharWidth is bit wide


@@ -368,130 +146,7 @@ bool wxOwnerDrawn::OnDrawItem(
         ::GpiLine(hPS, &vPntEnd);
     }
 
         ::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()
-                         );
-    }
-
-    //
-    // Draw the bitmap
-    // ---------------
-    //
-    if (IsCheckable() && !m_bmpChecked.Ok())
-    {
-        if (eStatus & wxODChecked)
-        {
-            RECTL                   vRect;
-            HBITMAP                 hBmpCheck = ::WinGetSysBitmap(HWND_DESKTOP, SBMP_MENUCHECK);
-
-            vRect.xLeft   = rRect.x;
-            vRect.xRight  = rRect.x + GetMarginWidth();
-            vRect.yBottom = rRect.y;
-            vRect.yTop    = rRect.y + m_nHeight - 3;
-
-            ::WinDrawBitmap( hPS             // PS for this menuitem
-                            ,hBmpCheck       // system checkmark
-                            ,NULL            // draw the whole bitmap
-                            ,(PPOINTL)&vRect // destination -- bottom left corner of the menuitem area
-                            ,0L              // ignored
-                            ,0L              // draw a bitmap
-                            ,DBM_NORMAL      // draw normal size
-                           );
-        }
-    }
-    else
-    {
-        //
-        // For uncheckable item we use only the 'checked' bitmap
-        //
-        wxBitmap                    vBmp(GetBitmap(IsCheckable() ? ((eStatus & wxODChecked) != 0) : TRUE));
-
-        if (vBmp.Ok())
-        {
-
-            wxMemoryDC              vDCMem(&rDC);
-            wxMemoryDC*             pOldDC = (wxMemoryDC*)vBmp.GetSelectedInto();
-
-            if(pOldDC != NULL)
-            {
-                vBmp.SetSelectedInto(NULL);
-            }
-            vDCMem.SelectObject(vBmp);
-
-            //
-            // Center bitmap
-            //
-            int                     nBmpWidth = vBmp.GetWidth();
-            int                     nBmpHeight = vBmp.GetHeight();
-
-            //
-            // There should be enough space!
-            //
-            wxASSERT((nBmpWidth <= rRect.width) && (nBmpHeight <= rRect.height));
-
-            int                     nHeightDiff = m_nHeight - nBmpHeight;
-
-            rDC.Blit( rRect.x + (GetMarginWidth() - nBmpWidth) / 2
-                     ,rRect.y + nHeightDiff / 2
-                     ,nBmpWidth
-                     ,nBmpHeight
-                     ,&vDCMem
-                     ,0
-                     ,0
-                     ,wxCOPY
-                     ,TRUE
-                    );
-
-            if (eStatus & wxODSelected)
-            {
-                RECT                vRectBmp = { rRect.x
-                                                ,rRect.y
-                                                ,rRect.x + GetMarginWidth() - 1
-                                                ,rRect.y + m_nHeight - 1
-                                               };
-                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;
-
-                vLine.lColor = vColBack.GetPixel();
-                ::GpiSetAttrs( hPS
-                              ,PRIM_LINE
-                              ,LBB_COLOR
-                              ,0
-                              ,&vLine
-                             );
-                ::GpiMove(hPS, &vPnt1);
-                ::GpiBox( hPS
-                         ,DRO_OUTLINE
-                         ,&vPnt2
-                         ,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