wxControl and wxChoice derive from the base classes under wxGTK too now

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

diff --git a/src/msw/ownerdrw.cpp b/src/msw/ownerdrw.cpp
index be1ce8d47efeb67664b7a38f20c57a45f2166524..5cc44d6be0f82f3ee403b04dba3fc0e3df1236f7 100644 (file)
--- a/src/msw/ownerdrw.cpp
+++ b/src/msw/ownerdrw.cpp
@@ -68,15 +68,19 @@ bool wxOwnerDrawn::OnMeasureItem(size_t *pwidth, size_t *pheight)
   dc.SetFont(GetFont());
 
   // ## ugly...
   dc.SetFont(GetFont());
 
   // ## ugly...

-  char *szStripped = new char[m_strName.Len()];
-  wxStripMenuCodes((char *)m_strName.c_str(), szStripped);
+  wxChar *szStripped = new wxChar[m_strName.Len()];
+  wxStripMenuCodes((wxChar *)m_strName.c_str(), szStripped);

   wxString str = szStripped;
   delete [] szStripped;
 
   // # without this menu items look too tightly packed (at least under Windows)
   wxString str = szStripped;
   delete [] szStripped;
 
   // # without this menu items look too tightly packed (at least under Windows)

-  str += 'W'; // 'W' is typically the widest letter
+  str += wxT('W'); // 'W' is typically the widest letter

 
   dc.GetTextExtent(str, (long *)pwidth, (long *)pheight);
 
   dc.GetTextExtent(str, (long *)pwidth, (long *)pheight);

+
+  // JACS: items still look too tightly packed, so adding 2 pixels.
+  (*pheight) = (*pheight) + 2;
+

   m_nHeight = *pheight;                // remember height for use in OnDrawItem
 
   return TRUE;
   m_nHeight = *pheight;                // remember height for use in OnDrawItem
 
   return TRUE;


@@ -86,6 +90,10 @@ bool wxOwnerDrawn::OnMeasureItem(size_t *pwidth, size_t *pheight)
 // Win32 GDI functions and not wxWindows ones. Might help to whoever decides to
 // port this code to X. (VZ)
 
 // Win32 GDI functions and not wxWindows ones. Might help to whoever decides to
 // port this code to X. (VZ)
 

+// JACS: TODO. Why does a disabled but highlighted item still
+// get drawn embossed? How can we tell DrawState that we don't want the
+// embossing?
+

 #if defined(__WIN32__) && !defined(__SC__) && !defined(__TWIN32__)
 #define   O_DRAW_NATIVE_API     // comments below explain why I use it
 #endif
 #if defined(__WIN32__) && !defined(__SC__) && !defined(__TWIN32__)
 #define   O_DRAW_NATIVE_API     // comments below explain why I use it
 #endif


@@ -150,7 +158,7 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODSt
 
     HFONT hPrevFont = (HFONT) ::SelectObject(hdc, hfont);
     DrawState(hdc, NULL, NULL, 
 
     HFONT hPrevFont = (HFONT) ::SelectObject(hdc, hfont);
     DrawState(hdc, NULL, NULL, 

-              (LPARAM)(const char *)m_strName, m_strName.Length(), 
+              (LPARAM)(const wxChar *)m_strName, m_strName.Length(), 

               x, rc.y, rc.GetWidth(), rc.GetHeight(),
               DST_PREFIXTEXT | ( st & wxODDisabled ? DSS_DISABLED : 0) );
 
               x, rc.y, rc.GetWidth(), rc.GetHeight(),
               DST_PREFIXTEXT | ( st & wxODDisabled ? DSS_DISABLED : 0) );
 


@@ -206,10 +214,11 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODSt
       // there should be enough place!
       wxASSERT((nBmpWidth <= rc.GetWidth()) && (nBmpHeight <= rc.GetHeight()));
 
       // there should be enough place!
       wxASSERT((nBmpWidth <= rc.GetWidth()) && (nBmpHeight <= rc.GetHeight()));
 

+      //MT: blit with mask enabled.

       dc.Blit(rc.x + (GetMarginWidth() - nBmpWidth) / 2, 
               rc.y + (m_nHeight - nBmpHeight) /2, 
               nBmpWidth, nBmpHeight, 
       dc.Blit(rc.x + (GetMarginWidth() - nBmpWidth) / 2, 
               rc.y + (m_nHeight - nBmpHeight) /2, 
               nBmpWidth, nBmpHeight, 

-              &dcMem, 0, 0, wxCOPY);
+              &dcMem, 0, 0, wxCOPY,true);

 
       if ( st & wxODSelected ) {
         #ifdef  O_DRAW_NATIVE_API
 
       if ( st & wxODSelected ) {
         #ifdef  O_DRAW_NATIVE_API