Fixed usage of uninitialized variable.

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

diff --git a/src/msw/ownerdrw.cpp b/src/msw/ownerdrw.cpp
index f3bafeae3c39a169ae053d96d4352132d0ccaf31..624dd00f4e00673a2a3bb2261fc86efbd404ac30 100644 (file)
--- a/src/msw/ownerdrw.cpp
+++ b/src/msw/ownerdrw.cpp
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation
 #endif
 
 #pragma implementation
 #endif
 


@@ -35,6 +35,7 @@
 #include "wx/ownerdrw.h"
 #include "wx/menuitem.h"
 #include "wx/fontutil.h"
 #include "wx/ownerdrw.h"
 #include "wx/menuitem.h"
 #include "wx/fontutil.h"

+#include "wx/module.h"

 
 #if wxUSE_OWNER_DRAWN
 
 
 #if wxUSE_OWNER_DRAWN
 


@@ -49,7 +50,7 @@ public:
 #if defined(__WXMSW__) && defined(__WIN32__) && defined(SM_CXMENUCHECK)
         NONCLIENTMETRICS nm;
         nm.cbSize = sizeof(NONCLIENTMETRICS);
 #if defined(__WXMSW__) && defined(__WIN32__) && defined(SM_CXMENUCHECK)
         NONCLIENTMETRICS nm;
         nm.cbSize = sizeof(NONCLIENTMETRICS);

-        SystemParametersInfo(SPI_GETNONCLIENTMETRICS,0,&nm,0); 
+        SystemParametersInfo(SPI_GETNONCLIENTMETRICS,0,&nm,0);

 
         ms_systemMenuButtonWidth = nm.iMenuHeight;
         ms_systemMenuHeight = nm.iMenuHeight;
 
         ms_systemMenuButtonWidth = nm.iMenuHeight;
         ms_systemMenuHeight = nm.iMenuHeight;


@@ -99,9 +100,9 @@ wxOwnerDrawn::wxOwnerDrawn(const wxString& str,
     // get the default menu height and font from the system
     NONCLIENTMETRICS nm;
     nm.cbSize = sizeof (NONCLIENTMETRICS);
     // get the default menu height and font from the system
     NONCLIENTMETRICS nm;
     nm.cbSize = sizeof (NONCLIENTMETRICS);

-    SystemParametersInfo (SPI_GETNONCLIENTMETRICS,0,&nm,0); 
+    SystemParametersInfo (SPI_GETNONCLIENTMETRICS,0,&nm,0);

     m_nMinHeight = nm.iMenuHeight;
     m_nMinHeight = nm.iMenuHeight;

-    
+

     // nm.iMenuWidth is the system default for the width of
     // menu icons and checkmarks
     if (ms_nDefaultMarginWidth == 0)
     // nm.iMenuWidth is the system default for the width of
     // menu icons and checkmarks
     if (ms_nDefaultMarginWidth == 0)


@@ -124,12 +125,14 @@ wxOwnerDrawn::wxOwnerDrawn(const wxString& str,
     m_nHeight      = 0;
     m_nMarginWidth = ms_nLastMarginWidth;
     m_nMinHeight   = wxMSWSystemMenuFontModule::ms_systemMenuHeight;
     m_nHeight      = 0;
     m_nMarginWidth = ms_nLastMarginWidth;
     m_nMinHeight   = wxMSWSystemMenuFontModule::ms_systemMenuHeight;

+
+    m_bmpDisabled = wxNullBitmap;

 }
 
 
 // these items will be set during the first invocation of the c'tor,
 // because the values will be determined by checking the system settings,
 }
 
 
 // these items will be set during the first invocation of the c'tor,
 // because the values will be determined by checking the system settings,

-// which is a chunk of code  
+// which is a chunk of code

 size_t wxOwnerDrawn::ms_nDefaultMarginWidth = 0;
 size_t wxOwnerDrawn::ms_nLastMarginWidth = 0;
 
 size_t wxOwnerDrawn::ms_nDefaultMarginWidth = 0;
 size_t wxOwnerDrawn::ms_nLastMarginWidth = 0;
 


@@ -160,21 +163,9 @@ bool wxOwnerDrawn::OnMeasureItem(size_t *pwidth, size_t *pheight)
 
   dc.GetTextExtent(str, (long *)pwidth, (long *)pheight);
 
 
   dc.GetTextExtent(str, (long *)pwidth, (long *)pheight);
 

-  if (!m_strAccel.IsEmpty())
-  {
-      // measure the accelerator string, and add it's 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)
-
-      int accel_width, accel_height;
-      dc.GetTextExtent(m_strAccel, &accel_width, &accel_height);
-      *pwidth += accel_width;
-  }
-

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

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


@@ -195,21 +186,16 @@ bool wxOwnerDrawn::OnMeasureItem(size_t *pwidth, size_t *pheight)
       // Does BMP encroach on default check menu position?
       size_t adjustedWidth = m_bmpChecked.GetWidth() +
                              (wxSystemSettings::GetMetric(wxSYS_EDGE_X) * 2);
       // Does BMP encroach on default check menu position?
       size_t adjustedWidth = m_bmpChecked.GetWidth() +
                              (wxSystemSettings::GetMetric(wxSYS_EDGE_X) * 2);

-//      if (ms_nDefaultMarginWidth < adjustedWidth)
-//          *pwidth += adjustedWidth - ms_nDefaultMarginWidth;

 
       // Do we need to widen margin to fit BMP?
       if ((size_t)GetMarginWidth() != adjustedWidth)
           SetMarginWidth(adjustedWidth);
 
       // Do we need to widen margin to fit BMP?
       if ((size_t)GetMarginWidth() != adjustedWidth)
           SetMarginWidth(adjustedWidth);

-        
-      // add the size of the bitmap to our total size...
-      *pwidth += GetMarginWidth(); 

   }
 
   // add the size of the bitmap to our total size - even if we don't have
   // a bitmap we leave room for one...
   *pwidth += GetMarginWidth();
   }
 
   // add the size of the bitmap to our total size - even if we don't have
   // a bitmap we leave room for one...
   *pwidth += GetMarginWidth();

-  
+

   // make sure that this item is at least as
   // tall as the user's system settings specify
   if (*pheight < m_nMinHeight)
   // make sure that this item is at least as
   // tall as the user's system settings specify
   if (*pheight < m_nMinHeight)


@@ -224,11 +210,7 @@ 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(__SYMANTEC__) && !defined(__TWIN32__)
+#if defined(__WIN32__) && !defined(__SYMANTEC__)

 #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
 


@@ -246,6 +228,18 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc,
   #define   ToRGB(col)  PALETTERGB(col.Red(), col.Green(), col.Blue())
   #define   UnRGB(col)  GetRValue(col), GetGValue(col), GetBValue(col)
 
   #define   ToRGB(col)  PALETTERGB(col.Red(), col.Green(), col.Blue())
   #define   UnRGB(col)  GetRValue(col), GetGValue(col), GetBValue(col)
 

+
+  // this flag determines whether or not an edge will
+  // be drawn around the bitmap. In most "windows classic"
+  // applications, a 1-pixel highlight edge is drawn around
+  // the bitmap of an item when it is selected.  However,
+  // with the new "luna" theme, no edge is drawn around
+  // the bitmap because the background is white (this applies
+  // only to "non-XP style" menus w/ bitmaps --
+  // see IE 6 menus for an example)
+
+  bool draw_bitmap_edge = true;
+

   // set the colors
   // --------------
   DWORD colBack, colText;
   // set the colors
   // --------------
   DWORD colBack, colText;


@@ -266,6 +260,20 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc,
     colText = m_colText.Ok() ? ToRGB(m_colText) : GetSysColor(COLOR_WINDOWTEXT);
   }
 
     colText = m_colText.Ok() ? ToRGB(m_colText) : GetSysColor(COLOR_WINDOWTEXT);
   }
 

+
+  // don't draw an edge around the bitmap, if background is white ...
+  DWORD menu_bg_color = GetSysColor(COLOR_MENU);
+  if (    ( GetRValue( menu_bg_color ) >= 0xf0 &&
+            GetGValue( menu_bg_color ) >= 0xf0 &&
+            GetBValue( menu_bg_color ) >= 0xf0 )
+       // ... or if the menu item is disabled
+       || ( st & wxODDisabled )
+    )
+  {
+      draw_bitmap_edge = false;
+  }
+
+

   #ifdef  O_DRAW_NATIVE_API
     #define  hdc           (HDC)dc.GetHDC()
     COLORREF colOldText = ::SetTextColor(hdc, colText),
   #ifdef  O_DRAW_NATIVE_API
     #define  hdc           (HDC)dc.GetHDC()
     COLORREF colOldText = ::SetTextColor(hdc, colText),


@@ -292,7 +300,7 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc,
 
     RECT rectFill = { rc.GetLeft(), rc.GetTop(), rc.GetRight()+1, rc.GetBottom() };
 
 
     RECT rectFill = { rc.GetLeft(), rc.GetTop(), rc.GetRight()+1, rc.GetBottom() };
 

-    if ( st & wxODSelected && m_bmpChecked.Ok()) {
+    if ( st & wxODSelected && m_bmpChecked.Ok() && draw_bitmap_edge) {

         // only draw the highlight under the text, not under
         // the bitmap or checkmark; leave a 1-pixel gap.
         rectFill.left = GetMarginWidth() + 1;
         // only draw the highlight under the text, not under
         // the bitmap or checkmark; leave a 1-pixel gap.
         rectFill.left = GetMarginWidth() + 1;


@@ -323,6 +331,7 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc,
                 DST_PREFIXTEXT |
                 (((st & wxODDisabled) && !(st & wxODSelected)) ? DSS_DISABLED : 0));
 
                 DST_PREFIXTEXT |
                 (((st & wxODDisabled) && !(st & wxODSelected)) ? DSS_DISABLED : 0));
 

+    /* Right alignment does not work with DSS_DISABLED (Windows98) - why?

     if ( !m_strAccel.empty() )
     {
         // right align accel string with right edge of menu ( offset by the margin width )
     if ( !m_strAccel.empty() )
     {
         // right align accel string with right edge of menu ( offset by the margin width )


@@ -335,6 +344,22 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc,
                     (((st & wxODDisabled) && !(st & wxODSelected)) ? DSS_DISABLED : 0));
         ::SetTextAlign(hdc, TA_LEFT);
     }
                     (((st & wxODDisabled) && !(st & wxODSelected)) ? DSS_DISABLED : 0));
         ::SetTextAlign(hdc, TA_LEFT);
     }

+    */
+
+    // ::SetTextAlign(hdc, TA_RIGHT) doesn't work with DSS_DISABLED or DSS_MONO as last parameter 
+    // in DrawState() (at least with Windows98). So we have to take care of right alignment ourselves.
+    if ( !m_strAccel.empty() )
+    {
+        int accel_width, accel_height;
+        dc.GetTextExtent(m_strAccel, &accel_width, &accel_height);
+        // right align accel string with right edge of menu ( offset by the margin width )
+        ::DrawState(hdc, NULL, NULL,
+                (LPARAM)m_strAccel.c_str(), m_strAccel.length(),
+                rc.GetWidth()-GetMarginWidth()-accel_width, rc.y+(int) ((rc.GetHeight()-sizeRect.cy)/2.0),
+                rc.GetWidth()-GetMarginWidth()-accel_width, sizeRect.cy,
+                DST_TEXT |
+                (((st & wxODDisabled) && !(st & wxODSelected)) ? DSS_DISABLED : 0));
+    }

 
     (void)SelectObject(hdc, hPrevBrush);
     (void)SelectObject(hdc, hPrevFont);
 
     (void)SelectObject(hdc, hPrevBrush);
     (void)SelectObject(hdc, hPrevFont);


@@ -380,8 +405,20 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc,
     }
   }
   else {
     }
   }
   else {

-    // for uncheckable item we use only the 'checked' bitmap
-    wxBitmap bmp(GetBitmap(IsCheckable() ? ((st & wxODChecked) != 0) : TRUE));
+    wxBitmap bmp;
+
+    if ( st & wxODDisabled )
+    {
+        bmp = GetDisabledBitmap();
+    }
+
+    if ( !bmp.Ok() )
+    {
+        // for not checkable bitmaps we should always use unchecked one because
+        // their checked bitmap is not set
+        bmp = GetBitmap(!IsCheckable() || (st & wxODChecked));
+    }
+

     if ( bmp.Ok() ) {
       wxMemoryDC dcMem(&dc);
       dcMem.SelectObject(bmp);
     if ( bmp.Ok() ) {
       wxMemoryDC dcMem(&dc);
       dcMem.SelectObject(bmp);


@@ -399,13 +436,13 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc,
               nBmpWidth, nBmpHeight,
               &dcMem, 0, 0, wxCOPY, TRUE /* use mask */);
 
               nBmpWidth, nBmpHeight,
               &dcMem, 0, 0, wxCOPY, TRUE /* use mask */);
 

-      if ( st & wxODSelected ) {
+      if ( st & wxODSelected && draw_bitmap_edge ) {

         #ifdef  O_DRAW_NATIVE_API
           RECT rectBmp = { rc.GetLeft(), rc.GetTop(),
                            rc.GetLeft() + GetMarginWidth(),
                            rc.GetTop() + m_nHeight-1 };
           SetBkColor(hdc, colBack);
         #ifdef  O_DRAW_NATIVE_API
           RECT rectBmp = { rc.GetLeft(), rc.GetTop(),
                            rc.GetLeft() + GetMarginWidth(),
                            rc.GetTop() + m_nHeight-1 };
           SetBkColor(hdc, colBack);

-          DrawEdge(hdc, &rectBmp, EDGE_RAISED, BF_SOFT | BF_RECT);
+          DrawEdge(hdc, &rectBmp, BDR_RAISEDOUTER, BF_SOFT | BF_RECT);

         #else
           int x1, y1, x2, y2;
           x1 = rc.x;
         #else
           int x1, y1, x2, y2;
           x1 = rc.x;