derive wxSTC from wxTextAreaBase to provide wxTextCtrl-like methods (see #9114)

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

diff --git a/src/os2/ownerdrw.cpp b/src/os2/ownerdrw.cpp
index 12b76cc401358476f6d1515ded7bba67f89ae953..8f7d425b094be7972847ae7dd94ab654a4205d04 100644 (file)
--- a/src/os2/ownerdrw.cpp
+++ b/src/os2/ownerdrw.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

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

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


@@ -9,29 +9,25 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // 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"
 

+#if wxUSE_OWNER_DRAWN
+

 #ifndef WX_PRECOMP
 #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"
+    #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"
+    #include "wx/settings.h"
+    #include "wx/menuitem.h"

 #endif
 
 #endif
 

-#if wxUSE_OWNER_DRAWN
-
-#include "wx/settings.h"

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

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

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


@@ -41,21 +37,21 @@
 // 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;

-    m_bOwnerDrawn  = FALSE;
+    m_bOwnerDrawn  = false;

     m_nHeight      = 0;
     m_nMarginWidth = ms_nLastMarginWidth;
     if (wxNORMAL_FONT)
         m_font = *wxNORMAL_FONT;
 } // end of wxOwnerDrawn::wxOwnerDrawn
 
     m_nHeight      = 0;
     m_nMarginWidth = ms_nLastMarginWidth;
     if (wxNORMAL_FONT)
         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;


@@ -65,34 +61,31 @@ 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;

 
 

-    wxString                        sStr = wxStripMenuCodes(m_strName);
+    wxString  sStr = wxStripMenuCodes(m_strName);

 
     //
     // If we have a valid accel string, then pad out
 
     //
     // 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.
+    // the menu string so that the menu and accel string are not
+    // placed on top of each other.

     if (!m_strAccel.empty() )
     {
     if (!m_strAccel.empty() )
     {

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

         sStr += m_strAccel;
     }
     vDC.SetFont(GetFont());
     vDC.GetTextExtent( sStr
         sStr += m_strAccel;
     }
     vDC.SetFont(GetFont());
     vDC.GetTextExtent( sStr

-                      ,(long *)pWidth
-                      ,(long *)pHeight
+                      ,(wxCoord *)pWidth
+                      ,(wxCoord *)pHeight

                      );
                      );

-    if (!m_strAccel.IsEmpty())
+    if (!m_strAccel.empty())

     {
         //
     {
         //

-        // Measure the accelerator string, and add it's width to
+        // 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)
         // 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)


@@ -108,8 +101,8 @@ bool wxOwnerDrawn::OnMeasureItem(
     }
 
     //
     }
 
     //

-    // 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
+    // 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);
 
     //
     *pWidth = (size_t)(*pWidth + GetDefaultMarginWidth() * 1.5);
 


@@ -163,25 +156,24 @@ bool wxOwnerDrawn::OnMeasureItem(
     // Make sure that this item is at least as
     // tall as the user's system settings specify
     //
     // Make sure that this item is at least as
     // tall as the user's system settings specify
     //

-    if (*pHeight < m_nMinHeight)
-        *pHeight = m_nMinHeight;
+    const size_t heightStd = 6;                 // FIXME: get value from the system
+    if ( *pHeight < heightStd )
+      *pHeight = heightStd;

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

-    return TRUE;
+    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


@@ -189,7 +181,8 @@ bool wxOwnerDrawn::OnDrawItem(
     //
 
     CHARBUNDLE                      vCbnd;
     //
 
     CHARBUNDLE                      vCbnd;

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

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


@@ -210,16 +203,26 @@ 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");
-        vColBack.Set( (unsigned char)0
-                     ,(unsigned char)0
-                     ,(unsigned char)160
-                    ); // no dark blue in color table
-        vColText = vCol2;
+        vRef = (ULONG)::WinQuerySysColor( HWND_DESKTOP
+                                         ,SYSCLR_MENUHILITEBGND
+                                         ,0L
+                                        );
+        vColBack.Set( GetRValue(vRef)
+                     ,GetGValue(vRef)
+                     ,GetBValue(vRef)
+                    );
+        vRef = (ULONG)::WinQuerySysColor( HWND_DESKTOP
+                                         ,SYSCLR_MENUHILITE
+                                         ,0L
+                                        );
+        vColText.Set( GetRValue(vRef)
+                     ,GetGValue(vRef)
+                     ,GetBValue(vRef)
+                    );

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


@@ -246,7 +249,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)


@@ -291,72 +294,72 @@ 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;
-    int                             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
     //

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

     if (nIndex != -1)
     {
     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 = "~";
-    nIndex = sFullString.Find(sTgt.c_str());
+    sTgt = wxT("~");
+    nIndex = sFullString.Find(sTgt);

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

-        wxString                    sTmp = sFullString;
+        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[(size_t)(nIndex + 1)];
         rDC.GetTextExtent( sTmp
                          );
         sTmp = sFullString[(size_t)(nIndex + 1)];
         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


@@ -378,18 +381,18 @@ bool wxOwnerDrawn::OnDrawItem(
         size_t                      nHeight;
 
         rDC.GetTextExtent( sAccel
         size_t                      nHeight;
 
         rDC.GetTextExtent( sAccel

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

                          );
         //
         // Back off the starting position from the right edge
         //
         vPntStart.x = rRect.width - (nWidth + 7);
         vPntStart.y = rRect.y + 4;
                          );
         //
         // Back off the starting position from the right edge
         //
         vPntStart.x = rRect.width - (nWidth + 7);
         vPntStart.y = rRect.y + 4;

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

                           ,&vPntStart
                           ,sAccel.length()
                           ,&vPntStart
                           ,sAccel.length()

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

                          );
     }
 
                          );
     }
 


@@ -424,7 +427,7 @@ 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())
         {


@@ -459,7 +462,7 @@ bool wxOwnerDrawn::OnDrawItem(
                      ,0
                      ,0
                      ,wxCOPY
                      ,0
                      ,0
                      ,wxCOPY

-                     ,TRUE
+                     ,true

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


@@ -487,7 +490,7 @@ bool wxOwnerDrawn::OnDrawItem(
             vBmp.SetSelectedInto(NULL);
         }
     }
             vBmp.SetSelectedInto(NULL);
         }
     }

-    return TRUE;
+    return true;

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