Get the stock label when stock ID is used with empty label in Create()

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

diff --git a/src/msw/ownerdrw.cpp b/src/msw/ownerdrw.cpp
index d6b81514902be684a61409f177873d95809d4baf..785db7f39e67c17954ef9a962c54c1f6a5f7904e 100644 (file)
--- a/src/msw/ownerdrw.cpp
+++ b/src/msw/ownerdrw.cpp
@@ -6,7 +6,7 @@
 // Created:     13.11.97
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Created:     13.11.97
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 ///////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)


@@ -121,7 +121,7 @@ wxOwnerDrawn::wxOwnerDrawn(const wxString& str,
     }
 
     m_bCheckable   = bCheckable;
     }
 
     m_bCheckable   = bCheckable;

-    m_bOwnerDrawn  = FALSE;
+    m_bOwnerDrawn  = false;

     m_nHeight      = 0;
     m_nMarginWidth = ms_nLastMarginWidth;
     m_nMinHeight   = wxMSWSystemMenuFontModule::ms_systemMenuHeight;
     m_nHeight      = 0;
     m_nMarginWidth = ms_nLastMarginWidth;
     m_nMinHeight   = wxMSWSystemMenuFontModule::ms_systemMenuHeight;


@@ -192,7 +192,7 @@ bool wxOwnerDrawn::OnMeasureItem(size_t *pwidth, size_t *pheight)
   // remember height for use in OnDrawItem
   m_nHeight = *pheight;
 
   // remember height for use in OnDrawItem
   m_nHeight = *pheight;
 

-  return TRUE;
+  return true;

 }
 
 // draw the item
 }
 
 // draw the item


@@ -203,7 +203,7 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc,
 {
   // we do nothing on focus change
   if ( act == wxODFocusChanged )
 {
   // we do nothing on focus change
   if ( act == wxODFocusChanged )

-    return TRUE;
+    return true;

 
 
   // this flag determines whether or not an edge will
 
 
   // this flag determines whether or not an edge will


@@ -386,7 +386,7 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc,
       dc.Blit(rc.x + (margin - nBmpWidth) / 2,
               rc.y + heightDiff / 2,
               nBmpWidth, nBmpHeight,
       dc.Blit(rc.x + (margin - nBmpWidth) / 2,
               rc.y + heightDiff / 2,
               nBmpWidth, nBmpHeight,

-              &dcMem, 0, 0, wxCOPY, TRUE /* use mask */);
+              &dcMem, 0, 0, wxCOPY, true /* use mask */);

 
       if ( st & wxODSelected && draw_bitmap_edge ) {
           RECT rectBmp = { rc.GetLeft(), rc.GetTop(),
 
       if ( st & wxODSelected && draw_bitmap_edge ) {
           RECT rectBmp = { rc.GetLeft(), rc.GetTop(),


@@ -402,7 +402,7 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc,
   ::SetTextColor(hdc, colOldText);
   ::SetBkColor(hdc, colOldBack);
 
   ::SetTextColor(hdc, colOldText);
   ::SetBkColor(hdc, colOldBack);
 

-  return TRUE;
+  return true;

 }
 
 
 }