better update rect calculation

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

diff --git a/src/msw/ownerdrw.cpp b/src/msw/ownerdrw.cpp
index 84249668ada82a0f847e3de62462ddbd0c3e3edf..cefdc0e8e376aad997567774ef52ffb2fe768001 100644 (file)
--- a/src/msw/ownerdrw.cpp
+++ b/src/msw/ownerdrw.cpp
@@ -9,25 +9,30 @@
 // Licence:     wxWindows license
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows license
 ///////////////////////////////////////////////////////////////////////////////
 

-// ============================================================================
-// headers & declarations
-// ============================================================================
+#ifdef __GNUG__
+#pragma implementation
+#endif

 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-  #pragma hdrstop
+#pragma hdrstop

 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

+  #include "wx/window.h"
+  #include "wx/msw/private.h"
+  #include "wx/font.h"
+  #include "wx/bitmap.h"
+  #include "wx/dcmemory.h"

   #include "wx/menu.h"
   #include "wx/menu.h"

+  #include "wx/utils.h"

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

-#include <windows.h>

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


@@ -35,7 +40,7 @@
 
 // ctor
 // ----
 
 // ctor
 // ----

-wxOwnerDrawn::wxOwnerDrawn(const wxTString& str, 
+wxOwnerDrawn::wxOwnerDrawn(const wxString& str, 

                            bool bCheckable, bool bMenuItem)
             : m_strName(str)
 {
                            bool bCheckable, bool bMenuItem)
             : m_strName(str)
 {


@@ -45,31 +50,31 @@ wxOwnerDrawn::wxOwnerDrawn(const wxTString& str,
   m_nMarginWidth = ms_nLastMarginWidth;
 }
 
   m_nMarginWidth = ms_nLastMarginWidth;
 }
 

-#if defined(__WXMSW__) && defined(__WIN32__)
-  uint wxOwnerDrawn::ms_nDefaultMarginWidth = GetSystemMetrics(SM_CXMENUCHECK);
+#if defined(__WXMSW__) && defined(__WIN32__) && defined(SM_CXMENUCHECK)
+  size_t wxOwnerDrawn::ms_nDefaultMarginWidth = GetSystemMetrics(SM_CXMENUCHECK);

 #else   // # what is the reasonable default?
 #else   // # what is the reasonable default?

-  uint wxOwnerDrawn::ms_nDefaultMarginWidth = 15;
+  size_t wxOwnerDrawn::ms_nDefaultMarginWidth = 15;

 #endif
 
 #endif
 

-uint wxOwnerDrawn::ms_nLastMarginWidth = ms_nDefaultMarginWidth;
+size_t wxOwnerDrawn::ms_nLastMarginWidth = ms_nDefaultMarginWidth;

 
 // drawing
 // -------
 
 // get size of the item
 
 // drawing
 // -------
 
 // get size of the item

-bool wxOwnerDrawn::OnMeasureItem(uint *pwidth, uint *pheight)
+bool wxOwnerDrawn::OnMeasureItem(size_t *pwidth, size_t *pheight)

 {
   wxMemoryDC dc;
   dc.SetFont(GetFont());
 
   // ## ugly...
 {
   wxMemoryDC dc;
   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 += _T('W'); // 'W' is typically the widest letter

 
   dc.GetTextExtent(str, (long *)pwidth, (long *)pheight);
   m_nHeight = *pheight;                // remember height for use in OnDrawItem
 
   dc.GetTextExtent(str, (long *)pwidth, (long *)pheight);
   m_nHeight = *pheight;                // remember height for use in OnDrawItem


@@ -81,7 +86,7 @@ bool wxOwnerDrawn::OnMeasureItem(uint *pwidth, uint *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)
 

-#ifdef __WIN32__
+#if defined(__WIN32__) && !defined(__SC__) && !defined(__TWIN32__)

 #define   O_DRAW_NATIVE_API     // comments below explain why I use it
 #endif
 
 #define   O_DRAW_NATIVE_API     // comments below explain why I use it
 #endif
 


@@ -128,7 +133,7 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODSt
   #ifdef  O_DRAW_NATIVE_API
     int nPrevMode = SetBkMode(hdc, TRANSPARENT);
     HBRUSH  hbr = CreateSolidBrush(colBack),
   #ifdef  O_DRAW_NATIVE_API
     int nPrevMode = SetBkMode(hdc, TRANSPARENT);
     HBRUSH  hbr = CreateSolidBrush(colBack),

-            hPrevBrush = SelectObject(hdc, hbr);
+            hPrevBrush = (HBRUSH) SelectObject(hdc, hbr);

 
     RECT rectAll = { rc.GetLeft(), rc.GetTop(), rc.GetRight(), rc.GetBottom() };
     FillRect(hdc, &rectAll, hbr);
 
     RECT rectAll = { rc.GetLeft(), rc.GetTop(), rc.GetRight(), rc.GetBottom() };
     FillRect(hdc, &rectAll, hbr);


@@ -143,9 +148,9 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODSt
       hfont = (HFONT)::GetStockObject(SYSTEM_FONT);
     }
 
       hfont = (HFONT)::GetStockObject(SYSTEM_FONT);
     }
 

-    HFONT hPrevFont = ::SelectObject(hdc, hfont);
+    HFONT hPrevFont = (HFONT) ::SelectObject(hdc, hfont);

     DrawState(hdc, NULL, NULL, 
     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) );
 


@@ -173,7 +178,9 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODSt
 
         // then draw a check mark into it
       RECT rect = { 0, 0, GetMarginWidth(), m_nHeight };
 
         // then draw a check mark into it
       RECT rect = { 0, 0, GetMarginWidth(), m_nHeight };

+#ifndef __SC__

       DrawFrameControl(hdcMem, &rect, DFC_MENU, DFCS_MENUCHECK);
       DrawFrameControl(hdcMem, &rect, DFC_MENU, DFCS_MENUCHECK);

+#endif

 
         // finally copy it to screen DC and clean up
       BitBlt(hdc, rc.x, rc.y, GetMarginWidth(), m_nHeight, 
 
         // finally copy it to screen DC and clean up
       BitBlt(hdc, rc.x, rc.y, GetMarginWidth(), m_nHeight,