Fixed non-precompiled headers compilation

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

diff --git a/src/msw/ownerdrw.cpp b/src/msw/ownerdrw.cpp
index bb11e87a2c2c9f759dc2f3f4994d91640b4da388..3dfc9d006553a6eff3d084008c50b6cc3f92193b 100644 (file)
--- a/src/msw/ownerdrw.cpp
+++ b/src/msw/ownerdrw.cpp
@@ -35,6 +35,8 @@
 #include "wx/fontutil.h"
 
 #include "wx/msw/private.h"
+#include "wx/msw/private/metrics.h"
+#include "wx/msw/dc.h"
 
 #ifndef SPI_GETKEYBOARDCUES
 #define SPI_GETKEYBOARDCUES 0x100A
@@ -88,12 +90,12 @@ public:
 private:
     static void DoInitMetrics()
     {
-        WinStruct<NONCLIENTMETRICS> nm;
-        ::SystemParametersInfo(SPI_GETNONCLIENTMETRICS, 0, &nm, 0);
-
         // iMenuHeight is the menu bar height and the menu items are less tall,
         // although I don't know by how much -- below is the value for my system
-        ms_systemMenuHeight = nm.iMenuHeight - 4;
+        ms_systemMenuHeight = wxMSWImpl::GetNonClientMetrics().iMenuHeight - 4;
+
+        wxASSERT_MSG( ms_systemMenuHeight > 0,
+                        "menu height should be positive" );
 
         if ( ::SystemParametersInfo(SPI_GETKEYBOARDCUES, 0,
                                     &ms_alwaysShowCues, 0) == 0 )
@@ -106,10 +108,8 @@ private:
 
     static void DoInitFont()
     {
-        WinStruct<NONCLIENTMETRICS> nm;
-        ::SystemParametersInfo(SPI_GETNONCLIENTMETRICS, 0, &nm, 0);
-
-        ms_systemMenuFont = new wxFont(wxNativeFontInfo(nm.lfMenuFont));
+        ms_systemMenuFont = new
+          wxFont(wxNativeFontInfo(wxMSWImpl::GetNonClientMetrics().lfMenuFont));
     }
 
     static wxFont* ms_systemMenuFont;