using backward compatible calls for HitTest hack

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

diff --git a/src/os2/ownerdrw.cpp b/src/os2/ownerdrw.cpp
index dabe50894300123bf76c77a7481427909423b95e..ac75b71f40ee14cb7a7ba2ada36dd7ebd6e4c8d0 100644 (file)
--- a/src/os2/ownerdrw.cpp
+++ b/src/os2/ownerdrw.cpp
@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -41,11 +37,9 @@
 // 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;
@@ -56,6 +50,8 @@ 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;
@@ -65,15 +61,12 @@ 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
@@ -89,7 +82,7 @@ bool wxOwnerDrawn::OnMeasureItem(
                       ,(long *)pWidth
                       ,(long *)pHeight
                      );
-    if (!m_strAccel.IsEmpty())
+    if (!m_strAccel.empty())
     {
         //
         // Measure the accelerator string, and add its width to
@@ -166,22 +159,20 @@ bool wxOwnerDrawn::OnMeasureItem(
     if (*pHeight < m_nMinHeight)
         *pHeight = m_nMinHeight;
     m_nHeight = *pHeight;                // remember height for use in OnDrawItem
-    return TRUE;
+    return true;
 } // 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 )
-        return TRUE;
+        return true;
 
     //
     // Select the font and draw the text
@@ -300,15 +291,15 @@ bool wxOwnerDrawn::OnDrawItem(
     //
     // Display main text and accel text separately to align better
     //
-    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;
+    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
@@ -316,7 +307,7 @@ bool wxOwnerDrawn::OnDrawItem(
     nIndex = sFullString.Find(sTgt.c_str());
     if (nIndex != -1)
     {
-        bFoundAccel = TRUE;
+        bFoundAccel = true;
         sAccel = sFullString.Mid(nIndex + 1);
         sFullString.Remove(nIndex);
     }
@@ -328,9 +319,9 @@ bool wxOwnerDrawn::OnDrawItem(
     nIndex = sFullString.Find(sTgt.c_str());
     if (nIndex != -1)
     {
-        wxString                    sTmp = sFullString;
+        wxString sTmp = sFullString;
 
-        bFoundMnemonic = TRUE;
+        bFoundMnemonic = true;
         sTmp.Remove(nIndex);
         rDC.GetTextExtent( sTmp
                           ,(long *)&nWidth
@@ -341,7 +332,7 @@ bool wxOwnerDrawn::OnDrawItem(
                           ,(long *)&nCharWidth
                           ,(long *)&nHeight
                          );
-        sFullString.Replace(sTgt.c_str(), wxEmptyString, TRUE);
+        sFullString.Replace(sTgt.c_str(), wxEmptyString, true);
     }
 
     //
@@ -424,7 +415,7 @@ bool wxOwnerDrawn::OnDrawItem(
         //
         // 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())
         {
@@ -459,7 +450,7 @@ bool wxOwnerDrawn::OnDrawItem(
                      ,0
                      ,0
                      ,wxCOPY
-                     ,TRUE
+                     ,true
                     );
 
             if (eStatus & wxODSelected)
@@ -487,7 +478,7 @@ bool wxOwnerDrawn::OnDrawItem(
             vBmp.SetSelectedInto(NULL);
         }
     }
-    return TRUE;
+    return true;
 } // end of wxOwnerDrawn::OnDrawItem
 
 #endif //wxUSE_OWNER_DRAWN