compilation fix

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

diff --git a/src/msw/ownerdrw.cpp b/src/msw/ownerdrw.cpp
index 3c5e577ed0fbb37a904769a135cc51f7a89ad677..632dd8f6600ca21e25fa0d997a67be062282c0c6 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:     wxWindows license
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -29,6 +29,7 @@
   #include "wx/dcmemory.h"
   #include "wx/menu.h"
   #include "wx/utils.h"
   #include "wx/dcmemory.h"
   #include "wx/menu.h"
   #include "wx/utils.h"

+  #include "wx/module.h"

 #endif
 
 #include "wx/settings.h"
 #endif
 
 #include "wx/settings.h"


@@ -38,6 +39,53 @@
 
 #if wxUSE_OWNER_DRAWN
 
 
 #if wxUSE_OWNER_DRAWN
 

+class wxMSWSystemMenuFontModule : public wxModule
+{
+public:
+
+    virtual bool OnInit()
+    {
+        ms_systemMenuFont = new wxFont;
+
+#if defined(__WXMSW__) && defined(__WIN32__) && defined(SM_CXMENUCHECK)
+        NONCLIENTMETRICS nm;
+        nm.cbSize = sizeof(NONCLIENTMETRICS);
+        SystemParametersInfo(SPI_GETNONCLIENTMETRICS,0,&nm,0); 
+
+        ms_systemMenuButtonWidth = nm.iMenuHeight;
+        ms_systemMenuHeight = nm.iMenuHeight;
+
+        // create menu font
+        wxNativeFontInfo info;
+        memcpy(&info.lf, &nm.lfMenuFont, sizeof(LOGFONT));
+        ms_systemMenuFont->Create(info);
+#endif
+
+        return true;
+    }
+
+    virtual void OnExit()
+    {
+        delete ms_systemMenuFont;
+        ms_systemMenuFont = NULL;
+    }
+
+    static wxFont* ms_systemMenuFont;
+    static int ms_systemMenuButtonWidth;   // windows clean install default
+    static int ms_systemMenuHeight;        // windows clean install default
+private:
+    DECLARE_DYNAMIC_CLASS(wxMSWSystemMenuFontModule)
+};
+
+// these static variables are by the wxMSWSystemMenuFontModule object
+// and reflect the system settings returned by the Win32 API's
+// SystemParametersInfo() call.
+
+wxFont* wxMSWSystemMenuFontModule::ms_systemMenuFont = NULL;
+int wxMSWSystemMenuFontModule::ms_systemMenuButtonWidth = 18;   // windows clean install default
+int wxMSWSystemMenuFontModule::ms_systemMenuHeight = 18;        // windows clean install default
+
+IMPLEMENT_DYNAMIC_CLASS(wxMSWSystemMenuFontModule, wxModule)

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


@@ -46,10 +94,9 @@
 // ctor
 // ----
 wxOwnerDrawn::wxOwnerDrawn(const wxString& str,
 // ctor
 // ----
 wxOwnerDrawn::wxOwnerDrawn(const wxString& str,

-                           bool bCheckable, bool WXUNUSED(bMenuItem))
+                           bool bCheckable, bool bMenuItem)

             : m_strName(str)
 {
             : m_strName(str)
 {

-#if defined(__WXMSW__) && defined(__WIN32__) && defined(SM_CXMENUCHECK)

     // 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);


@@ -60,30 +107,24 @@ wxOwnerDrawn::wxOwnerDrawn(const wxString& str,
     // menu icons and checkmarks
     if (ms_nDefaultMarginWidth == 0)
     {
     // menu icons and checkmarks
     if (ms_nDefaultMarginWidth == 0)
     {

-       ms_nDefaultMarginWidth = nm.iMenuWidth;
-       ms_nLastMarginWidth = nm.iMenuWidth;
+       ms_nDefaultMarginWidth = wxMSWSystemMenuFontModule::ms_systemMenuButtonWidth;
+       ms_nLastMarginWidth = wxMSWSystemMenuFontModule::ms_systemMenuButtonWidth;

     }
 
     }
 

-    wxNativeFontInfo info;
-    memcpy(&info.lf, &nm.lfMenuFont, sizeof(LOGFONT));
-    m_font.Create(info);
-#else
-    // windows clean install default
-    m_nMinHeight = 18;
-    
-    if (ms_nDefaultMarginWidth == 0)
+    if (wxMSWSystemMenuFontModule::ms_systemMenuFont->Ok() && bMenuItem)

     {
     {

-        ms_nDefaultMarginWidth = 18;
-        ms_nLastMarginWidth = 18;
+        m_font = *wxMSWSystemMenuFontModule::ms_systemMenuFont;
+    }
+    else
+    {
+        m_font = *wxNORMAL_FONT;

     }
     }

-    if (wxNORMAL_FONT)
-       m_font = *wxNORMAL_FONT;
-#endif

 
     m_bCheckable   = bCheckable;
     m_bOwnerDrawn  = FALSE;
     m_nHeight      = 0;
     m_nMarginWidth = ms_nLastMarginWidth;
 
     m_bCheckable   = bCheckable;
     m_bOwnerDrawn  = FALSE;
     m_nHeight      = 0;
     m_nMarginWidth = ms_nLastMarginWidth;

+    m_nMinHeight   = wxMSWSystemMenuFontModule::ms_systemMenuHeight;

 }
 
 
 }
 
 


@@ -134,7 +175,7 @@ bool wxOwnerDrawn::OnMeasureItem(size_t *pwidth, size_t *pheight)
 
   // 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 += GetDefaultMarginWidth()*1.5;
+  *pwidth += (size_t) (GetDefaultMarginWidth() * 1.5);

 
   // 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;


@@ -188,7 +229,7 @@ bool wxOwnerDrawn::OnMeasureItem(size_t *pwidth, size_t *pheight)
 // get drawn embossed? How can we tell DrawState that we don't want the
 // embossing?
 
 // get drawn embossed? How can we tell DrawState that we don't want the
 // embossing?
 

-#if defined(__WIN32__) && !defined(__SC__) && !defined(__TWIN32__)
+#if defined(__WIN32__) && !defined(__SYMANTEC__) && !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
 


@@ -276,9 +317,9 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc,
 
     SIZE sizeRect;
     GetTextExtentPoint32(hdc,strMenuText.c_str(), strMenuText.Length(),&sizeRect);
 
     SIZE sizeRect;
     GetTextExtentPoint32(hdc,strMenuText.c_str(), strMenuText.Length(),&sizeRect);

-    ::DrawState(hdc, NULL, NULL, 
+    ::DrawState(hdc, NULL, NULL,

                 (LPARAM)strMenuText.c_str(), strMenuText.length(),
                 (LPARAM)strMenuText.c_str(), strMenuText.length(),

-                x, rc.y+((rc.GetHeight()-sizeRect.cy)/2.0)-1, // centre text vertically
+                x, rc.y+( (int) ((rc.GetHeight()-sizeRect.cy)/2.0) )-1, // centre text vertically

                 rc.GetWidth()-GetMarginWidth(), sizeRect.cy,
                 DST_PREFIXTEXT |
                 (((st & wxODDisabled) && !(st & wxODSelected)) ? DSS_DISABLED : 0));
                 rc.GetWidth()-GetMarginWidth(), sizeRect.cy,
                 DST_PREFIXTEXT |
                 (((st & wxODDisabled) && !(st & wxODSelected)) ? DSS_DISABLED : 0));


@@ -287,9 +328,9 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc,
     {
         // right align accel string with right edge of menu ( offset by the margin width )
         ::SetTextAlign(hdc, TA_RIGHT);
     {
         // right align accel string with right edge of menu ( offset by the margin width )
         ::SetTextAlign(hdc, TA_RIGHT);

-        ::DrawState(hdc, NULL, NULL, 
+        ::DrawState(hdc, NULL, NULL,

                     (LPARAM)m_strAccel.c_str(), m_strAccel.length(),
                     (LPARAM)m_strAccel.c_str(), m_strAccel.length(),

-                    rc.GetWidth()-(GetMarginWidth()), rc.y+(rc.GetHeight()-sizeRect.cy)/2.0, 
+                    rc.GetWidth()-(GetMarginWidth()), rc.y+(int) ((rc.GetHeight()-sizeRect.cy)/2.0),

                     rc.GetWidth()-GetMarginWidth(), sizeRect.cy,
                     DST_TEXT |
                     (((st & wxODDisabled) && !(st & wxODSelected)) ? DSS_DISABLED : 0));
                     rc.GetWidth()-GetMarginWidth(), sizeRect.cy,
                     DST_TEXT |
                     (((st & wxODDisabled) && !(st & wxODSelected)) ? DSS_DISABLED : 0));